diff --git a/.editorconfig b/.editorconfig
index 8a5cf43521..a87e5e0651 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -77,6 +77,8 @@ csharp_style_expression_bodied_methods = false:suggestion
 #csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_properties = true:suggestion
 
+csharp_style_namespace_declarations = file_scoped:suggestion
+
 # Pattern matching preferences
 #csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 #csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
index 3ef0497496..1f010b7291 100644
--- a/.github/workflows/build-docfx.yml
+++ b/.github/workflows/build-docfx.yml
@@ -27,7 +27,7 @@ jobs:
       run: dotnet restore
 
     - name: Build Project
-      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+      run: dotnet build --no-restore
 
     - name: Build DocFX
       uses: nikeee/docfx-action@v1.0.0
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index 951177e1ad..852888cc6c 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -42,7 +42,7 @@ jobs:
         run: dotnet restore
 
       - name: Build Project
-        run: dotnet build Content.MapRenderer --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
+        run: dotnet build Content.MapRenderer --configuration Release --no-restore /m
 
       - name: Run Map Renderer
         run: dotnet run --project Content.MapRenderer Dev
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index 2672269591..43d621cdf7 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -42,7 +42,7 @@ jobs:
       run: dotnet restore
 
     - name: Build Project
-      run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m
+      run: dotnet build --configuration DebugOpt --no-restore /m
 
     - name: Run Content.Tests
       run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
diff --git a/.github/workflows/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml
index 4827562eaa..a4a87b4979 100644
--- a/.github/workflows/labeler-needsreview.yml
+++ b/.github/workflows/labeler-needsreview.yml
@@ -2,7 +2,7 @@
 
 on:
   pull_request_target:
-    types: [review_requested]
+    types: [review_requested, opened]
 
 jobs:
   add_label:
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 8554c97ee8..b2aeb6197a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -27,7 +27,7 @@ If you believe someone is violating the code of conduct, we ask that you report
 
 Original text courtesy of the [Speak Up! project](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html).
 
-## On Comunity Moderation
+## On Community Moderation
 
 Deviating from the Code of Conduct on the Github repository may result in moderative actions taken by project Maintainers. This can involve your content being edited or deleted, and may result in a temporary or permanent block from the repository.
 
diff --git a/Content.Benchmarks/PvsBenchmark.cs b/Content.Benchmarks/PvsBenchmark.cs
index 1edbcb6448..51a013539e 100644
--- a/Content.Benchmarks/PvsBenchmark.cs
+++ b/Content.Benchmarks/PvsBenchmark.cs
@@ -6,7 +6,6 @@ using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Mind;
-using Content.Server.Warps;
 using Content.Shared.Warps;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
diff --git a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
index 0638d945aa..9b878eac40 100644
--- a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
+++ b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
@@ -8,6 +8,7 @@ using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Benchmarks;
 
@@ -18,9 +19,11 @@ namespace Content.Benchmarks;
 [Virtual, MemoryDiagnoser]
 public class SpawnEquipDeleteBenchmark
 {
+    private static readonly EntProtoId Mob = "MobHuman";
+    private static readonly ProtoId<StartingGearPrototype> CaptainStartingGear = "CaptainGear";
+
     private TestPair _pair = default!;
     private StationSpawningSystem _spawnSys = default!;
-    private const string Mob = "MobHuman";
     private StartingGearPrototype _gear = default!;
     private EntityUid _entity;
     private EntityCoordinates _coords;
@@ -39,7 +42,7 @@ public class SpawnEquipDeleteBenchmark
         var mapData = await _pair.CreateTestMap();
         _coords = mapData.GridCoords;
         _spawnSys = server.System<StationSpawningSystem>();
-        _gear = server.ProtoMan.Index<StartingGearPrototype>("CaptainGear");
+        _gear = server.ProtoMan.Index(CaptainStartingGear);
     }
 
     [GlobalCleanup]
diff --git a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
index da68653ce5..4f07c31009 100644
--- a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
+++ b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
@@ -15,6 +15,8 @@ namespace Content.Client.Access.UI;
 [GenerateTypedNameReferences]
 public sealed partial class GroupedAccessLevelChecklist : BoxContainer
 {
+    private static readonly ProtoId<AccessGroupPrototype> GeneralAccessGroup = "General";
+
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
     private bool _isMonotone;
@@ -63,7 +65,7 @@ public sealed partial class GroupedAccessLevelChecklist : BoxContainer
 
         // Ensure that the 'general' access group is added to handle
         // misc. access levels that aren't associated with any group
-        if (_protoManager.TryIndex<AccessGroupPrototype>("General", out var generalAccessProto))
+        if (_protoManager.TryIndex(GeneralAccessGroup, out var generalAccessProto))
             _groupedAccessLevels.TryAdd(generalAccessProto, new());
 
         // Assign known access levels with their associated groups
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 23ff23997f..8efe0b2367 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -211,7 +211,7 @@ namespace Content.Client.Actions
             else
             {
                 var request = new RequestPerformActionEvent(GetNetEntity(action));
-                EntityManager.RaisePredictiveEvent(request);
+                RaisePredictiveEvent(request);
             }
         }
 
@@ -334,7 +334,12 @@ namespace Content.Client.Actions
 
         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 @@ namespace Content.Client.Actions
                 return;
             }
 
-            args.Handled = true;
-
             var action = args.Action;
             var user = args.User;
 
diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index 0d424cbff0..abeed65732 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -1,3 +1,4 @@
+using System.Collections.Frozen;
 using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.Systems;
@@ -24,6 +25,7 @@ internal sealed class AdminNameOverlay : Overlay
     private readonly EntityLookupSystem _entityLookup;
     private readonly IUserInterfaceManager _userInterfaceManager;
     private readonly SharedRoleSystem _roles;
+    private readonly IPrototypeManager _prototypeManager;
     private readonly Font _font;
     private readonly Font _fontBold;
     private AdminOverlayAntagFormat _overlayFormat;
@@ -36,8 +38,9 @@ internal sealed class AdminNameOverlay : Overlay
     private float _overlayMergeDistance;
 
     //TODO make this adjustable via GUI?
-    private readonly ProtoId<RoleTypePrototype>[] _filter =
-        ["SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"];
+    private static readonly FrozenSet<ProtoId<RoleTypePrototype>> Filter =
+        new ProtoId<RoleTypePrototype>[] {"SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"}
+        .ToFrozenSet();
 
     private readonly string _antagLabelClassic = Loc.GetString("admin-overlay-antag-classic");
 
@@ -49,7 +52,8 @@ internal sealed class AdminNameOverlay : Overlay
         EntityLookupSystem entityLookup,
         IUserInterfaceManager userInterfaceManager,
         IConfigurationManager config,
-        SharedRoleSystem roles)
+        SharedRoleSystem roles,
+        IPrototypeManager prototypeManager)
     {
         _system = system;
         _entityManager = entityManager;
@@ -57,6 +61,7 @@ internal sealed class AdminNameOverlay : Overlay
         _entityLookup = entityLookup;
         _userInterfaceManager = userInterfaceManager;
         _roles = roles;
+        _prototypeManager = prototypeManager;
         ZIndex = 200;
         // Setting these to a specific ttf would break the antag symbols
         _font = resourceCache.NotoStack();
@@ -125,6 +130,14 @@ internal sealed class AdminNameOverlay : Overlay
         foreach (var info in sortable.OrderBy(s => s.Item4.Y).ToList())
         {
             var playerInfo = info.Item1;
+            var rolePrototype = playerInfo.RoleProto == null
+                ? null
+                : _prototypeManager.Index(playerInfo.RoleProto.Value);
+
+            var roleName = Loc.GetString(rolePrototype?.Name ?? RoleTypePrototype.FallbackName);
+            var roleColor = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor;
+            var roleSymbol = rolePrototype?.Symbol ?? RoleTypePrototype.FallbackSymbol;
+
             var aabb = info.Item2;
             var entity = info.Item3;
             var screenCoordinatesCenter = info.Item4;
@@ -209,7 +222,7 @@ internal sealed class AdminNameOverlay : Overlay
             switch (_overlaySymbolStyle)
             {
                 case AdminOverlayAntagSymbolStyle.Specific:
-                    symbol = playerInfo.RoleProto.Symbol;
+                    symbol = roleSymbol;
                     break;
                 case AdminOverlayAntagSymbolStyle.Basic:
                     symbol = Loc.GetString("player-tab-antag-prefix");
@@ -225,17 +238,17 @@ internal sealed class AdminNameOverlay : Overlay
             switch (_overlayFormat)
             {
                 case AdminOverlayAntagFormat.Roletype:
-                    color = playerInfo.RoleProto.Color;
-                    symbol = _filter.Contains(playerInfo.RoleProto) ? symbol : string.Empty;
-                    text = _filter.Contains(playerInfo.RoleProto)
-                        ? Loc.GetString(playerInfo.RoleProto.Name).ToUpper()
+                    color = roleColor;
+                    symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty;
+                    text = IsFiltered(playerInfo.RoleProto)
+                        ? roleName.ToUpper()
                         : string.Empty;
                     break;
                 case AdminOverlayAntagFormat.Subtype:
-                    color = playerInfo.RoleProto.Color;
-                    symbol = _filter.Contains(playerInfo.RoleProto) ? symbol : string.Empty;
-                    text = _filter.Contains(playerInfo.RoleProto)
-                        ? _roles.GetRoleSubtypeLabel(playerInfo.RoleProto.Name, playerInfo.Subtype).ToUpper()
+                    color = roleColor;
+                    symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty;
+                    text = IsFiltered(playerInfo.RoleProto)
+                        ? _roles.GetRoleSubtypeLabel(roleName, playerInfo.Subtype).ToUpper()
                         : string.Empty;
                     break;
                 default:
@@ -258,4 +271,12 @@ internal sealed class AdminNameOverlay : Overlay
             drawnOverlays.Add((screenCoordinatesCenter, currentOffset));
         }
     }
+
+    private static bool IsFiltered(ProtoId<RoleTypePrototype>? roleProtoId)
+    {
+        if (roleProtoId == null)
+            return false;
+
+        return Filter.Contains(roleProtoId.Value);
+    }
 }
diff --git a/Content.Client/Administration/Components/HeadstandComponent.cs b/Content.Client/Administration/Components/HeadstandComponent.cs
deleted file mode 100644
index a4e3bfc5aa..0000000000
--- a/Content.Client/Administration/Components/HeadstandComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class HeadstandComponent : SharedHeadstandComponent
-{
-
-}
diff --git a/Content.Client/Administration/Systems/AdminSystem.Overlay.cs b/Content.Client/Administration/Systems/AdminSystem.Overlay.cs
index a630df4521..e000bdc0ba 100644
--- a/Content.Client/Administration/Systems/AdminSystem.Overlay.cs
+++ b/Content.Client/Administration/Systems/AdminSystem.Overlay.cs
@@ -4,6 +4,7 @@ using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Administration.Systems
 {
@@ -17,6 +18,7 @@ namespace Content.Client.Administration.Systems
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
+        [Dependency] private readonly IPrototypeManager _proto = default!;
 
         private AdminNameOverlay _adminNameOverlay = default!;
 
@@ -33,7 +35,8 @@ namespace Content.Client.Administration.Systems
                 _entityLookup,
                 _userInterfaceManager,
                 _configurationManager,
-                _roles);
+                _roles,
+                _proto);
             _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         }
 
diff --git a/Content.Client/Administration/Systems/HeadstandSystem.cs b/Content.Client/Administration/Systems/HeadstandSystem.cs
index d0634e4ddd..8ab337f3cc 100644
--- a/Content.Client/Administration/Systems/HeadstandSystem.cs
+++ b/Content.Client/Administration/Systems/HeadstandSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Administration.Systems;
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml
new file mode 100644
index 0000000000..1413eff00c
--- /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 0000000000..beb8344ce3
--- /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 0000000000..908fb2740c
--- /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 0000000000..87583cef97
--- /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 0000000000..07a6e2156e
--- /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/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index 0d1b083efc..d4f8b2764f 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -8,6 +8,7 @@ using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -32,14 +33,21 @@ public sealed partial class BanPanel : DefaultWindow
     private uint Multiplier { get; set; }
     private bool HasBanFlag { get; set; }
     private TimeSpan? ButtonResetOn { get; set; }
+
     // This is less efficient than just holding a reference to the root control and enumerating children, but you
     // have to know how the controls are nested, which makes the code more complicated.
-    private readonly List<CheckBox> _roleCheckboxes = new();
+    // Role group name -> the role buttons themselves.
+    private readonly Dictionary<string, List<Button>> _roleCheckboxes = new();
     private readonly ISawmill _banpanelSawmill;
 
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+
+    private const string ExpandedArrow = "▼";
+    private const string ContractedArrow = "▶";
 
     private readonly string _antagCategory = Loc.GetString("ban-panel-role-selection-antag");
     private readonly string _antagAllSelection = Loc.GetString("ban-panel-role-selection-antag-all-option");
@@ -150,68 +158,90 @@ public sealed partial class BanPanel : DefaultWindow
 
         ReasonTextEdit.Placeholder = new Rope.Leaf(Loc.GetString("ban-panel-reason"));
 
-        var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-        foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
+        var departmentJobs = _protoMan.EnumeratePrototypes<DepartmentPrototype>()
+                                      .OrderBy(x => x.Weight);
+        foreach (var proto in departmentJobs)
         {
-            CreateRoleGroup(proto.ID, proto.Roles.Select(p =>  p.Id), proto.Color);
+            var roles = proto.Roles.Select(x => _protoMan.Index(x))
+                             .OrderBy(x => x.ID);
+            CreateRoleGroup(proto.ID, proto.Color, roles);
         }
 
-        var antagRoleList = prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID).ToList();
-        antagRoleList.Insert(0, _antagAllSelection);
-        CreateRoleGroup(_antagCategory, antagRoleList, Color.Red);
+        var antagRoles = _protoMan.EnumeratePrototypes<AntagPrototype>()
+                                  .OrderBy(x => x.ID);
+        CreateRoleGroup("Antagonist", Color.Red, antagRoles);
     }
 
-    private void CreateRoleGroup(string roleName, IEnumerable<string> roleList, Color color)
+    /// <summary>
+    /// Creates a "Role group" which stores information and logic for one "group" of roll bans.
+    /// For example, all antags are one group, logi is a group, medical is a group, etc...
+    /// </summary>
+    private void CreateRoleGroup<T>(string groupName, Color color, IEnumerable<T> roles) where T : class, IPrototype
     {
         var outerContainer = new BoxContainer
         {
-            Name = $"{roleName}GroupOuterBox",
+            Name = $"{groupName}GroupOuterBox",
             HorizontalExpand = true,
             VerticalExpand = true,
             Orientation = BoxContainer.LayoutOrientation.Vertical,
             Margin = new Thickness(4),
         };
-        var departmentCheckbox = new CheckBox
+
+        // Stores stuff like ban all and expand buttons.
+        var roleGroupHeader = new BoxContainer
         {
-            Name = $"{roleName}GroupCheckbox",
-            Text = roleName,
-            Modulate = color,
-            HorizontalAlignment = HAlignment.Left,
-            Margin = new Thickness(2),
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
         };
-        outerContainer.AddChild(departmentCheckbox);
+
+        // Stores the role checkboxes themselves.
         var innerContainer = new GridContainer
         {
-            Name = $"{roleName}GroupInnerBox",
+            Name = $"{groupName}GroupInnerBox",
             HorizontalExpand = true,
-            Columns = 4,
-            Margin = new Thickness(2)
+            Columns = 2,
+            Visible = false,
+            Margin = new Thickness(15, 5, 0, 5),
         };
-        departmentCheckbox.OnToggled += args =>
+
+        var roleGroupCheckbox = CreateRoleGroupHeader(groupName, roleGroupHeader, color, innerContainer);
+
+        outerContainer.AddChild(roleGroupHeader);
+
+        // Add the roles themselves
+        foreach (var role in roles)
         {
-            if (args.Pressed && roleName == _antagCategory)
+            AddRoleCheckbox(groupName, role.ID, innerContainer, roleGroupCheckbox);
+        }
+
+        outerContainer.AddChild(innerContainer);
+
+        RolesContainer.AddChild(new PanelContainer
+        {
+            PanelOverride = new StyleBoxFlat
             {
-                foreach (var child in innerContainer.Children)
-                {
-                    if (child is CheckBox antagCheckbox && antagCheckbox.Name == $"{_antagAllSelection}RoleCheckbox")
-                    {
-                        antagCheckbox.Pressed = true;
-                    }
-                    else if (child is CheckBox otherAntagCheckbox)
-                    {
-                        otherAntagCheckbox.Pressed = false;
-                    }
-                }
+                BackgroundColor = color
             }
-            else
+        });
+        RolesContainer.AddChild(outerContainer);
+        RolesContainer.AddChild(new HSeparator());
+    }
+
+    private Button CreateRoleGroupHeader(string groupName, BoxContainer header, Color color, GridContainer innerContainer)
+    {
+        var roleGroupCheckbox = new Button
+        {
+            Name = $"{groupName}GroupCheckbox",
+            Text = "Ban all",
+            Margin = new Thickness(0, 0, 5, 0),
+            ToggleMode = true,
+        };
+
+        // When this is toggled, toggle all buttons in this group so they match.
+        roleGroupCheckbox.OnToggled += args =>
+        {
+            foreach (var role in _roleCheckboxes[groupName])
             {
-                foreach (var child in innerContainer.Children)
-                {
-                    if (child is CheckBox roleChildCheckbox)
-                    {
-                        roleChildCheckbox.Pressed = args.Pressed;
-                    }
-                }
+                role.Pressed = args.Pressed;
             }
 
             if (args.Pressed)
@@ -226,15 +256,12 @@ public sealed partial class BanPanel : DefaultWindow
             }
             else
             {
-                foreach (var childContainer in RolesContainer.Children)
+                foreach (var roleButtons in _roleCheckboxes.Values)
                 {
-                    if (childContainer is Container)
+                    foreach (var button in roleButtons)
                     {
-                        foreach (var child in childContainer.Children)
-                        {
-                            if (child is CheckBox { Pressed: true })
-                                return;
-                        }
+                        if (button.Pressed)
+                            return;
                     }
                 }
 
@@ -247,63 +274,72 @@ public sealed partial class BanPanel : DefaultWindow
                 SeverityOption.SelectId((int)newSeverity);
             }
         };
-        outerContainer.AddChild(innerContainer);
 
-        var isAntagonistGroup = roleName == _antagCategory;
-        foreach (var role in roleList)
+        var hideButton = new Button
         {
-            AddRoleCheckbox(role, innerContainer, departmentCheckbox, isAntagonistGroup);
-        }
-        RolesContainer.AddChild(new PanelContainer
+            Text = Loc.GetString("role-bans-expand-roles") + " " + ContractedArrow,
+            ToggleMode = true,
+        };
+        hideButton.OnPressed += args =>
         {
-            PanelOverride = new StyleBoxFlat
-            {
-                BackgroundColor = color
-            }
+            innerContainer.Visible = args.Button.Pressed;
+            ((Button)args.Button).Text = args.Button.Pressed
+                ? Loc.GetString("role-bans-contract-roles") + " " + ExpandedArrow
+                : Loc.GetString("role-bans-expand-roles") + " " + ContractedArrow;
+        };
+        header.AddChild(new Label
+        {
+            Text = groupName,
+            Modulate = color,
+            Margin = new Thickness(0, 0, 5, 0),
         });
-        RolesContainer.AddChild(outerContainer);
-        RolesContainer.AddChild(new HSeparator());
+        header.AddChild(roleGroupCheckbox);
+        header.AddChild(hideButton);
+        return roleGroupCheckbox;
     }
 
-    private void AddRoleCheckbox(string role, Control container, CheckBox header, bool isAntagonistGroup = false)
+    /// <summary>
+    /// Adds a checkbutton specifically for one "role" in a "group"
+    /// E.g. it would add the Chief Medical Officer "role" into the "Medical" group.
+    /// </summary>
+    private void AddRoleCheckbox(string group, string role, GridContainer roleGroupInnerContainer, Button roleGroupCheckbox)
     {
-        var roleCheckbox = new CheckBox
+        var roleCheckboxContainer = new BoxContainer();
+        var roleCheckButton = new Button
         {
             Name = $"{role}RoleCheckbox",
             Text = role,
-            Margin = new Thickness(2),
+            ToggleMode = true,
         };
-
-        roleCheckbox.OnToggled += args =>
+        roleCheckButton.OnToggled += args =>
         {
-            if (isAntagonistGroup && role == _antagAllSelection)
-            {
-                foreach (var child in container.Children)
-                {
-                    if (child is CheckBox c && c != roleCheckbox)
-                    {
-                        c.Pressed = false;
-                    }
-                }
-            }
-
-            if (args is { Pressed: true, Button.Parent: { } } && args.Button.Parent.Children.OfType<CheckBox>().All(e => e.Pressed))
-                header.Pressed = true;
+            // Checks the role group checkbox if all the children are pressed
+            if (args.Pressed && _roleCheckboxes[group].All(e => e.Pressed))
+                roleGroupCheckbox.Pressed = args.Pressed;
             else
-                header.Pressed = false;
-
-            // Ensure "All" checkbox logic within the antagonist group
-            if (isAntagonistGroup && role != _antagAllSelection)
-            {
-                var allAntagsCheckbox = container.Children.OfType<CheckBox>().FirstOrDefault(c => c.Name == $"{_antagAllSelection}RoleCheckbox");
-                if (allAntagsCheckbox != null && args.Pressed)
-                {
-                    allAntagsCheckbox.Pressed = false;
-                }
-            }
+                roleGroupCheckbox.Pressed = false;
         };
-        container.AddChild(roleCheckbox);
-        _roleCheckboxes.Add(roleCheckbox);
+
+        // This is adding the icon before the role name
+        // Yeah, this is sus, but having to split the functions up and stuff is worse imo.
+        if (_protoMan.TryIndex<JobPrototype>(role, out var jobPrototype) && _protoMan.TryIndex(jobPrototype.Icon, out var iconProto))
+        {
+            var jobIconTexture = new TextureRect
+            {
+                Texture = _entMan.System<SpriteSystem>().Frame0(iconProto.Icon),
+                TextureScale = new Vector2(2.5f, 2.5f),
+                Stretch = TextureRect.StretchMode.KeepCentered,
+                Margin = new Thickness(5, 0, 0, 0),
+            };
+            roleCheckboxContainer.AddChild(jobIconTexture);
+        }
+
+        roleCheckboxContainer.AddChild(roleCheckButton);
+
+        roleGroupInnerContainer.AddChild(roleCheckboxContainer);
+
+        _roleCheckboxes.TryAdd(group, []);
+        _roleCheckboxes[group].Add(roleCheckButton);
     }
 
     public void UpdateBanFlag(bool newFlag)
@@ -521,7 +557,13 @@ public sealed partial class BanPanel : DefaultWindow
             if (_roleCheckboxes.Count == 0)
                 throw new DebugAssertException("RoleCheckboxes was empty");
 
-            rolesList.AddRange(_roleCheckboxes.Where(c => c is { Pressed: true, Text: { } }).Select(c => c.Text!));
+            foreach (var button in _roleCheckboxes.Values.SelectMany(departmentButtons => departmentButtons))
+            {
+                if (button is { Pressed: true, Text: not null })
+                {
+                    rolesList.Add(button.Text);
+                }
+            }
 
             if (rolesList.Count == 0)
             {
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
index fc4d3ee3ac..cd93ffeb0a 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
@@ -49,6 +49,7 @@
                     <Control HorizontalExpand="True"/>
                     <Label Name="Count" Access="Public"/>
                     <Control HorizontalExpand="True"/>
+                    <Button Name="ExportLogs" Access="Public" Text="{Loc admin-logs-export}"/>
                     <Button Name="PopOutButton" Access="Public" Text="{Loc admin-logs-pop-out}"/>
                 </BoxContainer>
                 <BoxContainer Orientation="Horizontal">
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index be1bddcd37..1544b827ae 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+using System.IO;
+using System.Linq;
+using Content.Client.Administration.UI.CustomControls;
 using Content.Client.Eui;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Eui;
@@ -15,6 +17,16 @@ public sealed class AdminLogsEui : BaseEui
 {
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    [Dependency] private readonly IFileDialogManager _dialogManager = default!;
+    [Dependency] private readonly ILogManager _log = default!;
+
+    private const char CsvSeparator = ',';
+    private const string CsvQuote = "\"";
+    private const string CsvHeader = "Date,ID,PlayerID,Severity,Type,Message";
+
+    private ISawmill _sawmill;
+
+    private bool _currentlyExportingLogs = false;
 
     public AdminLogsEui()
     {
@@ -26,6 +38,9 @@ public sealed class AdminLogsEui : BaseEui
         LogsControl.RefreshButton.OnPressed += _ => RequestLogs();
         LogsControl.NextButton.OnPressed += _ => NextLogs();
         LogsControl.PopOutButton.OnPressed += _ => PopOut();
+        LogsControl.ExportLogs.OnPressed += _ => ExportLogs();
+
+        _sawmill = _log.GetSawmill("admin.logs.ui");
     }
 
     private WindowRoot? Root { get; set; }
@@ -74,6 +89,71 @@ public sealed class AdminLogsEui : BaseEui
         SendMessage(request);
     }
 
+    private async void ExportLogs()
+    {
+        if (_currentlyExportingLogs)
+            return;
+
+        _currentlyExportingLogs = true;
+        LogsControl.ExportLogs.Disabled = true;
+
+        var file = await _dialogManager.SaveFile(new FileDialogFilters(new FileDialogFilters.Group("csv")));
+
+        if (file == null)
+            return;
+
+        try
+        {
+            // Buffer is set to 4KB for performance reasons. As the average export of 1000 logs is ~200KB
+            await using var writer = new StreamWriter(file.Value.fileStream, bufferSize: 4096);
+            await writer.WriteLineAsync(CsvHeader);
+            foreach (var child in LogsControl.LogsContainer.Children)
+            {
+                if (child is not AdminLogLabel logLabel || !child.Visible)
+                    continue;
+
+                var log = logLabel.Log;
+
+                // Date
+                // I swear to god if someone adds ,s or "s to the other fields...
+                await writer.WriteAsync(log.Date.ToString("s", System.Globalization.CultureInfo.InvariantCulture));
+                await writer.WriteAsync(CsvSeparator);
+                // ID
+                await writer.WriteAsync(log.Id.ToString());
+                await writer.WriteAsync(CsvSeparator);
+                // PlayerID
+                var players = log.Players;
+                for (var i = 0; i < players.Length; i++)
+                {
+                    await writer.WriteAsync(players[i] + (i == players.Length - 1 ? "" : " "));
+                }
+                await writer.WriteAsync(CsvSeparator);
+                // Severity
+                await writer.WriteAsync(log.Impact.ToString());
+                await writer.WriteAsync(CsvSeparator);
+                // Type
+                await writer.WriteAsync(log.Type.ToString());
+                await writer.WriteAsync(CsvSeparator);
+                // Message
+                await writer.WriteAsync(CsvQuote);
+                await writer.WriteAsync(log.Message.Replace(CsvQuote, CsvQuote + CsvQuote));
+                await writer.WriteAsync(CsvQuote);
+
+                await writer.WriteLineAsync();
+            }
+        }
+        catch (Exception exc)
+        {
+            _sawmill.Error($"Error when exporting admin log:\n{exc.StackTrace}");
+        }
+        finally
+        {
+            await file.Value.fileStream.DisposeAsync();
+            _currentlyExportingLogs = false;
+            LogsControl.ExportLogs.Disabled = false;
+        }
+    }
+
     private void PopOut()
     {
         if (LogsWindow == null)
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
index 01259b60f7..6146240824 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
@@ -8,6 +8,21 @@
             <OptionButton Name="SolutionOption" HorizontalExpand="True"/>
         </BoxContainer>
 
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 4">
+            <Button Name="VVButton"
+                    Text="{Loc 'admin-solutions-window-vv-button'}"
+                    ToolTip="{Loc 'admin-solutions-window-vv-button-tooltip'}"
+                    Disabled="True"
+                    HorizontalExpand="True"
+                    StyleClasses="OpenRight"/>
+            <Button Name="SolutionButton"
+                    Text="{Loc 'admin-solutions-window-solution-button'}"
+                    ToolTip="{Loc 'admin-solutions-window-solution-button-tooltip'}"
+                    Disabled="True"
+                    HorizontalExpand="True"
+                    StyleClasses="OpenLeft"/>
+        </BoxContainer>
+
         <!-- The total volume / capacity of the solution -->
         <BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
 
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
index 2dd7ec3c19..800be36624 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.Administration.Managers;
 using Content.Shared.Administration;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
@@ -21,6 +22,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IClientGameTiming _timing = default!;
+        [Dependency] private readonly IClientAdminManager _admin = default!;
 
         private NetEntity _target = NetEntity.Invalid;
         private string? _selectedSolution;
@@ -35,6 +37,11 @@ namespace Content.Client.Administration.UI.ManageSolutions
 
             SolutionOption.OnItemSelected += SolutionSelected;
             AddButton.OnPressed += OpenAddReagentWindow;
+            VVButton.OnPressed += OpenVVWindow;
+            SolutionButton.OnPressed += OpenSolutionWindow;
+
+            VVButton.Disabled = !_admin.CanViewVar();
+            SolutionButton.Disabled = !_admin.CanViewVar();
         }
 
         public override void Close()
@@ -275,6 +282,32 @@ namespace Content.Client.Administration.UI.ManageSolutions
             _addReagentWindow.OpenCentered();
         }
 
+        /// <summary>
+        ///     Open the corresponding solution entity in a ViewVariables window.
+        /// </summary>
+        private void OpenVVWindow(BaseButton.ButtonEventArgs obj)
+        {
+            if (_solutions == null
+                || _selectedSolution == null
+                || !_solutions.TryGetValue(_selectedSolution, out var uid)
+                || !_entityManager.TryGetNetEntity(uid, out var netEntity))
+                return;
+            _consoleHost.ExecuteCommand($"vv {netEntity}");
+        }
+
+        /// <summary>
+        ///     Open the corresponding Solution instance in a ViewVariables window.
+        /// </summary>
+        private void OpenSolutionWindow(BaseButton.ButtonEventArgs obj)
+        {
+            if (_solutions == null
+                || _selectedSolution == null
+                || !_solutions.TryGetValue(_selectedSolution, out var uid)
+                || !_entityManager.TryGetNetEntity(uid, out var netEntity))
+                return;
+            _consoleHost.ExecuteCommand($"vv /entity/{netEntity}/Solution/Solution");
+        }
+
         /// <summary>
         ///     When a new solution is selected, set _selectedSolution and update the reagent list.
         /// </summary>
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
index 4791dcf6aa..9c54049da3 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 14311851b4..62cb64050e 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;
+        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();
+        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 sealed partial class PlayerPanel : FancyWindow
     {
         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 2129fa5b0c..8c8183ef22 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 sealed class PlayerPanelEui : BaseEui
         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 sealed class PlayerPanelEui : BaseEui
         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/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index 4b50771b0f..de9ccbbf50 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -76,7 +76,7 @@ public sealed partial class ObjectsTab : Control
         switch (selection)
         {
             case ObjectsTabSelection.Stations:
-                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations);
+                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().GetStationNames());
                 break;
             case ObjectsTabSelection.Grids:
             {
@@ -132,8 +132,8 @@ public sealed partial class ObjectsTab : Control
         entry.OnTeleport += TeleportTo;
         entry.OnDelete += Delete;
         button.ToolTip = $"{info.Name}, {info.Entity}";
-
         button.AddChild(entry);
+        button.StyleClasses.Clear();
     }
 
     private bool DataFilterCondition(string filter, ListData listData)
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index f777f1f308..5a84037dd7 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -210,6 +210,7 @@ public sealed partial class PlayerTab : Control
         entry.OnObjectives += GetObjectives; // Sunrise-Edit
         button.AddChild(entry);
         button.ToolTip = $"{player.Username}, {player.CharacterName}, {player.IdentityName}, {player.StartingJob}";
+        button.StyleClasses.Clear();
     }
 
     // Sunrise-Start
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index bf86abe88e..3e7a6fdcb1 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -1,9 +1,11 @@
 using Content.Shared.Administration;
+using Content.Shared.Mind;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 
@@ -11,6 +13,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 public sealed partial class PlayerTabEntry : PanelContainer
 {
     [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public Action<NetEntity?>? OnObjectives; // Sunrise-Edit
 
@@ -25,6 +28,8 @@ public sealed partial class PlayerTabEntry : PanelContainer
         RobustXamlLoader.Load(this);
         var roles = _entMan.System<SharedRoleSystem>();
 
+        var rolePrototype = player.RoleProto == null ? null : _prototype.Index(player.RoleProto.Value);
+
         UsernameLabel.Text = player.Username;
         if (!player.Connected)
             UsernameLabel.StyleClasses.Add("Disabled");
@@ -59,21 +64,21 @@ public sealed partial class PlayerTabEntry : PanelContainer
                 break;
             default:
             case AdminPlayerTabSymbolOption.Specific:
-                symbol = player.Antag ? player.RoleProto.Symbol : string.Empty;
+                symbol = player.Antag ? rolePrototype?.Symbol ?? RoleTypePrototype.FallbackSymbol : string.Empty;
                 break;
         }
 
         CharacterLabel.Text = Loc.GetString("player-tab-character-name-antag-symbol", ("symbol", symbol), ("name", player.CharacterName));
 
         if (player.Antag && colorAntags)
-            CharacterLabel.FontColorOverride = player.RoleProto.Color;
+            CharacterLabel.FontColorOverride = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor;
         if (player.IdentityName != player.CharacterName)
             CharacterLabel.Text += $" [{player.IdentityName}]";
 
         SponsorLabel.Text = player.IsSponsor ? player.SponsorTitle : ""; // Sunrise-Sponsors
 
-        var roletype = RoleTypeLabel.Text = Loc.GetString(player.RoleProto.Name);
-        var subtype = roles.GetRoleSubtypeLabel(player.RoleProto.Name, player.Subtype);
+        var roletype = RoleTypeLabel.Text = Loc.GetString(rolePrototype?.Name ?? RoleTypePrototype.FallbackName);
+        var subtype = roles.GetRoleSubtypeLabel(rolePrototype?.Name ?? RoleTypePrototype.FallbackName, player.Subtype);
         switch (roleSetting)
         {
             case AdminPlayerTabRoleTypeOption.RoleTypeSubtype:
@@ -96,7 +101,7 @@ public sealed partial class PlayerTabEntry : PanelContainer
         }
 
         if (colorRoles)
-            RoleTypeLabel.FontColorOverride = player.RoleProto.Color;
+            RoleTypeLabel.FontColorOverride = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor;
         BackgroundColorPanel.PanelOverride = styleBoxFlat;
         OverallPlaytimeLabel.Text = player.PlaytimeString;
         ObjectivesButton.OnPressed += _ => OnObjectives?.Invoke(player.NetEntity); // Sunrise-Edit
diff --git a/Content.Client/Alerts/GenericCounterAlertSystem.cs b/Content.Client/Alerts/GenericCounterAlertSystem.cs
new file mode 100644
index 0000000000..de9d97d063
--- /dev/null
+++ b/Content.Client/Alerts/GenericCounterAlertSystem.cs
@@ -0,0 +1,90 @@
+using System.Numerics;
+using Content.Shared.Alert.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+
+namespace Content.Client.Alerts;
+
+/// <summary>
+/// This handles <see cref="GenericCounterAlertComponent"/>
+/// </summary>
+public sealed class GenericCounterAlertSystem : EntitySystem
+{
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<GenericCounterAlertComponent, UpdateAlertSpriteEvent>(OnUpdateAlertSprite);
+    }
+
+    private void OnUpdateAlertSprite(Entity<GenericCounterAlertComponent> ent, ref UpdateAlertSpriteEvent args)
+    {
+        var sprite = args.SpriteViewEnt.Comp;
+
+        var ev = new GetGenericAlertCounterAmountEvent(args.Alert);
+        RaiseLocalEvent(args.ViewerEnt, ref ev);
+
+        if (!ev.Handled)
+            return;
+
+        // It cannot be null if its handled, but good to check to avoid ugly null ignores.
+        if (ev.Amount == null)
+            return;
+
+        // How many digits can we display
+        var maxDigitCount = GetMaxDigitCount((ent, ent, sprite));
+
+        // Clamp it to a positive number that we can actually display in full (no rollover to 0)
+        var amount = (int) Math.Clamp(ev.Amount.Value, 0, Math.Pow(10, maxDigitCount) - 1);
+
+        // This is super wack but ig it works?
+        var digitCount = ent.Comp.HideLeadingZeroes
+            ? amount.ToString().Length
+            : maxDigitCount;
+
+        if (ent.Comp.HideLeadingZeroes)
+        {
+            for (var i = 0; i < ent.Comp.DigitKeys.Count; i++)
+            {
+                if (!_sprite.LayerMapTryGet(ent.Owner, ent.Comp.DigitKeys[i], out var layer, false))
+                    continue;
+
+                _sprite.LayerSetVisible(ent.Owner, layer, i <= digitCount - 1);
+            }
+        }
+
+        // ReSharper disable once PossibleLossOfFraction
+        var baseOffset = (ent.Comp.AlertSize.X - digitCount * ent.Comp.GlyphWidth) / 2 * (1f / EyeManager.PixelsPerMeter);
+
+        for (var i = 0; i < ent.Comp.DigitKeys.Count; i++)
+        {
+            if (!_sprite.LayerMapTryGet(ent.Owner, ent.Comp.DigitKeys[i], out var layer, false))
+                continue;
+
+            var result = amount / (int) Math.Pow(10, i) % 10;
+            _sprite.LayerSetRsiState(ent.Owner, layer, result.ToString());
+
+            if (ent.Comp.CenterGlyph)
+            {
+                var offset = baseOffset + (digitCount - 1 - i) * ent.Comp.GlyphWidth * (1f / EyeManager.PixelsPerMeter);
+                _sprite.LayerSetOffset(ent.Owner, layer, new Vector2(offset, 0));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Gets the number of digits that we can display.
+    /// </summary>
+    /// <returns>The number of digits.</returns>
+    private int GetMaxDigitCount(Entity<GenericCounterAlertComponent, SpriteComponent> ent)
+    {
+        for (var i = ent.Comp1.DigitKeys.Count - 1; i >= 0; i--)
+        {
+            if (_sprite.LayerExists((ent.Owner, ent.Comp2), ent.Comp1.DigitKeys[i]))
+                return i + 1;
+        }
+
+        return 0;
+    }
+}
diff --git a/Content.Client/Alerts/UpdateAlertSpriteEvent.cs b/Content.Client/Alerts/UpdateAlertSpriteEvent.cs
index 4f182c458c..d8222c2340 100644
--- a/Content.Client/Alerts/UpdateAlertSpriteEvent.cs
+++ b/Content.Client/Alerts/UpdateAlertSpriteEvent.cs
@@ -11,11 +11,14 @@ public record struct UpdateAlertSpriteEvent
 {
     public Entity<SpriteComponent> SpriteViewEnt;
 
+    public EntityUid ViewerEnt;
+
     public AlertPrototype Alert;
 
-    public UpdateAlertSpriteEvent(Entity<SpriteComponent> spriteViewEnt, AlertPrototype alert)
+    public UpdateAlertSpriteEvent(Entity<SpriteComponent> spriteViewEnt, EntityUid viewerEnt, AlertPrototype alert)
     {
         SpriteViewEnt = spriteViewEnt;
+        ViewerEnt = viewerEnt;
         Alert = alert;
     }
 }
diff --git a/Content.Client/Animals/Systems/ParrotMemorySystem.cs b/Content.Client/Animals/Systems/ParrotMemorySystem.cs
new file mode 100644
index 0000000000..cdf62a4eae
--- /dev/null
+++ b/Content.Client/Animals/Systems/ParrotMemorySystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Animals.Systems;
+
+namespace Content.Client.Animals.Systems;
+
+public sealed class ParrotMemorySystem : SharedParrotMemorySystem;
diff --git a/Content.Client/Anomaly/AnomalySystem.cs b/Content.Client/Anomaly/AnomalySystem.cs
index 83f15a9086..4eee43fac6 100644
--- a/Content.Client/Anomaly/AnomalySystem.cs
+++ b/Content.Client/Anomaly/AnomalySystem.cs
@@ -62,11 +62,11 @@ public sealed class AnomalySystem : SharedAnomalySystem
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<AnomalySupercriticalComponent, SpriteComponent>();
+        var query = EntityQueryEnumerator<AnomalyComponent, AnomalySupercriticalComponent, SpriteComponent>();
 
-        while (query.MoveNext(out var uid, out var super, out var sprite))
+        while (query.MoveNext(out var uid, out var anomaly, out var super, out var sprite))
         {
-            var completion = 1f - (float)((super.EndTime - _timing.CurTime) / super.SupercriticalDuration);
+            var completion = 1f - (float) ((super.EndTime - _timing.CurTime) / anomaly.SupercriticalDuration);
             var scale = completion * (super.MaxScaleAmount - 1f) + 1f;
             _sprite.SetScale((uid, sprite), new Vector2(scale, scale));
 
diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
index 15ebc8a993..d96980fb1d 100644
--- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
+++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Components;
+using Content.Shared.Humanoid;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Anomaly.Effects;
@@ -25,9 +25,8 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
 
         var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap);
 
-        if (TryComp<BodyComponent>(ent, out var body) &&
-            body.Prototype is not null &&
-            ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
+        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoidAppearance) &&
+            ent.Comp.SpeciesSprites.TryGetValue(humanoidAppearance.Species, out var speciesSprite))
         {
             _sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite);
         }
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
index 20902722ff..94bfb4b4f3 100644
--- a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
@@ -162,10 +162,10 @@ public sealed partial class AtmosMonitoringConsoleNavMapControl : NavMapControl
         {
             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/GasCanisterAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
new file mode 100644
index 0000000000..f16774ce24
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+/// <summary>
+/// Used to change the appearance of gas canisters.
+/// </summary>
+public sealed class GasCanisterAppearanceSystem : VisualizerSystem<GasCanisterComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    protected override void OnAppearanceChange(EntityUid uid, GasCanisterComponent component, ref AppearanceChangeEvent args)
+    {
+        if (!AppearanceSystem.TryGetData<string>(uid, PaintableVisuals.Prototype, out var protoName, args.Component) || args.Sprite is not { } old)
+            return;
+
+        if (!_prototypeManager.HasIndex(protoName))
+            return;
+
+        // Create the given prototype and get its first layer.
+        var tempUid = Spawn(protoName);
+        SpriteSystem.LayerSetRsiState(uid, 0, SpriteSystem.LayerGetRsiState(tempUid, 0));
+        QueueDel(tempUid);
+    }
+}
diff --git a/Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs b/Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs
new file mode 100644
index 0000000000..6f12297ff0
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Atmos.Piping.Binary.Components;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+/// <summary>
+/// Represents the client system responsible for managing and updating the gas pressure regulator interface.
+/// Inherits from the shared system <see cref="SharedGasPressureRegulatorSystem"/>.
+/// </summary>
+public sealed partial class GasPressureRegulatorSystem : SharedGasPressureRegulatorSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GasPressureRegulatorComponent, AfterAutoHandleStateEvent>(OnValveUpdate);
+    }
+
+    private void OnValveUpdate(Entity<GasPressureRegulatorComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateUi(ent);
+    }
+
+    protected override void UpdateUi(Entity<GasPressureRegulatorComponent> ent)
+    {
+        if (UserInterfaceSystem.TryGetOpenUi(ent.Owner, GasPressureRegulatorUiKey.Key, out var bui))
+        {
+            bui.Update();
+        }
+    }
+}
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
index 697a027aa2..f0dc29facf 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/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
index 8502cd2712..8586049cb1 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
@@ -59,7 +59,7 @@ public sealed partial class PumpControl : BoxContainer
 
         foreach (var value in Enum.GetValues<VentPumpDirection>())
         {
-            _pumpDirection.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pumpDirection.SelectId((int) _data.PumpDirection);
@@ -72,7 +72,7 @@ public sealed partial class PumpControl : BoxContainer
 
         foreach (var value in Enum.GetValues<VentPressureBound>())
         {
-            _pressureCheck.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pressureCheck.AddItem(Loc.GetString($"air-alarm-ui-pressure-bound-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pressureCheck.SelectId((int) _data.PressureChecks);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
index 34c1a9dd1a..c26aa2cf6e 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
@@ -27,9 +27,15 @@
                 </BoxContainer>
                 <!-- Lower row: every single gas -->
                 <Collapsible Margin="2 2 2 2">
-                    <CollapsibleHeading Title="Gas filters" />
+                    <CollapsibleHeading Title="{Loc 'air-alarm-ui-widget-gas-filters'}" />
                     <CollapsibleBody Margin="20 0 0 0">
-                        <GridContainer HorizontalExpand="True" Name="CGasContainer" Columns="3" />
+                        <BoxContainer Orientation="Vertical">
+                            <BoxContainer Margin="2">
+                                <Button Name="CSelectAll" Text="{Loc 'air-alarm-ui-scrubber-select-all-gases-label'}" />
+                                <Button Name="CDeselectAll" Text="{Loc 'air-alarm-ui-scrubber-deselect-all-gases-label'}" />
+                            </BoxContainer>
+                            <GridContainer Name="CGasContainer" Columns="3" />
+                        </BoxContainer>
                     </CollapsibleBody>
                 </Collapsible>
             </BoxContainer>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
index 9762f63992..70da57df2e 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
@@ -1,15 +1,21 @@
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.Monitor.UI.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class ScrubberControl : BoxContainer
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
     private GasVentScrubberData _data;
     private string _address;
 
@@ -22,12 +28,18 @@ public sealed partial class ScrubberControl : BoxContainer
     private FloatSpinBox _volumeRate => CVolumeRate;
     private CheckBox _wideNet => CWideNet;
     private Button _copySettings => CCopySettings;
+    private Button _selectAll => CSelectAll;
+    private Button _deselectAll => CDeselectAll;
 
     private GridContainer _gases => CGasContainer;
     private Dictionary<Gas, Button> _gasControls = new();
 
     public ScrubberControl(GasVentScrubberData data, string address)
     {
+
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         RobustXamlLoader.Load(this);
 
         Name = address;
@@ -61,7 +73,7 @@ public sealed partial class ScrubberControl : BoxContainer
 
         foreach (var value in Enum.GetValues<ScrubberPumpDirection>())
         {
-            _pumpDirection.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pumpDirection.SelectId((int) _data.PumpDirection);
@@ -78,12 +90,28 @@ public sealed partial class ScrubberControl : BoxContainer
             ScrubberDataCopied?.Invoke(_data);
         };
 
-        foreach (var value in Enum.GetValues<Gas>())
+        var allGases = Enum.GetValues<Gas>();
+        _selectAll.OnPressed += _ =>
         {
+            _data.FilterGases = new HashSet<Gas>(allGases);
+            ScrubberDataChanged?.Invoke(_address, _data);
+        };
+
+        _deselectAll.OnPressed += _ =>
+        {
+            _data.FilterGases = [];
+            ScrubberDataChanged?.Invoke(_address, _data);
+        };
+
+        foreach (var value in allGases)
+        {
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(value);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             var gasButton = new Button
             {
                 Name = value.ToString(),
-                Text = Loc.GetString($"{value}"),
+                Text = Loc.GetString(gasName),
                 ToggleMode = true,
                 HorizontalExpand = true,
                 Pressed = _data.FilterGases.Contains(value)
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
index 9e88b0bff4..d9945b1acc 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
@@ -1,16 +1,22 @@
 using Content.Client.Message;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Temperature;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.Monitor.UI.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class SensorInfo : BoxContainer
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
     public Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? OnThresholdUpdate;
     public event Action<AtmosSensorData>? SensorDataCopied;
     private string _address;
@@ -23,6 +29,9 @@ public sealed partial class SensorInfo : BoxContainer
 
     public SensorInfo(AtmosSensorData data, string address)
     {
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         RobustXamlLoader.Load(this);
 
         _address = address;
@@ -45,8 +54,12 @@ public sealed partial class SensorInfo : BoxContainer
             var label = new RichTextLabel();
 
             var fractionGas = amount / data.TotalMoles;
+
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
-                ("gas", $"{gas}"),
+                ("gas", Loc.GetString(gasName)),
                 ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
@@ -54,7 +67,7 @@ public sealed partial class SensorInfo : BoxContainer
             _gasLabels.Add(gas, label);
 
             var threshold = data.GasThresholds[gas];
-            var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title", ("gas", $"{gas}")), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
+            var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title"), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
             gasThresholdControl.Margin = new Thickness(20, 2, 2, 2);
             gasThresholdControl.ThresholdDataChanged += (type, alarmThreshold, arg3) =>
             {
@@ -90,6 +103,9 @@ public sealed partial class SensorInfo : BoxContainer
 
     public void ChangeData(AtmosSensorData data)
     {
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", data.AlarmState));
 
         AlarmStateLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-alarm-state-indicator",
@@ -112,8 +128,12 @@ public sealed partial class SensorInfo : BoxContainer
             }
 
             var fractionGas = amount / data.TotalMoles;
+
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
-                ("gas", $"{gas}"),
+                ("gas", Loc.GetString(gasName)),
                 ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
index 0d5e741d0f..7ce21fdd78 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
@@ -2,6 +2,6 @@
     HorizontalExpand="True" Orientation="Vertical"
             Margin = "20 0 0 0" MinSize="160 0" >
     <Label Name="CBoundLabel" HorizontalAlignment="Center" />
-    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'Enable'}" Pressed="True" />
+    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'air-alarm-ui-widget-enable'}" Pressed="True" />
     <FloatSpinBox Name="CSpinner" />
 </BoxContainer>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
index 635a70f532..76fc1621ab 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
@@ -6,7 +6,7 @@
         <CollapsibleBody Margin="20 0 0 0">
             <BoxContainer Orientation="Vertical">
                 <BoxContainer Orientation="Horizontal">
-                    <CheckBox Name="CEnabled" Text="{Loc 'Enabled'}" />
+                    <CheckBox Name="CEnabled" Text="{Loc 'air-alarm-ui-widget-enable'}" />
                 </BoxContainer>
                 <!-- Upper row: Danger bounds -->
                 <BoxContainer Name="CDangerBounds" Orientation="Horizontal" Margin="0 0 0 2"/>
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
index cdbcb5b3f6..d91cc29e4c 100644
--- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -19,6 +19,8 @@ namespace Content.Client.Atmos.Overlays
 {
     public sealed class GasTileOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
         private readonly IEntityManager _entManager;
         private readonly IMapManager _mapManager;
         private readonly SharedMapSystem _mapSystem;
@@ -54,7 +56,7 @@ namespace Content.Client.Atmos.Overlays
             _mapManager = IoCManager.Resolve<IMapManager>();
             _mapSystem = entManager.System<SharedMapSystem>();
             _xformSys = xformSys;
-            _shader = protoMan.Index<ShaderPrototype>("unshaded").Instance();
+            _shader = protoMan.Index(UnshadedShader).Instance();
             ZIndex = GasOverlayZIndex;
 
             _gasCount = system.VisibleGasId.Length;
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
new file mode 100644
index 0000000000..9d66a9985f
--- /dev/null
+++ b/Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Localizations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Atmos.UI;
+
+public sealed class GasPressureRegulatorBoundUserInterface(EntityUid owner, Enum uiKey)
+    : BoundUserInterface(owner, uiKey)
+{
+    private GasPressureRegulatorWindow? _window;
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<GasPressureRegulatorWindow>();
+
+        _window.SetEntity(Owner);
+
+        _window.ThresholdPressureChanged += OnThresholdChanged;
+
+        if (EntMan.TryGetComponent(Owner, out GasPressureRegulatorComponent? comp))
+            _window.SetThresholdPressureInput(comp.Threshold);
+
+        Update();
+    }
+
+    public override void Update()
+    {
+        if (_window == null)
+            return;
+
+        _window.Title = Identity.Name(Owner, EntMan);
+
+        if (!EntMan.TryGetComponent(Owner, out GasPressureRegulatorComponent? comp))
+            return;
+
+        _window.SetThresholdPressureLabel(comp.Threshold);
+        _window.UpdateInfo(comp.InletPressure, comp.OutletPressure, comp.FlowRate);
+    }
+
+    private void OnThresholdChanged(string newThreshold)
+    {
+        var sentThreshold = 0f;
+
+        if (UserInputParser.TryFloat(newThreshold, out var parsedNewThreshold) && parsedNewThreshold >= 0 &&
+            !float.IsInfinity(parsedNewThreshold))
+        {
+            sentThreshold = parsedNewThreshold;
+        }
+
+        // Autofill to zero if the user inputs an invalid value.
+        _window?.SetThresholdPressureInput(sentThreshold);
+
+        SendPredictedMessage(new GasPressureRegulatorChangeThresholdMessage(sentThreshold));
+    }
+}
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml
new file mode 100644
index 0000000000..b6a55f769e
--- /dev/null
+++ b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml
@@ -0,0 +1,96 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      SetSize="345 380"
+                      MinSize="345 380"
+                      Title="{Loc gas-pressure-regulator-ui-title}"
+                      Resizable="False">
+
+    <BoxContainer Orientation="Vertical">
+
+        <BoxContainer Orientation="Vertical" Margin="0 10 0 10">
+
+            <BoxContainer Orientation="Vertical" Align="Center">
+                <Label Text="{Loc gas-pressure-regulator-ui-outlet}" Align="Center" StyleClasses="LabelKeyText" />
+                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
+                    <Label Name="OutletPressureLabel" Text="N/A" Margin="0 0 4 0" />
+                    <Label Text="{Loc gas-pressure-regulator-ui-pressure-unit}" />
+                </BoxContainer>
+            </BoxContainer>
+
+            <BoxContainer Orientation="Horizontal" Align="Center">
+                <BoxContainer Orientation="Vertical" Align="Center" HorizontalExpand="True">
+                    <Label Text="{Loc gas-pressure-regulator-ui-target}" Align="Right" StyleClasses="LabelKeyText" />
+                    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Right">
+                        <Label Name="TargetPressureLabel" Margin="0 0 4 0" />
+                        <Label Text="{Loc gas-pressure-regulator-ui-pressure-unit}" />
+                    </BoxContainer>
+                </BoxContainer>
+
+                <ProgressBar Name="ToTargetBar" MaxValue="1" SetSize="5 75" Margin="10" Vertical="True" />
+
+                <SpriteView Name="EntityView" SetSize="64 64" Scale="3 3" OverrideDirection="North" Margin="0" />
+
+                <ProgressBar Name="FlowRateBar" MaxValue="1" SetSize="5 75" Margin="10" Vertical="True" />
+
+                <BoxContainer Orientation="Vertical" Align="Center" HorizontalExpand="True">
+                    <Label Text="{Loc gas-pressure-regulator-ui-flow}" StyleClasses="LabelKeyText" />
+                    <BoxContainer Orientation="Horizontal">
+                        <Label Name="CurrentFlowLabel" Text="N/A" Margin="0 0 4 0" />
+                        <Label Text="{Loc gas-pressure-regulator-ui-flow-rate-unit}" />
+                    </BoxContainer>
+                </BoxContainer>
+            </BoxContainer>
+
+            <BoxContainer Orientation="Vertical" Align="Center" Margin="1">
+                <Label Text="{Loc gas-pressure-regulator-ui-inlet}" Align="Center" StyleClasses="LabelKeyText" />
+                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
+                    <Label Name="InletPressureLabel" Text="N/A" Margin="0 0 4 0" />
+                    <Label Text="{Loc gas-pressure-regulator-ui-pressure-unit}" />
+                </BoxContainer>
+            </BoxContainer>
+
+        </BoxContainer>
+
+        <!-- Controls to Set Pressure -->
+        <controls:StripeBack Name="SetPressureStripeBack" HorizontalExpand="True">
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="10 10 10 10">
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <LineEdit Name="ThresholdInput" HorizontalExpand="True" MinSize="70 0" />
+                    <Button Name="SetThresholdButton" Text="{Loc gas-pressure-regulator-ui-set-threshold}"
+                            Disabled="True" Margin="5 0 0 0" />
+                </BoxContainer>
+
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 5 0 0">
+                    <Button Name="Subtract1000Button" Text="{Loc gas-pressure-regulator-ui-subtract-1000}"
+                            HorizontalExpand="True" Margin="0 2 2 0"
+                            StyleClasses="OpenBoth" />
+                    <Button Name="Subtract100Button" Text="{Loc gas-pressure-regulator-ui-subtract-100}"
+                            HorizontalExpand="True" Margin="0 2 2 0"
+                            StyleClasses="OpenBoth" />
+                    <Button Name="Subtract10Button" Text="{Loc gas-pressure-regulator-ui-subtract-10}"
+                            HorizontalExpand="True" Margin="0 2 2 0"
+                            StyleClasses="OpenBoth" />
+                    <Button Name="Add10Button" Text="{Loc gas-pressure-regulator-ui-add-10}" HorizontalExpand="True"
+                            Margin="0 2 2 0"
+                            StyleClasses="OpenBoth" />
+                    <Button Name="Add100Button" Text="{Loc gas-pressure-regulator-ui-add-100}"
+                            HorizontalExpand="True" Margin="0 2 2 0"
+                            StyleClasses="OpenBoth" />
+                    <Button Name="Add1000Button" Text="{Loc gas-pressure-regulator-ui-add-1000}"
+                            HorizontalExpand="True" Margin="0 2 2 0"
+                            StyleClasses="OpenBoth" />
+                </BoxContainer>
+
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 5 0 0">
+                    <Button Name="ZeroThresholdButton" Text="{Loc gas-pressure-regulator-ui-zero-threshold}"
+                            HorizontalExpand="True" Margin="0 0 5 0" />
+                    <Button Name="SetToCurrentPressureButton"
+                            Text="{Loc gas-pressure-regulator-ui-set-to-current-pressure}" HorizontalExpand="True" />
+                </BoxContainer>
+            </BoxContainer>
+        </controls:StripeBack>
+
+    </BoxContainer>
+
+</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
new file mode 100644
index 0000000000..a7c0570bac
--- /dev/null
+++ b/Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs
@@ -0,0 +1,129 @@
+using System.Globalization;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Atmos.UI;
+
+/// <summary>
+/// Client-side UI for controlling a pressure regulator.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class GasPressureRegulatorWindow : FancyWindow
+{
+    private float _flowRate;
+
+    public GasPressureRegulatorWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        ThresholdInput.OnTextChanged += _ => SetThresholdButton.Disabled = false;
+        SetThresholdButton.OnPressed += _ =>
+        {
+            ThresholdPressureChanged?.Invoke(ThresholdInput.Text ??= "");
+            SetThresholdButton.Disabled = true;
+        };
+
+        SetToCurrentPressureButton.OnPressed += _ =>
+        {
+            if (InletPressureLabel.Text != null)
+            {
+                ThresholdInput.Text = InletPressureLabel.Text;
+            }
+
+            SetThresholdButton.Disabled = false;
+        };
+
+        ZeroThresholdButton.OnPressed += _ =>
+        {
+            ThresholdInput.Text = "0";
+            SetThresholdButton.Disabled = false;
+        };
+
+        Add1000Button.OnPressed += _ => AdjustThreshold(1000);
+        Add100Button.OnPressed += _ => AdjustThreshold(100);
+        Add10Button.OnPressed += _ => AdjustThreshold(10);
+        Subtract10Button.OnPressed += _ => AdjustThreshold(-10);
+        Subtract100Button.OnPressed += _ => AdjustThreshold(-100);
+        Subtract1000Button.OnPressed += _ => AdjustThreshold(-1000);
+        return;
+
+        void AdjustThreshold(float adjustment)
+        {
+            if (float.TryParse(ThresholdInput.Text, out var currentValue))
+            {
+                ThresholdInput.Text = (currentValue + adjustment).ToString(CultureInfo.CurrentCulture);
+                SetThresholdButton.Disabled = false;
+            }
+        }
+    }
+
+    public event Action<string>? ThresholdPressureChanged;
+
+    /// <summary>
+    /// Sets the current threshold pressure label. This is not setting the threshold input box.
+    /// </summary>
+    /// <param name="threshold"> Threshold to set.</param>
+    public void SetThresholdPressureLabel(float threshold)
+    {
+        TargetPressureLabel.Text = threshold.ToString(CultureInfo.CurrentCulture);
+    }
+
+    /// <summary>
+    /// Sets the threshold pressure input field with the given value.
+    /// When the client opens the UI the field will be autofilled with the current threshold pressure.
+    /// </summary>
+    /// <param name="input">The threshold pressure value to autofill into the input field.</param>
+    public void SetThresholdPressureInput(float input)
+    {
+        ThresholdInput.Text = input.ToString(CultureInfo.CurrentCulture);
+    }
+
+    /// <summary>
+    /// Sets the entity to be visible in the UI.
+    /// </summary>
+    /// <param name="entity"></param>
+    public void SetEntity(EntityUid entity)
+    {
+        EntityView.SetEntity(entity);
+    }
+
+    /// <summary>
+    /// Updates the UI for the labels.
+    /// </summary>
+    /// <param name="inletPressure">The current pressure at the valve's inlet.</param>
+    /// <param name="outletPressure">The current pressure at the valve's outlet.</param>
+    /// <param name="flowRate">The current flow rate through the valve.</param>
+    public void UpdateInfo(float inletPressure, float outletPressure, float flowRate)
+    {
+        if (float.TryParse(TargetPressureLabel.Text, out var parsedfloat))
+            ToTargetBar.Value = inletPressure / parsedfloat;
+
+        InletPressureLabel.Text = float.Round(inletPressure).ToString(CultureInfo.CurrentCulture);
+        OutletPressureLabel.Text = float.Round(outletPressure).ToString(CultureInfo.CurrentCulture);
+        CurrentFlowLabel.Text = float.IsNaN(flowRate) ? "0" : flowRate.ToString(CultureInfo.CurrentCulture);
+        _flowRate = flowRate;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        // Defines the flow rate at which the progress bar fills in one second.
+        // If the flow rate is >50 L/s, the bar will take <1 second to fill.
+        // If the flow rate is <50 L/s, the bar will take >1 second to fill.
+        const int barFillPerSecond = 50;
+
+        var maxValue = FlowRateBar.MaxValue;
+
+        // Increment the progress bar value based on elapsed time
+        FlowRateBar.Value += (_flowRate / barFillPerSecond) * args.DeltaSeconds;
+
+        // Reset the progress bar when it is fully filled
+        if (FlowRateBar.Value >= maxValue)
+        {
+            FlowRateBar.Value = 0f;
+        }
+    }
+}
diff --git a/Content.Client/Audio/AmbientOverlayCommand.cs b/Content.Client/Audio/AmbientOverlayCommand.cs
index 909353cd24..7bbc6c6cbf 100644
--- a/Content.Client/Audio/AmbientOverlayCommand.cs
+++ b/Content.Client/Audio/AmbientOverlayCommand.cs
@@ -2,16 +2,16 @@ using Robust.Shared.Console;
 
 namespace Content.Client.Audio;
 
-public sealed class AmbientOverlayCommand : IConsoleCommand
+public sealed class AmbientOverlayCommand : LocalizedEntityCommands
 {
-    public string Command => "showambient";
-    public string Description => "Shows all AmbientSoundComponents in the viewport";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AmbientSoundSystem>();
-        system.OverlayEnabled ^= true;
+    [Dependency] private readonly AmbientSoundSystem _ambient = default!;
 
-        shell.WriteLine($"Ambient sound overlay set to {system.OverlayEnabled}");
+    public override string Command => "showambient";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        _ambient.OverlayEnabled ^= true;
+
+        shell.WriteLine(Loc.GetString($"cmd-showambient-status", ("status", _ambient.OverlayEnabled)));
     }
 }
diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs
index b525747aa9..e6ea94c3a6 100644
--- a/Content.Client/Audio/AmbientSoundSystem.cs
+++ b/Content.Client/Audio/AmbientSoundSystem.cs
@@ -168,7 +168,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem
         _targetTime = _gameTiming.CurTime + TimeSpan.FromSeconds(_cooldown);
 
         var player = _playerManager.LocalEntity;
-        if (!EntityManager.TryGetComponent(player, out TransformComponent? xform))
+        if (!TryComp(player, out TransformComponent? xform))
         {
             ClearSounds();
             return;
diff --git a/Content.Client/Bed/StasisBedSystem.cs b/Content.Client/Bed/StasisBedSystem.cs
deleted file mode 100644
index 6065ec839f..0000000000
--- a/Content.Client/Bed/StasisBedSystem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Bed;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Bed;
-
-public sealed class StasisBedSystem : VisualizerSystem<StasisBedVisualsComponent>
-{
-    protected override void OnAppearanceChange(EntityUid uid, StasisBedVisualsComponent component, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite != null
-            && AppearanceSystem.TryGetData<bool>(uid, StasisBedVisuals.IsOn, out var isOn, args.Component))
-        {
-            SpriteSystem.LayerSetVisible((uid, args.Sprite), StasisBedVisualLayers.IsOn, isOn);
-        }
-    }
-}
-
-public enum StasisBedVisualLayers : byte
-{
-    IsOn,
-}
diff --git a/Content.Client/Body/Systems/BloodStreamSystem.cs b/Content.Client/Body/Systems/BloodStreamSystem.cs
new file mode 100644
index 0000000000..85f4f6198e
--- /dev/null
+++ b/Content.Client/Body/Systems/BloodStreamSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Body.Systems;
+
+namespace Content.Client.Body.Systems;
+
+public sealed class BloodstreamSystem : SharedBloodstreamSystem;
diff --git a/Content.Client/Body/Systems/MetabolizerSystem.cs b/Content.Client/Body/Systems/MetabolizerSystem.cs
new file mode 100644
index 0000000000..2a0ba4606d
--- /dev/null
+++ b/Content.Client/Body/Systems/MetabolizerSystem.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Body.Systems;
+
+namespace Content.Client.Body.Systems;
+
+/// <inheritdoc/>
+public sealed class MetabolizerSystem : SharedMetabolizerSystem;
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index e52ce03a76..ecebe16727 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -1,8 +1,8 @@
 using System.Numerics;
-using Content.Shared.Body.Components;
 using Content.Shared.CardboardBox;
 using Content.Shared.CardboardBox.Components;
 using Content.Shared.Examine;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Robust.Client.GameObjects;
 
@@ -15,13 +15,13 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
-    private EntityQuery<BodyComponent> _bodyQuery;
+    private EntityQuery<MobStateComponent> _mobStateQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        _bodyQuery = GetEntityQuery<BodyComponent>();
+        _mobStateQuery = GetEntityQuery<MobStateComponent>();
 
         SubscribeNetworkEvent<PlayBoxEffectMessage>(OnBoxEffect);
     }
@@ -66,8 +66,8 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
             if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
-            // no effect for anything too exotic
-            if (!_bodyQuery.HasComp(mob))
+            // no effect for non-mobs that have MobMover, such as mechs and vehicles.
+            if (!_mobStateQuery.HasComp(mob))
                 continue;
 
             var ent = Spawn(box.Effect, mapPos);
diff --git a/Content.Client/Changeling/Transform/ChangelingTransformBoundUserInterface.cs b/Content.Client/Changeling/Transform/ChangelingTransformBoundUserInterface.cs
new file mode 100644
index 0000000000..8e383bc967
--- /dev/null
+++ b/Content.Client/Changeling/Transform/ChangelingTransformBoundUserInterface.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Changeling.Transform;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Changeling.Transform;
+
+[UsedImplicitly]
+public sealed partial class ChangelingTransformBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
+{
+    private ChangelingTransformMenu? _window;
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<ChangelingTransformMenu>();
+
+        _window.OnIdentitySelect += SendIdentitySelect;
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not ChangelingTransformBoundUserInterfaceState current)
+            return;
+
+        _window?.UpdateState(current);
+    }
+
+    public void SendIdentitySelect(NetEntity identityId)
+    {
+        SendPredictedMessage(new ChangelingTransformIdentitySelectMessage(identityId));
+    }
+}
diff --git a/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml
new file mode 100644
index 0000000000..38ae0ec715
--- /dev/null
+++ b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml
@@ -0,0 +1,8 @@
+<ui:RadialMenu
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+    CloseButtonStyleClass="RadialMenuCloseButton"
+    VerticalExpand="True"
+    HorizontalExpand="True">
+    <ui:RadialContainer Name="Main">
+    </ui:RadialContainer>
+</ui:RadialMenu>
diff --git a/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml.cs b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml.cs
new file mode 100644
index 0000000000..beef9ae427
--- /dev/null
+++ b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml.cs
@@ -0,0 +1,60 @@
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Changeling.Transform;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Changeling.Transform;
+
+[GenerateTypedNameReferences]
+public sealed partial class ChangelingTransformMenu : RadialMenu
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    public event Action<NetEntity>? OnIdentitySelect;
+
+    public ChangelingTransformMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+    }
+
+    public void UpdateState(ChangelingTransformBoundUserInterfaceState state)
+    {
+        Main.DisposeAllChildren();
+        foreach (var identity in state.Identites)
+        {
+            var identityUid = _entity.GetEntity(identity);
+
+            if (!_entity.TryGetComponent<MetaDataComponent>(identityUid, out var metadata))
+                continue;
+
+            var identityName = metadata.EntityName;
+
+            var button = new ChangelingTransformMenuButton()
+            {
+                StyleClasses = { "RadialMenuButton" },
+                SetSize = new Vector2(64, 64),
+                ToolTip = identityName,
+            };
+
+            var entView = new SpriteView()
+            {
+                SetSize = new Vector2(48, 48),
+                VerticalAlignment = VAlignment.Center,
+                HorizontalAlignment = HAlignment.Center,
+                Stretch = SpriteView.StretchMode.Fill,
+            };
+            entView.SetEntity(identityUid);
+            button.OnButtonUp += _ =>
+            {
+                OnIdentitySelect?.Invoke(identity);
+                Close();
+            };
+            button.AddChild(entView);
+            Main.AddChild(button);
+        }
+    }
+}
+
+public sealed class ChangelingTransformMenuButton : RadialMenuTextureButtonWithSector;
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index f46ffa7b91..d82c34254c 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -15,8 +15,8 @@ namespace Content.Client.Changelog
     [GenerateTypedNameReferences]
     public sealed partial class ChangelogWindow : FancyWindow
     {
-        [Dependency] private readonly ChangelogManager _changelog = default!;
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
+        [Dependency] private readonly ChangelogManager _changelog = default!;
 
         public ChangelogWindow()
         {
@@ -112,15 +112,15 @@ namespace Content.Client.Changelog
     }
 
     [UsedImplicitly, AnyCommand]
-    public sealed class ChangelogCommand : IConsoleCommand
+    public sealed class ChangelogCommand : LocalizedCommands
     {
-        public string Command => "changelog";
-        public string Description => "Opens the changelog";
-        public string Help => "Usage: changelog";
+        [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "changelog";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            IoCManager.Resolve<IUserInterfaceManager>().GetUIController<ChangelogUIController>().OpenWindow();
+            _uiManager.GetUIController<ChangelogUIController>().OpenWindow();
         }
     }
 }
diff --git a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
index 374b00aa6e..3392545be8 100644
--- a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
@@ -18,14 +18,10 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
 {
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultMixingCategory = "DummyMix";
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultGrindCategory = "DummyGrind";
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultJuiceCategory = "DummyJuice";
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultCondenseCategory = "DummyCondense";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultMixingCategory = "DummyMix";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultGrindCategory = "DummyGrind";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultJuiceCategory = "DummyJuice";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultCondenseCategory = "DummyCondense";
 
     private readonly Dictionary<string, List<ReagentSourceData>> _reagentSources = new();
 
diff --git a/Content.Client/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs
similarity index 70%
rename from Content.Client/Chemistry/EntitySystems/HypospraySystem.cs
rename to Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs
index ee7aa3aafe..4dfc8506d2 100644
--- a/Content.Client/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs
@@ -5,8 +5,9 @@ using Content.Shared.Chemistry.EntitySystems;
 
 namespace Content.Client.Chemistry.EntitySystems;
 
-public sealed class HypospraySystem : SharedHypospraySystem
+public sealed class HyposprayStatusControlSystem : EntitySystem
 {
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Client/Cloning/CloningSystem.cs b/Content.Client/Cloning/CloningSystem.cs
new file mode 100644
index 0000000000..9bfa230295
--- /dev/null
+++ b/Content.Client/Cloning/CloningSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Cloning;
+
+namespace Content.Client.Cloning;
+
+public sealed partial class CloningSystem : SharedCloningSystem;
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 4dc7cc9173..3dbe3720ba 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -67,7 +67,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
+        SubscribeLocalEvent<InventoryComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -90,20 +90,19 @@ public sealed class ClientClothingSystem : ClothingSystem
         }
     }
 
-    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
+    private void OnInventoryTemplateUpdated(Entity<InventoryComponent> ent, ref InventoryTemplateUpdated args)
     {
-        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
+        UpdateAllSlots(ent.Owner, ent.Comp);
     }
 
     private void UpdateAllSlots(
         EntityUid uid,
-        InventoryComponent? inventoryComponent = null,
-        ClothingComponent? clothing = null)
+        InventoryComponent? inventoryComponent = null)
     {
         var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
         while (enumerator.NextItem(out var item, out var slot))
         {
-            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
+            RenderEquipment(uid, item, slot.Name, inventoryComponent);
         }
     }
 
diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
index 9ca94fc3b4..749a6839b6 100644
--- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
+++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
@@ -8,6 +8,8 @@ namespace Content.Client.CombatMode
 {
     public sealed class ColoredScreenBorderOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> Shader = "ColoredScreenBorder";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -16,7 +18,7 @@ namespace Content.Client.CombatMode
         public ColoredScreenBorderOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("ColoredScreenBorder").Instance();
+            _shader = _prototypeManager.Index(Shader).Instance();
         }
 
         protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs
index c4aa8847e4..ec9f74526e 100644
--- a/Content.Client/Commands/DebugCommands.cs
+++ b/Content.Client/Commands/DebugCommands.cs
@@ -1,53 +1,42 @@
 using Content.Client.Markers;
 using Content.Client.Popups;
 using Content.Client.SubFloor;
-using Content.Shared.SubFloor;
-using Robust.Client.GameObjects;
 using Robust.Shared.Console;
-using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Commands;
 
-internal sealed class ShowMarkersCommand : LocalizedCommands
+internal sealed class ShowMarkersCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly MarkerSystem _markerSystem = default!;
 
     public override string Command => "showmarkers";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible ^= true;
+        _markerSystem.MarkersVisible ^= true;
     }
 }
 
-internal sealed class ShowSubFloor : LocalizedCommands
+internal sealed class ShowSubFloor : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
 
     public override string Command => "showsubfloor";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _entitySystemManager.GetEntitySystem<SubFloorHideSystem>().ShowAll ^= true;
+        _subfloorSystem.ShowAll ^= true;
     }
 }
 
-internal sealed class NotifyCommand : LocalizedCommands
+internal sealed class NotifyCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
 
     public override string Command => "notify";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var message = args[0];
-
-        _entitySystemManager.GetEntitySystem<PopupSystem>().PopupCursor(message);
+        _popupSystem.PopupCursor(args[0]);
     }
 }
diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index db68a56257..00e024a72c 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -5,32 +5,27 @@ using Robust.Shared.Containers;
 
 namespace Content.Client.Commands;
 
-public sealed class HideMechanismsCommand : LocalizedCommands
+public sealed class HideMechanismsCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
 
     public override string Command => "hidemechanisms";
 
-    public override string Description => LocalizationManager.GetString($"cmd-{Command}-desc", ("showMechanismsCommand", ShowMechanismsCommand.CommandName));
-
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var containerSys = _entityManager.System<SharedContainerSystem>();
-        var spriteSys = _entityManager.System<SpriteSystem>();
-        var query = _entityManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
+        var query = EntityManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
 
         while (query.MoveNext(out var uid, out _, out var sprite))
         {
-            spriteSys.SetContainerOccluded((uid, sprite), false);
+            _spriteSystem.SetContainerOccluded((uid, sprite), false);
 
             var tempParent = uid;
-            while (containerSys.TryGetContainingContainer((tempParent, null, null), out var container))
+            while (_containerSystem.TryGetContainingContainer((tempParent, null, null), out var container))
             {
                 if (!container.ShowContents)
                 {
-                    spriteSys.SetContainerOccluded((uid, sprite), true);
+                    _spriteSystem.SetContainerOccluded((uid, sprite), true);
                     break;
                 }
 
diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs
index 99a8ba00fe..70a383b5f6 100644
--- a/Content.Client/Commands/MappingClientSideSetupCommand.cs
+++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs
@@ -1,32 +1,29 @@
 using Content.Client.Actions;
-using Content.Client.Mapping;
 using Content.Client.Markers;
-using JetBrains.Annotations;
+using Content.Client.SubFloor;
 using Robust.Client.Graphics;
-using Robust.Client.State;
 using Robust.Shared.Console;
 
 namespace Content.Client.Commands;
 
-[UsedImplicitly]
-internal sealed class MappingClientSideSetupCommand : LocalizedCommands
+internal sealed class MappingClientSideSetupCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
+    [Dependency] private readonly ActionsSystem _actionSystem = default!;
+    [Dependency] private readonly MarkerSystem _markerSystem = default!;
+    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
 
     public override string Command => "mappingclientsidesetup";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        if (!_lightManager.LockConsoleAccess)
-        {
-            _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
-            _lightManager.Enabled = false;
-            shell.ExecuteCommand("showsubfloor");
-            _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
-        }
+        if (_lightManager.LockConsoleAccess)
+            return;
+
+        _markerSystem.MarkersVisible = true;
+        _lightManager.Enabled = false;
+        _subfloorSystem.ShowAll = true;
+        _actionSystem.LoadActionAssignments("/mapping_actions.yml", false);
     }
 }
 
diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs
index 6ea9d06c8c..a0408cc97d 100644
--- a/Content.Client/Commands/ShowHealthBarsCommand.cs
+++ b/Content.Client/Commands/ShowHealthBarsCommand.cs
@@ -1,57 +1,46 @@
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Overlays;
-using Robust.Client.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 using System.Linq;
 
 namespace Content.Client.Commands;
 
-public sealed class ShowHealthBarsCommand : LocalizedCommands
+public sealed class ShowHealthBarsCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     public override string Command => "showhealthbars";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var player = _playerManager.LocalSession;
+        var player = shell.Player;
         if (player == null)
         {
-            shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error-not-player"));
+            shell.WriteError(Loc.GetString("shell-only-players-can-run-this-command"));
             return;
         }
 
-        var playerEntity = player?.AttachedEntity;
-        if (!playerEntity.HasValue)
+        if (player.AttachedEntity is not { } playerEntity)
         {
-            shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error-no-entity"));
+            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
             return;
         }
 
-        if (!_entityManager.HasComponent<ShowHealthBarsComponent>(playerEntity))
+        if (!EntityManager.HasComponent<ShowHealthBarsComponent>(playerEntity))
         {
             var showHealthBarsComponent = new ShowHealthBarsComponent
             {
                 DamageContainers = args.Select(arg => new ProtoId<DamageContainerPrototype>(arg)).ToList(),
                 HealthStatusIcon = null,
-                NetSyncEnabled = false
+                NetSyncEnabled = false,
             };
 
-            _entityManager.AddComponent(playerEntity.Value, showHealthBarsComponent, true);
+            EntityManager.AddComponent(playerEntity, showHealthBarsComponent, true);
 
-            shell.WriteLine(LocalizationManager.GetString($"cmd-{Command}-notify-enabled", ("args", string.Join(", ", args))));
+            shell.WriteLine(Loc.GetString("cmd-showhealthbars-notify-enabled", ("args", string.Join(", ", args))));
             return;
         }
-        else
-        {
-            _entityManager.RemoveComponentDeferred<ShowHealthBarsComponent>(playerEntity.Value);
-            shell.WriteLine(LocalizationManager.GetString($"cmd-{Command}-notify-disabled"));
-        }
 
-        return;
+        EntityManager.RemoveComponentDeferred<ShowHealthBarsComponent>(playerEntity);
+        shell.WriteLine(Loc.GetString("cmd-showhealthbars-notify-disabled"));
     }
 }
diff --git a/Content.Client/Commands/ShowMechanismsCommand.cs b/Content.Client/Commands/ShowMechanismsCommand.cs
index 19305b207c..091fe05f89 100644
--- a/Content.Client/Commands/ShowMechanismsCommand.cs
+++ b/Content.Client/Commands/ShowMechanismsCommand.cs
@@ -4,24 +4,19 @@ using Robust.Shared.Console;
 
 namespace Content.Client.Commands;
 
-public sealed class ShowMechanismsCommand : LocalizedCommands
+public sealed class ShowMechanismsCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
 
-    public const string CommandName = "showmechanisms";
-
-    public override string Command => CommandName;
-
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
+    public override string Command => "showmechanisms";
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var spriteSys = _entManager.System<SpriteSystem>();
-        var query = _entManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
+        var query = EntityManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
 
         while (query.MoveNext(out var uid, out _, out var sprite))
         {
-            spriteSys.SetContainerOccluded((uid, sprite), false);
+            _spriteSystem.SetContainerOccluded((uid, sprite), false);
         }
     }
 }
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 24d339dfce..0e7557724f 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -286,14 +286,14 @@ namespace Content.Client.Construction
             if (!CheckConstructionConditions(prototype, loc, dir, user, showPopup: true))
                 return false;
 
-            ghost = EntityManager.SpawnEntity("constructionghost", loc);
-            var comp = EntityManager.GetComponent<ConstructionGhostComponent>(ghost.Value);
+            ghost = Spawn("constructionghost", loc);
+            var comp = Comp<ConstructionGhostComponent>(ghost.Value);
             comp.Prototype = prototype;
             comp.GhostId = ghost.GetHashCode();
-            EntityManager.GetComponent<TransformComponent>(ghost.Value).LocalRotation = dir.ToAngle();
+            Comp<TransformComponent>(ghost.Value).LocalRotation = dir.ToAngle();
             _ghosts.Add(comp.GhostId, ghost.Value);
 
-            var sprite = EntityManager.GetComponent<SpriteComponent>(ghost.Value);
+            var sprite = Comp<SpriteComponent>(ghost.Value);
             _sprite.SetColor((ghost.Value, sprite), new Color(48, 255, 48, 128));
 
             if (targetProto.TryGetComponent(out IconComponent? icon, EntityManager.ComponentFactory))
@@ -306,7 +306,7 @@ namespace Content.Client.Construction
             else if (targetProto.Components.TryGetValue("Sprite", out _))
             {
                 var dummy = EntityManager.SpawnEntity(targetProtoId, MapCoordinates.Nullspace);
-                var targetSprite = EntityManager.EnsureComponent<SpriteComponent>(dummy);
+                var targetSprite = EnsureComp<SpriteComponent>(dummy);
                 EntityManager.System<AppearanceSystem>().OnChangeData(dummy, targetSprite);
 
                 for (var i = 0; i < targetSprite.AllLayers.Count(); i++)
@@ -325,7 +325,7 @@ namespace Content.Client.Construction
                     _sprite.LayerSetVisible((ghost.Value, sprite), i, true);
                 }
 
-                EntityManager.DeleteEntity(dummy);
+                Del(dummy);
             }
             else
                 return false;
@@ -367,7 +367,7 @@ namespace Content.Client.Construction
         {
             foreach (var ghost in _ghosts)
             {
-                if (EntityManager.GetComponent<TransformComponent>(ghost.Value).Coordinates.Equals(loc))
+                if (Comp<TransformComponent>(ghost.Value).Coordinates.Equals(loc))
                     return true;
             }
 
@@ -384,7 +384,7 @@ namespace Content.Client.Construction
                 throw new ArgumentException($"Can't start construction for a ghost with no prototype. Ghost id: {ghostId}");
             }
 
-            var transform = EntityManager.GetComponent<TransformComponent>(ghostId);
+            var transform = Comp<TransformComponent>(ghostId);
             var msg = new TryStartStructureConstructionMessage(GetNetCoordinates(transform.Coordinates), ghostComp.Prototype.ID, transform.LocalRotation, ghostId.GetHashCode());
             RaiseNetworkEvent(msg);
         }
@@ -405,7 +405,7 @@ namespace Content.Client.Construction
             if (!_ghosts.TryGetValue(ghostId, out var ghost))
                 return;
 
-            EntityManager.QueueDeleteEntity(ghost);
+            QueueDel(ghost);
             _ghosts.Remove(ghostId);
         }
 
@@ -416,7 +416,7 @@ namespace Content.Client.Construction
         {
             foreach (var ghost in _ghosts.Values)
             {
-                EntityManager.QueueDeleteEntity(ghost);
+                QueueDel(ghost);
             }
 
             _ghosts.Clear();
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index 81410dc7e6..8ee8df48fd 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -27,8 +27,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
 
     private EntityUid _owner;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string NoBoardEffectId = "FlatpackerNoBoardEffect";
+    public static readonly EntProtoId NoBoardEffectId = "FlatpackerNoBoardEffect";
 
     private EntityUid? _currentBoard = EntityUid.Invalid;
 
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 142c7c52a4..9fed9e73e2 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -7,7 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
     <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
     <Platforms>AnyCPU</Platforms>
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
index 25063f8133..c973b9572b 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;
@@ -7,6 +8,8 @@ namespace Content.Client.Cooldown
 {
     public sealed class CooldownGraphic : Control
     {
+        private static readonly ProtoId<ShaderPrototype> Shader = "CooldownAnimation";
+
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPrototypeManager _protoMan = default!;
 
@@ -15,7 +18,7 @@ namespace Content.Client.Cooldown
         public CooldownGraphic()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _protoMan.Index<ShaderPrototype>("CooldownAnimation").InstanceUnique();
+            _shader = _protoMan.Index(Shader).InstanceUnique();
         }
 
         /// <summary>
@@ -34,7 +37,7 @@ namespace Content.Client.Cooldown
             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/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
index 5eaed77041..33b4fbc335 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
@@ -33,8 +33,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
     public readonly EntityUid Console;
 
-    [ValidatePrototypeId<LocalizedDatasetPrototype>]
-    private const string ReasonPlaceholders = "CriminalRecordsWantedReasonPlaceholders";
+    private static readonly ProtoId<LocalizedDatasetPrototype> ReasonPlaceholders = "CriminalRecordsWantedReasonPlaceholders";
 
     public Action<uint?>? OnKeySelected;
     public Action<StationRecordFilterType, string>? OnFiltersChanged;
@@ -296,7 +295,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
         var field = "reason";
         var title = Loc.GetString("criminal-records-status-" + status.ToString().ToLower());
-        var placeholders = _proto.Index<LocalizedDatasetPrototype>(ReasonPlaceholders);
+        var placeholders = _proto.Index(ReasonPlaceholders);
         var placeholder = Loc.GetString("criminal-records-console-reason-placeholder", ("placeholder", _random.Pick(placeholders))); // just funny it doesn't actually get used
         var prompt = Loc.GetString("criminal-records-console-reason");
         var entry = new QuickDialogEntry(field, QuickDialogEntryType.LongText, prompt, placeholder);
diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs
index 69eb461a7d..67abb77674 100644
--- a/Content.Client/Damage/Systems/StaminaSystem.cs
+++ b/Content.Client/Damage/Systems/StaminaSystem.cs
@@ -1,7 +1,129 @@
-using Content.Shared.Damage.Systems;
+using Content.Client.Stunnable;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
+using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Damage.Systems;
 
 public sealed partial class StaminaSystem : SharedStaminaSystem
 {
+    [Dependency] private readonly AnimationPlayerSystem _animation = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+    [Dependency] private readonly StunSystem _stun = default!; // Clientside Stun System
+
+    private const string StaminaAnimationKey = "stamina";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StaminaComponent, AnimationCompletedEvent>(OnAnimationCompleted);
+        SubscribeLocalEvent<ActiveStaminaComponent, ComponentShutdown>(OnActiveStaminaShutdown);
+        SubscribeLocalEvent<StaminaComponent, MobStateChangedEvent>(OnMobStateChanged);
+    }
+
+    protected override void OnStamHandleState(Entity<StaminaComponent> entity, ref AfterAutoHandleStateEvent args)
+    {
+        base.OnStamHandleState(entity, ref args);
+
+        TryStartAnimation(entity);
+    }
+
+    private void OnActiveStaminaShutdown(Entity<ActiveStaminaComponent> entity, ref ComponentShutdown args)
+    {
+        // If we don't have active stamina, we shouldn't have stamina damage. If the update loop can trust it we can trust it.
+        if (!TryComp<StaminaComponent>(entity, out var stamina))
+            return;
+
+        StopAnimation((entity, stamina));
+    }
+
+    protected override void OnShutdown(Entity<StaminaComponent> entity, ref ComponentShutdown args)
+    {
+        base.OnShutdown(entity, ref args);
+
+        StopAnimation(entity);
+    }
+
+    private void OnMobStateChanged(Entity<StaminaComponent> ent, ref MobStateChangedEvent args)
+    {
+        if (args.NewMobState == MobState.Dead)
+            StopAnimation(ent);
+    }
+
+    private void TryStartAnimation(Entity<StaminaComponent> entity)
+    {
+        if (!TryComp<SpriteComponent>(entity, out var sprite))
+            return;
+
+        // If the animation is running, the system should update it accordingly
+        // If we're below the threshold to animate, don't try to animate
+        // If we're in stamcrit don't override it
+        if (entity.Comp.AnimationThreshold > entity.Comp.StaminaDamage || _animation.HasRunningAnimation(entity, StaminaAnimationKey))
+            return;
+
+        // Don't animate if we're dead
+        if (_mobState.IsDead(entity))
+            return;
+
+        entity.Comp.StartOffset = sprite.Offset;
+
+        PlayAnimation((entity, entity.Comp, sprite));
+    }
+
+    private void StopAnimation(Entity<StaminaComponent, SpriteComponent?> entity)
+    {
+        if(!Resolve(entity, ref entity.Comp2))
+            return;
+
+        _animation.Stop(entity.Owner, StaminaAnimationKey);
+        entity.Comp1.StartOffset = entity.Comp2.Offset;
+    }
+
+    private void OnAnimationCompleted(Entity<StaminaComponent> entity, ref AnimationCompletedEvent args)
+    {
+        if (args.Key != StaminaAnimationKey || !args.Finished || !TryComp<SpriteComponent>(entity, out var sprite))
+            return;
+
+        // stop looping if we're below the threshold
+        if (entity.Comp.AnimationThreshold > entity.Comp.StaminaDamage)
+        {
+            _animation.Stop(entity.Owner, StaminaAnimationKey);
+            _sprite.SetOffset((entity, sprite), entity.Comp.StartOffset);
+            return;
+        }
+
+        if (!HasComp<AnimationPlayerComponent>(entity))
+            return;
+
+        PlayAnimation((entity, entity.Comp, sprite));
+    }
+
+    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,
+            1f); // The things I do for project 0 warnings
+        var frequency = entity.Comp1.FrequencyMin + step * entity.Comp1.FrequencyMod;
+        var jitter = entity.Comp1.JitterAmplitudeMin + step * entity.Comp1.JitterAmplitudeMod;
+        var breathing = entity.Comp1.BreathingAmplitudeMin + step * entity.Comp1.BreathingAmplitudeMod;
+
+        _animation.Play(entity.Owner,
+            _stun.GetFatigueAnimation(entity.Comp2,
+                frequency,
+                entity.Comp1.Jitters,
+                jitter * entity.Comp1.JitterMin,
+                jitter * entity.Comp1.JitterMax,
+                breathing,
+                entity.Comp1.StartOffset,
+                ref entity.Comp1.LastJitter),
+            StaminaAnimationKey);
+    }
 }
diff --git a/Content.Client/Decals/ToggleDecalCommand.cs b/Content.Client/Decals/ToggleDecalCommand.cs
index 025ed1299d..cf7113cb50 100644
--- a/Content.Client/Decals/ToggleDecalCommand.cs
+++ b/Content.Client/Decals/ToggleDecalCommand.cs
@@ -1,17 +1,15 @@
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
 
 namespace Content.Client.Decals;
 
-public sealed class ToggleDecalCommand : IConsoleCommand
+public sealed class ToggleDecalCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _e = default!;
+    [Dependency] private readonly DecalSystem _decal = default!;
 
-    public string Command => "toggledecals";
-    public string Description => "Toggles decaloverlay";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "toggledecals";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _e.System<DecalSystem>().ToggleOverlay();
+        _decal.ToggleOverlay();
     }
 }
diff --git a/Content.Client/Delivery/DeliveryVisualizerSystem.cs b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
index 846688149f..d5afd34533 100644
--- a/Content.Client/Delivery/DeliveryVisualizerSystem.cs
+++ b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
@@ -24,7 +24,7 @@ public sealed class DeliveryVisualizerSystem : VisualizerSystem<DeliveryComponen
 
         if (!_prototype.TryIndex<JobIconPrototype>(job, out var icon))
         {
-            SpriteSystem.LayerSetTexture((uid, args.Sprite), DeliveryVisualLayers.JobStamp, SpriteSystem.Frame0(_prototype.Index("JobIconUnknown")));
+            SpriteSystem.LayerSetTexture((uid, args.Sprite), DeliveryVisualLayers.JobStamp, SpriteSystem.Frame0(_prototype.Index(UnknownIcon).Icon));
             return;
         }
 
diff --git a/Content.Client/Devour/DevourSystem.cs b/Content.Client/Devour/DevourSystem.cs
deleted file mode 100644
index ad905ffab3..0000000000
--- a/Content.Client/Devour/DevourSystem.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Devour;
-
-namespace Content.Client.Devour;
-public sealed class DevourSystem : SharedDevourSystem
-{
-}
diff --git a/Content.Client/Disposal/PressureBar.cs b/Content.Client/Disposal/PressureBar.cs
index 7b2ebacaf7..de785de8c6 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/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 6ecd758461..761584e06e 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -14,6 +14,8 @@ namespace Content.Client.DoAfter;
 
 public sealed class DoAfterOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     private readonly IEntityManager _entManager;
     private readonly IGameTiming _timing;
     private readonly IPlayerManager _player;
@@ -50,7 +52,7 @@ public sealed class DoAfterOverlay : Overlay
         var sprite = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/progress_bar.rsi"), "icon");
         _barTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite);
 
-        _unshadedShader = protoManager.Index<ShaderPrototype>("unshaded").Instance();
+        _unshadedShader = protoManager.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index cb17cfaf21..3d9a3e2a9a 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -1,16 +1,17 @@
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.SprayPainter.Prototypes;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Doors;
 
 public sealed class DoorSystem : SharedDoorSystem
 {
     [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
@@ -85,8 +86,8 @@ public sealed class DoorSystem : SharedDoorSystem
         if (!AppearanceSystem.TryGetData<DoorState>(entity, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        if (AppearanceSystem.TryGetData<string>(entity, DoorVisuals.BaseRSI, out var baseRsi, args.Component))
-            UpdateSpriteLayers((entity.Owner, args.Sprite), baseRsi);
+        if (AppearanceSystem.TryGetData<string>(entity, PaintableVisuals.Prototype, out var prototype, args.Component))
+            UpdateSpriteLayers((entity.Owner, args.Sprite), prototype);
 
         if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
             _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
@@ -139,14 +140,14 @@ public sealed class DoorSystem : SharedDoorSystem
         }
     }
 
-    private void UpdateSpriteLayers(Entity<SpriteComponent> sprite, string baseRsi)
+    private void UpdateSpriteLayers(Entity<SpriteComponent> sprite, string targetProto)
     {
-        if (!_resourceCache.TryGetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
-        {
-            Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
+        if (!_prototypeManager.TryIndex(targetProto, out var target))
             return;
-        }
 
-        _sprite.SetBaseRsi(sprite.AsNullable(), res.RSI);
+        if (!target.TryGetComponent(out SpriteComponent? targetSprite, _componentFactory))
+            return;
+
+        _sprite.SetBaseRsi(sprite.AsNullable(), targetSprite.BaseRSI);
     }
 }
diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
index a316f31ae6..3770802302 100644
--- a/Content.Client/Drowsiness/DrowsinessOverlay.cs
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Drowsiness;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
@@ -10,11 +10,14 @@ namespace Content.Client.Drowsiness;
 
 public sealed class DrowsinessOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Drowsiness";
+
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IEntitySystemManager _sysMan = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    private readonly StatusEffectsSystem _statusEffects = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
@@ -29,7 +32,10 @@ public sealed class DrowsinessOverlay : Overlay
     public DrowsinessOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _drowsinessShader = _prototypeManager.Index<ShaderPrototype>("Drowsiness").InstanceUnique();
+
+        _statusEffects = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+
+        _drowsinessShader = _prototypeManager.Index(Shader).InstanceUnique();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -39,17 +45,11 @@ public sealed class DrowsinessOverlay : Overlay
         if (playerEntity == null)
             return;
 
-        if (!_entityManager.HasComponent<DrowsinessComponent>(playerEntity)
-            || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+        if (!_statusEffects.TryGetEffectsEndTimeWithComp<DrowsinessStatusEffectComponent>(playerEntity, out var endTime))
             return;
 
-        var statusSys = _sysMan.GetEntitySystem<StatusEffectsSystem>();
-        if (!statusSys.TryGetTime(playerEntity.Value, SharedDrowsinessSystem.DrowsinessKey, out var time, status))
-            return;
-
-        var curTime = _timing.CurTime;
-        var timeLeft = (float)(time.Value.Item2 - curTime).TotalSeconds;
-
+        endTime ??= TimeSpan.MaxValue;
+        var timeLeft = (float)(endTime - _timing.CurTime).Value.TotalSeconds;
         CurrentPower += 8f * (0.5f * timeLeft - CurrentPower) * args.DeltaSeconds / (timeLeft + 1);
     }
 
diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs
index bc8862b19d..632d2134ca 100644
--- a/Content.Client/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Client/Drowsiness/DrowsinessSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffectNew;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Player;
@@ -9,6 +10,7 @@ public sealed class DrowsinessSystem : SharedDrowsinessSystem
 {
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     private DrowsinessOverlay _overlay = default!;
 
@@ -16,35 +18,44 @@ public sealed class DrowsinessSystem : SharedDrowsinessSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<DrowsinessComponent, ComponentInit>(OnDrowsinessInit);
-        SubscribeLocalEvent<DrowsinessComponent, ComponentShutdown>(OnDrowsinessShutdown);
+        SubscribeLocalEvent<DrowsinessStatusEffectComponent, StatusEffectAppliedEvent>(OnDrowsinessApply);
+        SubscribeLocalEvent<DrowsinessStatusEffectComponent, StatusEffectRemovedEvent>(OnDrowsinessShutdown);
 
-        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
-        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<DrowsinessStatusEffectComponent, StatusEffectRelayedEvent<LocalPlayerAttachedEvent>>(OnStatusEffectPlayerAttached);
+        SubscribeLocalEvent<DrowsinessStatusEffectComponent, StatusEffectRelayedEvent<LocalPlayerDetachedEvent>>(OnStatusEffectPlayerDetached);
 
         _overlay = new();
     }
 
-    private void OnPlayerAttached(EntityUid uid, DrowsinessComponent component, LocalPlayerAttachedEvent args)
+    private void OnDrowsinessApply(Entity<DrowsinessStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
+    {
+        if (_player.LocalEntity == args.Target)
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnDrowsinessShutdown(Entity<DrowsinessStatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
+    {
+        if (_player.LocalEntity != args.Target)
+            return;
+
+        if (!_statusEffects.HasEffectComp<DrowsinessStatusEffectComponent>(_player.LocalEntity.Value))
+        {
+            _overlay.CurrentPower = 0;
+            _overlayMan.RemoveOverlay(_overlay);
+        }
+    }
+
+    private void OnStatusEffectPlayerAttached(Entity<DrowsinessStatusEffectComponent> ent, ref StatusEffectRelayedEvent<LocalPlayerAttachedEvent> args)
     {
         _overlayMan.AddOverlay(_overlay);
     }
 
-    private void OnPlayerDetached(EntityUid uid, DrowsinessComponent component, LocalPlayerDetachedEvent args)
+    private void OnStatusEffectPlayerDetached(Entity<DrowsinessStatusEffectComponent> ent, ref StatusEffectRelayedEvent<LocalPlayerDetachedEvent> args)
     {
-        _overlay.CurrentPower = 0;
-        _overlayMan.RemoveOverlay(_overlay);
-    }
+        if (_player.LocalEntity is null)
+            return;
 
-    private void OnDrowsinessInit(EntityUid uid, DrowsinessComponent component, ComponentInit args)
-    {
-        if (_player.LocalEntity == uid)
-            _overlayMan.AddOverlay(_overlay);
-    }
-
-    private void OnDrowsinessShutdown(EntityUid uid, DrowsinessComponent component, ComponentShutdown args)
-    {
-        if (_player.LocalEntity == uid)
+        if (!_statusEffects.HasEffectComp<DrowsinessStatusEffectComponent>(_player.LocalEntity.Value))
         {
             _overlay.CurrentPower = 0;
             _overlayMan.RemoveOverlay(_overlay);
diff --git a/Content.Client/Drugs/DrugOverlaySystem.cs b/Content.Client/Drugs/DrugOverlaySystem.cs
index 608ae02842..e156e616b8 100644
--- a/Content.Client/Drugs/DrugOverlaySystem.cs
+++ b/Content.Client/Drugs/DrugOverlaySystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Drugs;
+using Content.Shared.StatusEffectNew;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Player;
@@ -17,49 +18,47 @@ public sealed class DrugOverlaySystem : EntitySystem
 
     private RainbowOverlay _overlay = default!;
 
-    public static string RainbowKey = "SeeingRainbows";
-
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SeeingRainbowsComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SeeingRainbowsComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<SeeingRainbowsStatusEffectComponent, StatusEffectAppliedEvent>(OnApplied);
+        SubscribeLocalEvent<SeeingRainbowsStatusEffectComponent, StatusEffectRemovedEvent>(OnRemoved);
 
-        SubscribeLocalEvent<SeeingRainbowsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
-        SubscribeLocalEvent<SeeingRainbowsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<SeeingRainbowsStatusEffectComponent, StatusEffectRelayedEvent<LocalPlayerAttachedEvent>>(OnPlayerAttached);
+        SubscribeLocalEvent<SeeingRainbowsStatusEffectComponent, StatusEffectRelayedEvent<LocalPlayerDetachedEvent>>(OnPlayerDetached);
 
         _overlay = new();
     }
 
-    private void OnPlayerAttached(EntityUid uid, SeeingRainbowsComponent component, LocalPlayerAttachedEvent args)
+    private void OnRemoved(Entity<SeeingRainbowsStatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
     {
-        _overlayMan.AddOverlay(_overlay);
-    }
+        if (_player.LocalEntity != args.Target)
+            return;
 
-    private void OnPlayerDetached(EntityUid uid, SeeingRainbowsComponent component, LocalPlayerDetachedEvent args)
-    {
         _overlay.Intoxication = 0;
         _overlay.TimeTicker = 0;
         _overlayMan.RemoveOverlay(_overlay);
     }
 
-    private void OnInit(EntityUid uid, SeeingRainbowsComponent component, ComponentInit args)
+    private void OnApplied(Entity<SeeingRainbowsStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        if (_player.LocalEntity == uid)
-        {
-            _overlay.Phase = _random.NextFloat(MathF.Tau); // random starting phase for movement effect
-            _overlayMan.AddOverlay(_overlay);
-        }
+        if (_player.LocalEntity != args.Target)
+            return;
+
+        _overlay.Phase = _random.NextFloat(MathF.Tau); // random starting phase for movement effect
+        _overlayMan.AddOverlay(_overlay);
     }
 
-    private void OnShutdown(EntityUid uid, SeeingRainbowsComponent component, ComponentShutdown args)
+    private void OnPlayerAttached(Entity<SeeingRainbowsStatusEffectComponent> ent, ref StatusEffectRelayedEvent<LocalPlayerAttachedEvent> args)
     {
-        if (_player.LocalEntity == uid)
-        {
-            _overlay.Intoxication = 0;
-            _overlay.TimeTicker = 0;
-            _overlayMan.RemoveOverlay(_overlay);
-        }
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(Entity<SeeingRainbowsStatusEffectComponent> ent, ref StatusEffectRelayedEvent<LocalPlayerDetachedEvent> args)
+    {
+        _overlay.Intoxication = 0;
+        _overlay.TimeTicker = 0;
+        _overlayMan.RemoveOverlay(_overlay);
     }
 }
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index 4e0bed1264..e40fcdfca2 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -1,6 +1,6 @@
 using Content.Shared.CCVar;
 using Content.Shared.Drugs;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Configuration;
@@ -12,11 +12,15 @@ namespace Content.Client.Drugs;
 
 public sealed class RainbowOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Rainbow";
+
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IEntitySystemManager _sysMan = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    private readonly StatusEffectsSystem _statusEffects = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
@@ -37,7 +41,9 @@ public sealed class RainbowOverlay : Overlay
     {
         IoCManager.InjectDependencies(this);
 
-        _rainbowShader = _prototypeManager.Index<ShaderPrototype>("Rainbow").InstanceUnique();
+        _statusEffects = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+
+        _rainbowShader = _prototypeManager.Index(Shader).InstanceUnique();
         _config.OnValueChanged(CCVars.ReducedMotion, OnReducedMotionChanged, invokeImmediately: true);
     }
 
@@ -54,18 +60,13 @@ public sealed class RainbowOverlay : Overlay
         if (playerEntity == null)
             return;
 
-        if (!_entityManager.HasComponent<SeeingRainbowsComponent>(playerEntity)
-            || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+        if (!_statusEffects.TryGetEffectsEndTimeWithComp<SeeingRainbowsStatusEffectComponent>(playerEntity, out var endTime))
             return;
 
-        var statusSys = _sysMan.GetEntitySystem<StatusEffectsSystem>();
-        if (!statusSys.TryGetTime(playerEntity.Value, DrugOverlaySystem.RainbowKey, out var time, status))
-            return;
-
-        var timeLeft = (float)(time.Value.Item2 - time.Value.Item1).TotalSeconds;
+        endTime ??= TimeSpan.MaxValue;
+        var timeLeft = (float)(endTime - _timing.CurTime).Value.TotalSeconds;
 
         TimeTicker += args.DeltaSeconds;
-
         if (timeLeft - TimeTicker > timeLeft / 16f)
         {
             Intoxication += (timeLeft - Intoxication) * args.DeltaSeconds / 16f;
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index e01719e62c..1f26e75ffc 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Drunk;
 
 public sealed class DrunkOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Drunk";
+
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -30,7 +32,7 @@ public sealed class DrunkOverlay : Overlay
     public DrunkOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _drunkShader = _prototypeManager.Index<ShaderPrototype>("Drunk").InstanceUnique();
+        _drunkShader = _prototypeManager.Index(Shader).InstanceUnique();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 4c0b901b6e..ce39ceea05 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -20,6 +20,7 @@ using Content.Client.Lobby;
 using Content.Client.MainMenu;
 using Content.Client.Parallax.Managers;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.Playtime;
 using Content.Client.Radiation.Overlays;
 using Content.Client.Replay;
 using Content.Client.Screenshot;
@@ -83,6 +84,7 @@ namespace Content.Client.Entry
         [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!;
         [Dependency] private readonly TitleWindowManager _titleWindowManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+        [Dependency] private readonly ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!;
         [Dependency] private readonly ServersHubManager _serversHubManager = default!; // Sunrise-Hub
         [Dependency] private readonly ContributorsManager _contributorsManager = default!; // Sunrise-Edit
         [Dependency] private readonly PlayerCacheManager _playerCacheManager = default!; // Sunrise-Edit
@@ -155,6 +157,7 @@ namespace Content.Client.Entry
             _extendedDisconnectInformation.Initialize();
             _jobRequirements.Initialize();
             _playbackMan.Initialize();
+            _clientsidePlaytimeManager.Initialize();
 
             _serversHubManager.Initialize(); // Sunrise-Hub
             _contributorsManager.Initialize(); // Sunrise-Edit
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 9f0496e578..0385672977 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -110,7 +110,7 @@ namespace Content.Client.Examine
         {
             var entity = args.EntityUid;
 
-            if (!args.EntityUid.IsValid() || !EntityManager.EntityExists(entity))
+            if (!args.EntityUid.IsValid() || !Exists(entity))
             {
                 return false;
             }
@@ -225,7 +225,7 @@ namespace Content.Client.Examine
 
             vBox.AddChild(hBox);
 
-            if (EntityManager.HasComponent<SpriteComponent>(target))
+            if (HasComp<SpriteComponent>(target))
             {
                 var spriteView = new SpriteView
                 {
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index a005d0317b..18cb8f647a 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -13,6 +13,8 @@ namespace Content.Client.Explosion;
 [UsedImplicitly]
 public sealed class ExplosionOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
@@ -26,7 +28,7 @@ public sealed class ExplosionOverlay : Overlay
     public ExplosionOverlay(SharedAppearanceSystem appearanceSystem)
     {
         IoCManager.InjectDependencies(this);
-        _shader = _proto.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = _proto.Index(UnshadedShader).Instance();
         _transformSystem = _entMan.System<SharedTransformSystem>();
         _appearance = appearanceSystem;
     }
diff --git a/Content.Client/Explosion/SmokeOnTriggerSystem.cs b/Content.Client/Explosion/SmokeOnTriggerSystem.cs
deleted file mode 100644
index cac255e1ba..0000000000
--- a/Content.Client/Explosion/SmokeOnTriggerSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Explosion.EntitySystems;
-
-namespace Content.Client.Explosion;
-
-public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
-{
-}
\ No newline at end of file
diff --git a/Content.Client/Explosion/TriggerOnProximityComponent.cs b/Content.Client/Explosion/TriggerOnProximityComponent.cs
deleted file mode 100644
index 5fa9bbfd23..0000000000
--- a/Content.Client/Explosion/TriggerOnProximityComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Explosion;
-using Content.Shared.Explosion.Components;
-
-namespace Content.Client.Explosion;
-
-[RegisterComponent, Access(typeof(TriggerSystem))]
-public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximityComponent {}
diff --git a/Content.Client/Explosion/TriggerSystem.cs b/Content.Client/Explosion/TriggerSystem.cs
deleted file mode 100644
index e18569a18e..0000000000
--- a/Content.Client/Explosion/TriggerSystem.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Client.Explosion;
-
-public sealed partial class TriggerSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-        InitializeProximity();
-    }
-}
diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs
index 1949b170ab..906f9c954c 100644
--- a/Content.Client/Eye/Blinding/BlindOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlindOverlay.cs
@@ -12,6 +12,9 @@ namespace Content.Client.Eye.Blinding
 {
     public sealed class BlindOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> GreyscaleShader = "GreyscaleFullscreen";
+        private static readonly ProtoId<ShaderPrototype> CircleShader = "CircleMask";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
@@ -27,8 +30,8 @@ namespace Content.Client.Eye.Blinding
         public BlindOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _greyscaleShader = _prototypeManager.Index<ShaderPrototype>("GreyscaleFullscreen").InstanceUnique();
-            _circleMaskShader = _prototypeManager.Index<ShaderPrototype>("CircleMask").InstanceUnique();
+            _greyscaleShader = _prototypeManager.Index(GreyscaleShader).InstanceUnique();
+            _circleMaskShader = _prototypeManager.Index(CircleShader).InstanceUnique();
         }
         protected override bool BeforeDraw(in OverlayDrawArgs args)
         {
diff --git a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
index b56b091309..dccdac2758 100644
--- a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
@@ -10,6 +10,9 @@ namespace Content.Client.Eye.Blinding
 {
     public sealed class BlurryVisionOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> CataractsShader = "Cataracts";
+        private static readonly ProtoId<ShaderPrototype> CircleShader = "CircleMask";
+
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -33,8 +36,8 @@ namespace Content.Client.Eye.Blinding
         public BlurryVisionOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _cataractsShader = _prototypeManager.Index<ShaderPrototype>("Cataracts").InstanceUnique();
-            _circleMaskShader = _prototypeManager.Index<ShaderPrototype>("CircleMask").InstanceUnique();
+            _cataractsShader = _prototypeManager.Index(CataractsShader).InstanceUnique();
+            _circleMaskShader = _prototypeManager.Index(CircleShader).InstanceUnique();
 
             _circleMaskShader.SetParameter("CircleMinDist", 0.0f);
             _circleMaskShader.SetParameter("CirclePow", NoMotion_Pow);
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 8e41c382dd..72567530c0 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -1,8 +1,10 @@
+using Content.Shared.CCVar;
 using Content.Shared.Flash;
 using Content.Shared.Flash.Components;
 using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -11,25 +13,31 @@ namespace Content.Client.Flash
 {
     public sealed class FlashOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> FlashedEffectShader = "FlashedEffect";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly IConfigurationManager _configManager = default!;
 
         private readonly SharedFlashSystem _flash;
         private readonly StatusEffectsSystem _statusSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;
-        public float PercentComplete = 0.0f;
+        private bool _reducedMotion;
+        public float PercentComplete;
         public Texture? ScreenshotTexture;
 
         public FlashOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").InstanceUnique();
+            _shader = _prototypeManager.Index(FlashedEffectShader).InstanceUnique();
             _flash = _entityManager.System<SharedFlashSystem>();
             _statusSys = _entityManager.System<StatusEffectsSystem>();
+
+            _configManager.OnValueChanged(CCVars.ReducedMotion, (b) => { _reducedMotion = b; }, invokeImmediately: true);
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
@@ -47,8 +55,8 @@ namespace Content.Client.Flash
                 return;
 
             var curTime = _timing.CurTime;
-            var lastsFor = (float) (time.Value.Item2 - time.Value.Item1).TotalSeconds;
-            var timeDone = (float) (curTime - time.Value.Item1).TotalSeconds;
+            var lastsFor = (float)(time.Value.Item2 - time.Value.Item1).TotalSeconds;
+            var timeDone = (float)(curTime - time.Value.Item1).TotalSeconds;
 
             PercentComplete = timeDone / lastsFor;
         }
@@ -74,10 +82,22 @@ namespace Content.Client.Flash
                 return;
 
             var worldHandle = args.WorldHandle;
-            _shader.SetParameter("percentComplete", PercentComplete);
-            worldHandle.UseShader(_shader);
-            worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
-            worldHandle.UseShader(null);
+            if (_reducedMotion)
+            {
+                // TODO: This is a very simple placeholder.
+                // Replace it with a proper shader once we come up with something good.
+                // Turns out making an effect that is supposed to be a bright, sudden, and disorienting flash 
+                // not do any of that while also being equivalent in terms of game balance is hard.
+                var alpha = 1 - MathF.Pow(PercentComplete, 8f); // similar falloff curve to the flash shader
+                worldHandle.DrawRect(args.WorldBounds, new Color(0f, 0f, 0f, alpha));
+            }
+            else
+            {
+                _shader.SetParameter("percentComplete", PercentComplete);
+                worldHandle.UseShader(_shader);
+                worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
+                worldHandle.UseShader(null);
+            }
         }
 
         protected override void DisposeBehavior()
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index 146d84b990..ffabab9453 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Flash;
 using Content.Shared.Flash.Components;
-using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Player;
diff --git a/Content.Client/Forensics/Systems/ForensicsSystem.cs b/Content.Client/Forensics/Systems/ForensicsSystem.cs
new file mode 100644
index 0000000000..048fff600e
--- /dev/null
+++ b/Content.Client/Forensics/Systems/ForensicsSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Forensics.Systems;
+
+namespace Content.Client.Forensics.Systems;
+
+public sealed class ForensicsSystem : SharedForensicsSystem;
diff --git a/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs b/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs
index 480da6ad8d..3dacc81f21 100644
--- a/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs
+++ b/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs
@@ -2,25 +2,17 @@
 
 namespace Content.Client.Ghost.Commands;
 
-public sealed class ToggleGhostVisibilityCommand : IConsoleCommand
+public sealed class ToggleGhostVisibilityCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entSysMan = default!;
+    [Dependency] private readonly GhostSystem _ghost = default!;
 
-    public string Command => "toggleghostvisibility";
-    public string Description => "Toggles ghost visibility on the client.";
-    public string Help => "toggleghostvisibility [bool]";
+    public override string Command => "toggleghostvisibility";
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var ghostSystem = _entSysMan.GetEntitySystem<GhostSystem>();
-
         if (args.Length != 0 && bool.TryParse(args[0], out var visibility))
-        {
-            ghostSystem.ToggleGhostVisibility(visibility);
-        }
+            _ghost.ToggleGhostVisibility(visibility);
         else
-        {
-            ghostSystem.ToggleGhostVisibility();
-        }
+            _ghost.ToggleGhostVisibility();
     }
 }
diff --git a/Content.Client/Ghost/GhostToggleSelfVisibility.cs b/Content.Client/Ghost/GhostToggleSelfVisibility.cs
index bc4531ce92..fea9a2fc0d 100644
--- a/Content.Client/Ghost/GhostToggleSelfVisibility.cs
+++ b/Content.Client/Ghost/GhostToggleSelfVisibility.cs
@@ -4,28 +4,27 @@ using Robust.Shared.Console;
 
 namespace Content.Client.Ghost;
 
-public sealed class GhostToggleSelfVisibility : IConsoleCommand
+public sealed class GhostToggleSelfVisibility : LocalizedEntityCommands
 {
-    public string Command => "toggleselfghost";
-    public string Description => "Toggles seeing your own ghost.";
-    public string Help => "toggleselfghost";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public override string Command => "toggleselfghost";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var attachedEntity = shell.Player?.AttachedEntity;
         if (!attachedEntity.HasValue)
             return;
 
-        var entityManager = IoCManager.Resolve<IEntityManager>();
-        if (!entityManager.HasComponent<GhostComponent>(attachedEntity))
+        if (!EntityManager.HasComponent<GhostComponent>(attachedEntity))
         {
-            shell.WriteError("Entity must be a ghost.");
+            shell.WriteError(Loc.GetString($"cmd-toggleselfghost-must-be-ghost"));
             return;
         }
 
-        if (!entityManager.TryGetComponent(attachedEntity, out SpriteComponent? spriteComponent))
+        if (!EntityManager.TryGetComponent(attachedEntity, out SpriteComponent? spriteComponent))
             return;
 
-        var spriteSys = entityManager.System<SpriteSystem>();
-        spriteSys.SetVisible((attachedEntity.Value, spriteComponent), !spriteComponent.Visible);
+        _sprite.SetVisible((attachedEntity.Value, spriteComponent), !spriteComponent.Visible);
     }
 }
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
index 29ed124422..66d3f693b8 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
@@ -21,8 +21,7 @@ namespace Content.Client.Guidebook.Controls;
 [UsedImplicitly, GenerateTypedNameReferences]
 public sealed partial class GuideReagentReaction : BoxContainer, ISearchableControl
 {
-    [ValidatePrototypeId<MixingCategoryPrototype>]
-    private const string DefaultMixingCategory = "DummyMix";
+    private static readonly ProtoId<MixingCategoryPrototype> DefaultMixingCategory = "DummyMix";
 
     private readonly IPrototypeManager _protoMan;
 
@@ -55,7 +54,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         }
         else
         {
-            mixingCategories.Add(protoMan.Index<MixingCategoryPrototype>(DefaultMixingCategory));
+            mixingCategories.Add(protoMan.Index(DefaultMixingCategory));
         }
         SetMixingCategory(mixingCategories, prototype, sysMan);
     }
diff --git a/Content.Client/Guidebook/Richtext/KeyBindTag.cs b/Content.Client/Guidebook/Richtext/KeyBindTag.cs
index 478f1b9bf6..ab74ddf1a0 100644
--- a/Content.Client/Guidebook/Richtext/KeyBindTag.cs
+++ b/Content.Client/Guidebook/Richtext/KeyBindTag.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Utility;
 namespace Content.Client.Guidebook.Richtext;
 
 [UsedImplicitly]
-public sealed class KeyBindTag : IMarkupTag
+public sealed class KeyBindTag : IMarkupTagHandler
 {
     [Dependency] private readonly IInputManager _inputManager = default!;
 
diff --git a/Content.Client/Guidebook/Richtext/ProtodataTag.cs b/Content.Client/Guidebook/Richtext/ProtodataTag.cs
index a725fd4e4b..2a6eca4e48 100644
--- a/Content.Client/Guidebook/Richtext/ProtodataTag.cs
+++ b/Content.Client/Guidebook/Richtext/ProtodataTag.cs
@@ -9,7 +9,7 @@ namespace Content.Client.Guidebook.RichText;
 /// In order to be accessed by this tag, the desired field/property must
 /// be tagged with <see cref="Shared.Guidebook.GuidebookDataAttribute"/>.
 /// </summary>
-public sealed class ProtodataTag : IMarkupTag
+public sealed class ProtodataTag : IMarkupTagHandler
 {
     [Dependency] private readonly ILogManager _logMan = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
diff --git a/Content.Client/Guidebook/Richtext/TextLinkTag.cs b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
index 27aaa71939..a551b18473 100644
--- a/Content.Client/Guidebook/Richtext/TextLinkTag.cs
+++ b/Content.Client/Guidebook/Richtext/TextLinkTag.cs
@@ -10,16 +10,14 @@ using Content.Client.UserInterface.ControlExtensions;
 namespace Content.Client.Guidebook.RichText;
 
 [UsedImplicitly]
-public sealed class TextLinkTag : IMarkupTag
+public sealed class TextLinkTag : IMarkupTagHandler
 {
     public static Color LinkColor => Color.CornflowerBlue;
 
     public string Name => "textlink";
 
-    public Control? Control;
-
     /// <inheritdoc/>
-    public bool TryGetControl(MarkupNode node, [NotNullWhen(true)] out Control? control)
+    public bool TryCreateControl(MarkupNode node, [NotNullWhen(true)] out Control? control)
     {
         if (!node.Value.TryGetString(out var text)
             || !node.Attributes.TryGetValue("link", out var linkParameter)
@@ -38,22 +36,21 @@ public sealed class TextLinkTag : IMarkupTag
 
         label.OnMouseEntered += _ => label.FontColorOverride = Color.LightSkyBlue;
         label.OnMouseExited += _ => label.FontColorOverride = Color.CornflowerBlue;
-        label.OnKeyBindDown += args => OnKeybindDown(args, link);
+        label.OnKeyBindDown += args => OnKeybindDown(args, link, label);
 
         control = label;
-        Control = label;
         return true;
     }
 
-    private void OnKeybindDown(GUIBoundKeyEventArgs args, string link)
+    private void OnKeybindDown(GUIBoundKeyEventArgs args, string link, Control? control)
     {
         if (args.Function != EngineKeyFunctions.UIClick)
             return;
 
-        if (Control == null)
+        if (control == null)
             return;
 
-        if (Control.TryGetParentHandler<ILinkClickHandler>(out var handler))
+        if (control.TryGetParentHandler<ILinkClickHandler>(out var handler))
             handler.HandleClick(link);
         else
             Logger.Warning("Warning! No valid ILinkClickHandler found.");
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index d9128e877e..f92325ba69 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -31,16 +31,13 @@ namespace Content.Client.Hands.Systems
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
 
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly StrippableSystem _stripSys = default!;
         [Dependency] private readonly SpriteSystem _sprite = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
         [Dependency] private readonly DisplacementMapSystem _displacement = default!;
 
-        public event Action<string, HandLocation>? OnPlayerAddHand;
-        public event Action<string>? OnPlayerRemoveHand;
         public event Action<string?>? OnPlayerSetActiveHand;
-        public event Action<HandsComponent>? OnPlayerHandsAdded;
+        public event Action<Entity<HandsComponent>>? OnPlayerHandsAdded;
         public event Action? OnPlayerHandsRemoved;
         public event Action<string, EntityUid>? OnPlayerItemAdded;
         public event Action<string, EntityUid>? OnPlayerItemRemoved;
@@ -62,67 +59,28 @@ namespace Content.Client.Hands.Systems
         }
 
         #region StateHandling
-        private void HandleComponentState(EntityUid uid, HandsComponent component, ref ComponentHandleState args)
+        private void HandleComponentState(Entity<HandsComponent> ent, ref ComponentHandleState args)
         {
             if (args.Current is not HandsComponentState state)
                 return;
 
-            var handsModified = component.Hands.Count != state.Hands.Count;
-            // we need to check that, even if we have the same amount, that the individual hands didn't change.
-            if (!handsModified)
+            var newHands = state.Hands.Keys.Except(ent.Comp.Hands.Keys); // hands that were added between states
+            var oldHands = ent.Comp.Hands.Keys.Except(state.Hands.Keys); // hands that were removed between states
+
+            foreach (var handId in oldHands)
             {
-                foreach (var hand in component.Hands.Values)
-                {
-                    if (state.Hands.Contains(hand))
-                        continue;
-                    handsModified = true;
-                    break;
-                }
+                RemoveHand(ent.AsNullable(), handId);
             }
 
-            var manager = EnsureComp<ContainerManagerComponent>(uid);
-
-            if (handsModified)
+            foreach (var handId in state.SortedHands.Intersect(newHands))
             {
-                List<Hand> addedHands = new();
-                foreach (var hand in state.Hands)
-                {
-                    if (component.Hands.ContainsKey(hand.Name))
-                        continue;
-
-                    var container = _containerSystem.EnsureContainer<ContainerSlot>(uid, hand.Name, manager);
-                    var newHand = new Hand(hand.Name, hand.Location, container);
-                    component.Hands.Add(hand.Name, newHand);
-                    addedHands.Add(newHand);
-                }
-
-                foreach (var name in component.Hands.Keys)
-                {
-                    if (!state.HandNames.Contains(name))
-                    {
-                        RemoveHand(uid, name, component);
-                    }
-                }
-
-                component.SortedHands.Clear();
-                component.SortedHands.AddRange(state.HandNames);
-                var sorted = addedHands.OrderBy(hand => component.SortedHands.IndexOf(hand.Name));
-
-                foreach (var hand in sorted)
-                {
-                    AddHand(uid, hand, component);
-                }
+                AddHand(ent.AsNullable(), handId, state.Hands[handId]);
             }
+            ent.Comp.SortedHands = new (state.SortedHands);
 
-            _stripSys.UpdateUi(uid);
+            SetActiveHand(ent.AsNullable(), state.ActiveHandId);
 
-            if (component.ActiveHand == null && state.ActiveHand == null)
-                return; //edge case
-
-            if (component.ActiveHand != null && state.ActiveHand != component.ActiveHand.Name)
-            {
-                SetActiveHand(uid, component.Hands[state.ActiveHand!], component);
-            }
+            _stripSys.UpdateUi(ent);
         }
         #endregion
 
@@ -133,72 +91,77 @@ namespace Content.Client.Hands.Systems
                 return;
             }
 
-            OnPlayerHandsAdded?.Invoke(hands);
+            OnPlayerHandsAdded?.Invoke(hands.Value);
         }
 
-        public override void DoDrop(EntityUid uid, Hand hand, bool doDropInteraction = true, HandsComponent? hands = null, bool log = true)
+        public override void DoDrop(Entity<HandsComponent?> ent,
+            string handId,
+            bool doDropInteraction = true,
+            bool log = true)
         {
-            base.DoDrop(uid, hand, doDropInteraction, hands, log);
+            base.DoDrop(ent, handId, doDropInteraction, log);
 
-            if (TryComp(hand.HeldEntity, out SpriteComponent? sprite))
+            if (TryGetHeldItem(ent, handId, out var held) && TryComp(held, out SpriteComponent? sprite))
                 sprite.RenderOrder = EntityManager.CurrentTick.Value;
         }
 
         public EntityUid? GetActiveHandEntity()
         {
-            return TryGetPlayerHands(out var hands) ? hands.ActiveHandEntity : null;
+            return TryGetPlayerHands(out var hands) ? GetActiveItem(hands.Value.AsNullable()) : null;
         }
 
         /// <summary>
         ///     Get the hands component of the local player
         /// </summary>
-        public bool TryGetPlayerHands([NotNullWhen(true)] out HandsComponent? hands)
+        public bool TryGetPlayerHands([NotNullWhen(true)] out Entity<HandsComponent>? hands)
         {
             var player = _playerManager.LocalEntity;
             hands = null;
-            return player != null && TryComp(player.Value, out hands);
+            if (player == null || !TryComp<HandsComponent>(player.Value, out var handsComp))
+                return false;
+
+            hands = (player.Value, handsComp);
+            return true;
         }
 
         /// <summary>
         ///     Called when a user clicked on their hands GUI
         /// </summary>
-        public void UIHandClick(HandsComponent hands, string handName)
+        public void UIHandClick(Entity<HandsComponent> ent, string handName)
         {
-            if (!hands.Hands.TryGetValue(handName, out var pressedHand))
+            var hands = ent.Comp;
+            if (hands.ActiveHandId == null)
                 return;
 
-            if (hands.ActiveHand == null)
-                return;
+            var pressedEntity = GetHeldItem(ent.AsNullable(), handName);
+            var activeEntity = GetActiveItem(ent.AsNullable());
 
-            var pressedEntity = pressedHand.HeldEntity;
-            var activeEntity = hands.ActiveHand.HeldEntity;
-
-            if (pressedHand == hands.ActiveHand && activeEntity != null)
+            if (handName == hands.ActiveHandId && activeEntity != null)
             {
                 // use item in hand
                 // it will always be attack_self() in my heart.
-                EntityManager.RaisePredictiveEvent(new RequestUseInHandEvent());
+                RaisePredictiveEvent(new RequestUseInHandEvent());
                 return;
             }
 
-            if (pressedHand != hands.ActiveHand && pressedEntity == null)
+            if (handName != hands.ActiveHandId && pressedEntity == null)
             {
                 // change active hand
-                EntityManager.RaisePredictiveEvent(new RequestSetHandEvent(handName));
+                RaisePredictiveEvent(new RequestSetHandEvent(handName));
                 return;
             }
 
-            if (pressedHand != hands.ActiveHand && pressedEntity != null && activeEntity != null)
+            if (handName != hands.ActiveHandId && pressedEntity != null && activeEntity != null)
             {
                 // use active item on held item
-                EntityManager.RaisePredictiveEvent(new RequestHandInteractUsingEvent(pressedHand.Name));
+                RaisePredictiveEvent(new RequestHandInteractUsingEvent(handName));
                 return;
             }
 
-            if (pressedHand != hands.ActiveHand && pressedEntity != null && activeEntity == null)
+            if (handName != hands.ActiveHandId && pressedEntity != null && activeEntity == null)
             {
                 // move the item to the active hand
-                EntityManager.RaisePredictiveEvent(new RequestMoveHandItemEvent(pressedHand.Name));
+                RaisePredictiveEvent(new RequestMoveHandItemEvent(handName));
             }
         }
 
@@ -208,19 +171,18 @@ namespace Content.Client.Hands.Systems
         /// </summary>
         public void UIHandActivate(string handName)
         {
-            EntityManager.RaisePredictiveEvent(new RequestActivateInHandEvent(handName));
+            RaisePredictiveEvent(new RequestActivateInHandEvent(handName));
         }
 
         public void UIInventoryExamine(string handName)
         {
             if (!TryGetPlayerHands(out var hands) ||
-                !hands.Hands.TryGetValue(handName, out var hand) ||
-                hand.HeldEntity is not { Valid: true } entity)
+                !TryGetHeldItem(hands.Value.AsNullable(), handName, out var heldEntity))
             {
                 return;
             }
 
-            _examine.DoExamine(entity);
+            _examine.DoExamine(heldEntity.Value);
         }
 
         /// <summary>
@@ -230,13 +192,12 @@ namespace Content.Client.Hands.Systems
         public void UIHandOpenContextMenu(string handName)
         {
             if (!TryGetPlayerHands(out var hands) ||
-                !hands.Hands.TryGetValue(handName, out var hand) ||
-                hand.HeldEntity is not { Valid: true } entity)
+                !TryGetHeldItem(hands.Value.AsNullable(), handName, out var heldEntity))
             {
                 return;
             }
 
-            _ui.GetUIController<VerbMenuUIController>().OpenVerbMenu(entity);
+            _ui.GetUIController<VerbMenuUIController>().OpenVerbMenu(heldEntity.Value);
         }
 
         public void UIHandAltActivateItem(string handName)
@@ -250,60 +211,67 @@ namespace Content.Client.Hands.Systems
         {
             base.HandleEntityInserted(uid, hands, args);
 
-            if (!hands.Hands.TryGetValue(args.Container.ID, out var hand))
+            if (!hands.Hands.ContainsKey(args.Container.ID))
                 return;
-            UpdateHandVisuals(uid, args.Entity, hand);
+
+            UpdateHandVisuals(uid, args.Entity, args.Container.ID);
             _stripSys.UpdateUi(uid);
 
             if (uid != _playerManager.LocalEntity)
                 return;
 
-            OnPlayerItemAdded?.Invoke(hand.Name, args.Entity);
+            OnPlayerItemAdded?.Invoke(args.Container.ID, args.Entity);
 
             if (HasComp<VirtualItemComponent>(args.Entity))
-                OnPlayerHandBlocked?.Invoke(hand.Name);
+                OnPlayerHandBlocked?.Invoke(args.Container.ID);
         }
 
         protected override void HandleEntityRemoved(EntityUid uid, HandsComponent hands, EntRemovedFromContainerMessage args)
         {
             base.HandleEntityRemoved(uid, hands, args);
 
-            if (!hands.Hands.TryGetValue(args.Container.ID, out var hand))
+            if (!hands.Hands.ContainsKey(args.Container.ID))
                 return;
-            UpdateHandVisuals(uid, args.Entity, hand);
+
+            UpdateHandVisuals(uid, args.Entity, args.Container.ID);
             _stripSys.UpdateUi(uid);
 
             if (uid != _playerManager.LocalEntity)
                 return;
 
-            OnPlayerItemRemoved?.Invoke(hand.Name, args.Entity);
+            OnPlayerItemRemoved?.Invoke(args.Container.ID, args.Entity);
 
             if (HasComp<VirtualItemComponent>(args.Entity))
-                OnPlayerHandUnblocked?.Invoke(hand.Name);
+                OnPlayerHandUnblocked?.Invoke(args.Container.ID);
         }
 
         /// <summary>
         ///     Update the players sprite with new in-hand visuals.
         /// </summary>
-        private void UpdateHandVisuals(EntityUid uid, EntityUid held, Hand hand, HandsComponent? handComp = null, SpriteComponent? sprite = null)
+        private void UpdateHandVisuals(Entity<HandsComponent?, SpriteComponent?> ent, EntityUid held, string handId)
         {
-            if (!Resolve(uid, ref handComp, ref sprite, false))
+            if (!Resolve(ent, ref ent.Comp1, ref ent.Comp2, false))
+                return;
+            var handComp = ent.Comp1;
+            var sprite = ent.Comp2;
+
+            if (!TryGetHand((ent, handComp), handId, out var hand))
                 return;
 
             // visual update might involve changes to the entity's effective sprite -> need to update hands GUI.
-            if (uid == _playerManager.LocalEntity)
-                OnPlayerItemAdded?.Invoke(hand.Name, held);
+            if (ent == _playerManager.LocalEntity)
+                OnPlayerItemAdded?.Invoke(handId, held);
 
             if (!handComp.ShowInHands)
                 return;
 
             // Remove old layers. We could also just set them to invisible, but as items may add arbitrary layers, this
             // may eventually bloat the player with lots of layers.
-            if (handComp.RevealedLayers.TryGetValue(hand.Location, out var revealedLayers))
+            if (handComp.RevealedLayers.TryGetValue(hand.Value.Location, out var revealedLayers))
             {
                 foreach (var key in revealedLayers)
                 {
-                    _sprite.RemoveLayer((uid, sprite), key);
+                    _sprite.RemoveLayer((ent, sprite), key);
                 }
 
                 revealedLayers.Clear();
@@ -311,22 +279,22 @@ namespace Content.Client.Hands.Systems
             else
             {
                 revealedLayers = new();
-                handComp.RevealedLayers[hand.Location] = revealedLayers;
+                handComp.RevealedLayers[hand.Value.Location] = revealedLayers;
             }
 
-            if (hand.HeldEntity == null)
+            if (HandIsEmpty((ent, handComp), handId))
             {
                 // the held item was removed.
-                RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true);
+                RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(ent, revealedLayers), true);
                 return;
             }
 
-            var ev = new GetInhandVisualsEvent(uid, hand.Location);
+            var ev = new GetInhandVisualsEvent(ent, hand.Value.Location);
             RaiseLocalEvent(held, ev);
 
             if (ev.Layers.Count == 0)
             {
-                RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true);
+                RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(ent, revealedLayers), true);
                 return;
             }
 
@@ -339,7 +307,7 @@ namespace Content.Client.Hands.Systems
                     continue;
                 }
 
-                var index = _sprite.LayerMapReserve((uid, sprite), key);
+                var index = _sprite.LayerMapReserve((ent, sprite), key);
 
                 // In case no RSI is given, use the item's base RSI as a default. This cuts down on a lot of unnecessary yaml entries.
                 if (layerData.RsiPath == null
@@ -347,21 +315,26 @@ namespace Content.Client.Hands.Systems
                     && sprite[index].Rsi == null)
                 {
                     if (TryComp<ItemComponent>(held, out var itemComponent) && itemComponent.RsiPath != null)
-                        _sprite.LayerSetRsi((uid, sprite), index, new ResPath(itemComponent.RsiPath));
+                        _sprite.LayerSetRsi((ent, sprite), index, new ResPath(itemComponent.RsiPath));
                     else if (TryComp(held, out SpriteComponent? clothingSprite))
-                        _sprite.LayerSetRsi((uid, sprite), index, clothingSprite.BaseRSI);
+                        _sprite.LayerSetRsi((ent, sprite), index, clothingSprite.BaseRSI);
                 }
 
-                _sprite.LayerSetData((uid, sprite), index, layerData);
+                _sprite.LayerSetData((ent, sprite), index, layerData);
 
-                // Select displacement maps with body type support
-                var displacement = GetHandDisplacement(uid, hand.Location, handComp);
+                // Add displacement maps
+                var displacement = hand.Value.Location switch
+                {
+                    HandLocation.Left => handComp.LeftHandDisplacement,
+                    HandLocation.Right => handComp.RightHandDisplacement,
+                    _ => handComp.HandDisplacement
+                };
 
-                if (displacement is not null && _displacement.TryAddDisplacement(displacement, (uid, sprite), index, key, out var displacementKey))
+                if (displacement is not null && _displacement.TryAddDisplacement(displacement, (ent, sprite), index, key, out var displacementKey))
                     revealedLayers.Add(displacementKey);
             }
 
-            RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true);
+            RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(ent, revealedLayers), true);
         }
 
         /// <summary>
@@ -407,10 +380,9 @@ namespace Content.Client.Hands.Systems
         private void OnVisualsChanged(EntityUid uid, HandsComponent component, VisualsChangedEvent args)
         {
             // update hands visuals if this item is in a hand (rather then inventory or other container).
-            if (component.Hands.TryGetValue(args.ContainerId, out var hand))
-            {
-                UpdateHandVisuals(uid, GetEntity(args.Item), hand, component);
-            }
+            if (!component.Hands.ContainsKey(args.ContainerId))
+                return;
+            UpdateHandVisuals((uid, component), GetEntity(args.Item), args.ContainerId);
         }
         #endregion
 
@@ -418,7 +390,7 @@ namespace Content.Client.Hands.Systems
 
         private void HandlePlayerAttached(EntityUid uid, HandsComponent component, LocalPlayerAttachedEvent args)
         {
-            OnPlayerHandsAdded?.Invoke(component);
+            OnPlayerHandsAdded?.Invoke((uid, component));
         }
 
         private void HandlePlayerDetached(EntityUid uid, HandsComponent component, LocalPlayerDetachedEvent args)
@@ -429,7 +401,7 @@ namespace Content.Client.Hands.Systems
         private void OnHandsStartup(EntityUid uid, HandsComponent component, ComponentStartup args)
         {
             if (_playerManager.LocalEntity == uid)
-                OnPlayerHandsAdded?.Invoke(component);
+                OnPlayerHandsAdded?.Invoke((uid, component));
         }
 
         private void OnHandsShutdown(EntityUid uid, HandsComponent component, ComponentShutdown args)
@@ -439,36 +411,6 @@ namespace Content.Client.Hands.Systems
         }
         #endregion
 
-        private void AddHand(EntityUid uid, Hand newHand, HandsComponent? handsComp = null)
-        {
-            AddHand(uid, newHand.Name, newHand.Location, handsComp);
-        }
-
-        public override void AddHand(EntityUid uid, string handName, HandLocation handLocation, HandsComponent? handsComp = null)
-        {
-            base.AddHand(uid, handName, handLocation, handsComp);
-
-            if (uid == _playerManager.LocalEntity)
-                OnPlayerAddHand?.Invoke(handName, handLocation);
-
-            if (handsComp == null)
-                return;
-
-            if (handsComp.ActiveHand == null)
-                SetActiveHand(uid, handsComp.Hands[handName], handsComp);
-        }
-        public override void RemoveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
-        {
-            if (uid == _playerManager.LocalEntity && handsComp != null &&
-                handsComp.Hands.ContainsKey(handName) && uid ==
-                _playerManager.LocalEntity)
-            {
-                OnPlayerRemoveHand?.Invoke(handName);
-            }
-
-            base.RemoveHand(uid, handName, handsComp);
-        }
-
         private void OnHandActivated(Entity<HandsComponent>? ent)
         {
             if (ent is not { } hand)
@@ -477,13 +419,7 @@ namespace Content.Client.Hands.Systems
             if (_playerManager.LocalEntity != hand.Owner)
                 return;
 
-            if (hand.Comp.ActiveHand == null)
-            {
-                OnPlayerSetActiveHand?.Invoke(null);
-                return;
-            }
-
-            OnPlayerSetActiveHand?.Invoke(hand.Comp.ActiveHand.Name);
+            OnPlayerSetActiveHand?.Invoke(hand.Comp.ActiveHandId);
         }
     }
 }
diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs
index 9fc0815516..51491de98f 100644
--- a/Content.Client/Holopad/HolopadSystem.cs
+++ b/Content.Client/Holopad/HolopadSystem.cs
@@ -5,6 +5,7 @@ using Robust.Client.Graphics;
 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/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs
index 028a3b70d9..a1495ab994 100644
--- a/Content.Client/HotPotato/HotPotatoSystem.cs
+++ b/Content.Client/HotPotato/HotPotatoSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.HotPotato;
 using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Client.HotPotato;
@@ -10,6 +11,9 @@ public sealed class HotPotatoSystem : SharedHotPotatoSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
+    private readonly EntProtoId _hotPotatoEffectId = "HotPotatoEffect";
+
+    // TODO: particle system
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -23,7 +27,7 @@ public sealed class HotPotatoSystem : SharedHotPotatoSystem
             if (_timing.CurTime < comp.TargetTime)
                 continue;
             comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
-            Spawn("HotPotatoEffect", _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
+            Spawn(_hotPotatoEffectId, _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
         }
     }
 }
diff --git a/Content.Client/Humanoid/EyeColorPicker.cs b/Content.Client/Humanoid/EyeColorPicker.cs
index 1c864b1082..8a21b5e8b3 100644
--- a/Content.Client/Humanoid/EyeColorPicker.cs
+++ b/Content.Client/Humanoid/EyeColorPicker.cs
@@ -27,6 +27,7 @@ public sealed class EyeColorPicker : Control
         AddChild(vBox);
 
         vBox.AddChild(_colorSelectors = new ColorSelectorSliders());
+        _colorSelectors.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
 
         _colorSelectors.OnColorChanged += ColorValueChanged;
     }
diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 571944ffaa..34ad4a2c8a 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -42,14 +42,14 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
         UpdateSprite((uid, component, Comp<SpriteComponent>(uid)));
     }
 
-    //private void OnCvarChanged(bool value)
-    //{
-    //    var humanoidQuery = EntityManager.AllEntityQueryEnumerator<HumanoidAppearanceComponent, SpriteComponent>();
-    //    while (humanoidQuery.MoveNext(out var uid, out var humanoidComp, out var spriteComp))
-    //    {
-    //        UpdateSprite((uid, humanoidComp, spriteComp));
-    //    }
-    //}
+    private void OnCvarChanged(bool value)
+    {
+        var humanoidQuery = AllEntityQuery<HumanoidAppearanceComponent, SpriteComponent>();
+        while (humanoidQuery.MoveNext(out var uid, out var humanoidComp, out var spriteComp))
+        {
+            UpdateSprite((uid, humanoidComp, spriteComp));
+        }
+    }
 
     private void UpdateSprite(Entity<HumanoidAppearanceComponent, SpriteComponent> entity)
     {
diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs
index 180b96e78d..7411746470 100644
--- a/Content.Client/Humanoid/MarkingPicker.xaml.cs
+++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs
@@ -426,6 +426,7 @@ public sealed partial class MarkingPicker : Control
             CMarkingColors.AddChild(colorContainer);
 
             ColorSelectorSliders colorSelector = new ColorSelectorSliders();
+            colorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
             colorSliders.Add(colorSelector);
 
             colorContainer.AddChild(new Label { Text = $"{stateNames[i]} color:" });
diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
index c6528d49f2..97ec1fb3c4 100644
--- a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
+++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
@@ -257,6 +257,7 @@ public sealed partial class SingleMarkingPicker : BoxContainer
             {
                 HorizontalExpand = true
             };
+            selector.Color = marking.MarkingColors[i];
             selector.CurrentType = selectorType;
 
             var colorIndex = i;
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 4088ea58ef..efc3e8caf9 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -55,6 +55,7 @@ namespace Content.Client.Input
             human.AddFunction(EngineKeyFunctions.MoveLeft);
             human.AddFunction(EngineKeyFunctions.MoveRight);
             human.AddFunction(EngineKeyFunctions.Walk);
+            human.AddFunction(ContentKeyFunctions.ToggleKnockdown);
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.SwapHandsReverse);
             human.AddFunction(ContentKeyFunctions.Drop);
diff --git a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs
index d861f4163b..c01845bb13 100644
--- a/Content.Client/Instruments/InstrumentSystem.cs
+++ b/Content.Client/Instruments/InstrumentSystem.cs
@@ -294,7 +294,6 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
         SetMaster(uid, null);
         TrySetChannels(uid, data);
 
-        instrument.MidiEventBuffer.Clear();
         instrument.Renderer.OnMidiEvent += instrument.MidiEventBuffer.Add;
         return true;
     }
diff --git a/Content.Client/Instruments/MidiParser/MidiParser.cs b/Content.Client/Instruments/MidiParser/MidiParser.cs
index 937384e439..0b65e472fc 100644
--- a/Content.Client/Instruments/MidiParser/MidiParser.cs
+++ b/Content.Client/Instruments/MidiParser/MidiParser.cs
@@ -102,6 +102,8 @@ public static class MidiParser
                         // 0x03 is TrackName,
                         // 0x04 is InstrumentName
 
+                        // This string can potentially contain control characters, including 0x00 which can cause problems if it ends up in database entries via admin logs
+                        // we sanitize TrackName and InstrumentName after they have been send to the server
                         var text = Encoding.ASCII.GetString(metaData, 0, (int)metaLength);
                         switch (metaType)
                         {
diff --git a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
index 9803920257..8d1d8cd07d 100644
--- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
+++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
@@ -7,17 +7,14 @@ namespace Content.Client.Interactable.Components
     [RegisterComponent]
     public sealed partial class InteractionOutlineComponent : Component
     {
+        private static readonly ProtoId<ShaderPrototype> ShaderInRange = "SelectionOutlineInrange";
+        private static readonly ProtoId<ShaderPrototype> ShaderOutOfRange = "SelectionOutline";
+
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entMan = default!;
 
         private const float DefaultWidth = 1;
 
-        [ValidatePrototypeId<ShaderPrototype>]
-        private const string ShaderInRange = "SelectionOutlineInrange";
-
-        [ValidatePrototypeId<ShaderPrototype>]
-        private const string ShaderOutOfRange = "SelectionOutline";
-
         private bool _inRange;
         private ShaderInstance? _shader;
         private int _lastRenderScale;
@@ -65,7 +62,7 @@ namespace Content.Client.Interactable.Components
         {
             var shaderName = inRange ? ShaderInRange : ShaderOutOfRange;
 
-            var instance = _prototypeManager.Index<ShaderPrototype>(shaderName).InstanceUnique();
+            var instance = _prototypeManager.Index(shaderName).InstanceUnique();
             instance.SetParameter("outline_width", DefaultWidth * renderScale);
             return instance;
         }
diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs
index fe23866535..a1af9f9e20 100644
--- a/Content.Client/Interaction/DragDropSystem.cs
+++ b/Content.Client/Interaction/DragDropSystem.cs
@@ -29,6 +29,10 @@ namespace Content.Client.Interaction;
 /// </summary>
 public sealed class DragDropSystem : SharedDragDropSystem
 {
+    private static readonly ProtoId<ShaderPrototype> ShaderDropTargetInRange = "SelectionOutlineInrange";
+
+    private static readonly ProtoId<ShaderPrototype> ShaderDropTargetOutOfRange = "SelectionOutline";
+
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
@@ -54,12 +58,6 @@ public sealed class DragDropSystem : SharedDragDropSystem
     // mousedown event so it can be treated like a regular click
     private const float MaxMouseDownTimeForReplayingClick = 0.85f;
 
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
-
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderDropTargetOutOfRange = "SelectionOutline";
-
     /// <summary>
     /// Current entity being dragged around.
     /// </summary>
@@ -113,8 +111,8 @@ public sealed class DragDropSystem : SharedDragDropSystem
 
         Subs.CVar(_cfgMan, CCVars.DragDropDeadZone, SetDeadZone, true);
 
-        _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
-        _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
+        _dropTargetInRangeShader = _prototypeManager.Index(ShaderDropTargetInRange).Instance();
+        _dropTargetOutOfRangeShader = _prototypeManager.Index(ShaderDropTargetOutOfRange).Instance();
         // needs to fire on mouseup and mousedown so we can detect a drag / drop
         CommandBinds.Builder
             .BindBefore(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false, true), new[] { typeof(SharedInteractionSystem) })
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index dce401eefd..97da176ed2 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.Clothing;
 using Content.Client.Examine;
 using Content.Client.Verbs.UI;
@@ -11,6 +12,7 @@ using Robust.Client.UserInterface;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Inventory
 {
@@ -19,7 +21,7 @@ namespace Content.Client.Inventory
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-
+        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ClientClothingSystem _clothingVisualsSystem = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
 
@@ -91,6 +93,14 @@ namespace Content.Client.Inventory
 
         private void OnShutdown(EntityUid uid, InventoryComponent component, ComponentShutdown args)
         {
+            if (TryComp(uid, out InventorySlotsComponent? inventorySlots))
+            {
+                foreach (var slot in component.Slots)
+                {
+                    TryRemoveSlotData((uid, inventorySlots), (SlotData)slot);
+                }
+            }
+
             if (uid == _playerManager.LocalEntity)
                 OnUnlinkInventory?.Invoke();
         }
@@ -102,46 +112,22 @@ namespace Content.Client.Inventory
 
         private void OnPlayerAttached(EntityUid uid, InventorySlotsComponent component, LocalPlayerAttachedEvent args)
         {
-            if (TryGetSlots(uid, out var definitions))
-            {
-                foreach (var definition in definitions)
-                {
-                    if (!TryGetSlotContainer(uid, definition.Name, out var container, out _))
-                        continue;
-
-                    if (!component.SlotData.TryGetValue(definition.Name, out var data))
-                    {
-                        data = new SlotData(definition);
-                        component.SlotData[definition.Name] = data;
-                    }
-
-                    data.Container = container;
-                }
-            }
-
             OnLinkInventorySlots?.Invoke(uid, component);
         }
 
+        protected override void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
+        {
+            base.OnInit(ent, ref args);
+
+            _clothingVisualsSystem.InitClothing(ent.Owner, ent.Comp);
+        }
+
         public override void Shutdown()
         {
             CommandBinds.Unregister<ClientInventorySystem>();
             base.Shutdown();
         }
 
-        protected override void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
-        {
-            base.OnInit(uid, component, args);
-            _clothingVisualsSystem.InitClothing(uid, component);
-
-            if (!TryComp(uid, out InventorySlotsComponent? inventorySlots))
-                return;
-
-            foreach (var slot in component.Slots)
-            {
-                TryAddSlotDef(uid, inventorySlots, slot);
-            }
-        }
-
         public void ReloadInventory(InventorySlotsComponent? component = null)
         {
             var player = _playerManager.LocalEntity;
@@ -165,7 +151,10 @@ namespace Content.Client.Inventory
         public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
             bool? blocked = null, bool? highlight = null)
         {
-            var oldData = component.SlotData[slotName];
+            // The slot might have been removed when changing templates, which can cause items to be dropped.
+            if (!component.SlotData.TryGetValue(slotName, out var oldData))
+                return;
+
             var newHighlight = oldData.Highlighted;
             var newBlocked = oldData.Blocked;
 
@@ -181,25 +170,39 @@ namespace Content.Client.Inventory
                 EntitySlotUpdate?.Invoke(newData);
         }
 
-        public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
+        public bool TryAddSlotData(Entity<InventorySlotsComponent> ent, SlotData newSlotData)
         {
-            SlotData newSlotData = newSlotDef; //convert to slotData
-            if (!component.SlotData.TryAdd(newSlotDef.Name, newSlotData))
+            if (!ent.Comp.SlotData.TryAdd(newSlotData.SlotName, newSlotData))
                 return false;
 
-            if (owner == _playerManager.LocalEntity)
+            if (TryGetSlotContainer(ent.Owner, newSlotData.SlotName, out var newContainer, out _))
+                ent.Comp.SlotData[newSlotData.SlotName].Container = newContainer;
+
+            if (ent.Owner == _playerManager.LocalEntity)
                 OnSlotAdded?.Invoke(newSlotData);
+
+            return true;
+        }
+
+        public bool TryRemoveSlotData(Entity<InventorySlotsComponent> ent, SlotData removedSlotData)
+        {
+            if (!ent.Comp.SlotData.Remove(removedSlotData.SlotName))
+                return false;
+
+            if (ent.Owner == _playerManager.LocalEntity)
+                OnSlotRemoved?.Invoke(removedSlotData);
+
             return true;
         }
 
         public void UIInventoryActivate(string slot)
         {
-            EntityManager.RaisePredictiveEvent(new UseSlotNetworkMessage(slot));
+            RaisePredictiveEvent(new UseSlotNetworkMessage(slot));
         }
 
         public void UIInventoryStorageActivate(string slot)
         {
-            EntityManager.RaisePredictiveEvent(new OpenSlotStorageNetworkMessage(slot));
+            RaisePredictiveEvent(new OpenSlotStorageNetworkMessage(slot));
         }
 
         public void UIInventoryExamine(string slot, EntityUid uid)
@@ -223,7 +226,7 @@ namespace Content.Client.Inventory
             if (!TryGetSlotEntity(uid, slot, out var item))
                 return;
 
-            EntityManager.RaisePredictiveEvent(
+            RaisePredictiveEvent(
                 new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: false));
         }
 
@@ -232,40 +235,58 @@ namespace Content.Client.Inventory
             if (!TryGetSlotEntity(uid, slot, out var item))
                 return;
 
-            EntityManager.RaisePredictiveEvent(new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: true));
+            RaisePredictiveEvent(new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: true));
         }
 
         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);
+            }
+
+            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/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index a9a937d5d8..381406d2ac 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.Examine;
+using Content.Client.Hands.Systems;
 using Content.Client.Strip;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
@@ -34,6 +35,7 @@ namespace Content.Client.Inventory
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
 
         private readonly ExamineSystem _examine;
+        private readonly HandsSystem _hands;
         private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
         private readonly StrippableSystem _strippable;
@@ -65,6 +67,7 @@ namespace Content.Client.Inventory
         public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
             _examine = EntMan.System<ExamineSystem>();
+            _hands = EntMan.System<HandsSystem>();
             _inv = EntMan.System<InventorySystem>();
             _cuffable = EntMan.System<SharedCuffableSystem>();
             _strippable = EntMan.System<StrippableSystem>();
@@ -120,28 +123,28 @@ namespace Content.Client.Inventory
             {
                 // good ol hands shit code. there is a GuiHands comparer that does the same thing... but these are hands
                 // and not gui hands... which are different...
-                foreach (var hand in handsComp.Hands.Values)
+                foreach (var (id, hand) in handsComp.Hands)
                 {
                     if (hand.Location != HandLocation.Right)
                         continue;
 
-                    AddHandButton(hand);
+                    AddHandButton((Owner, handsComp), id, hand);
                 }
 
-                foreach (var hand in handsComp.Hands.Values)
+                foreach (var (id, hand) in handsComp.Hands)
                 {
                     if (hand.Location != HandLocation.Middle)
                         continue;
 
-                    AddHandButton(hand);
+                    AddHandButton((Owner, handsComp), id, hand);
                 }
 
-                foreach (var hand in handsComp.Hands.Values)
+                foreach (var (id, hand) in handsComp.Hands)
                 {
                     if (hand.Location != HandLocation.Left)
                         continue;
 
-                    AddHandButton(hand);
+                    AddHandButton((Owner, handsComp), id, hand);
                 }
             }
 
@@ -177,20 +180,21 @@ namespace Content.Client.Inventory
             _strippingMenu.SetSize = new Vector2(horizontalMenuSize, verticalMenuSize);
         }
 
-        private void AddHandButton(Hand hand)
+        private void AddHandButton(Entity<HandsComponent> ent, string handId, Hand hand)
         {
-            var button = new HandButton(hand.Name, hand.Location);
+            var button = new HandButton(handId, hand.Location);
 
             button.Pressed += SlotPressed;
 
-            if (EntMan.TryGetComponent<VirtualItemComponent>(hand.HeldEntity, out var virt))
+            var heldEntity = _hands.GetHeldItem(ent.AsNullable(), handId);
+            if (EntMan.TryGetComponent<VirtualItemComponent>(heldEntity, out var virt))
             {
                 button.Blocked = true;
                 if (EntMan.TryGetComponent<CuffableComponent>(Owner, out var cuff) && _cuffable.GetAllCuffs(cuff).Contains(virt.BlockingEntity))
                     button.BlockedRect.MouseFilter = MouseFilterMode.Ignore;
             }
 
-            UpdateEntityIcon(button, hand.HeldEntity);
+            UpdateEntityIcon(button, heldEntity);
             _strippingMenu!.HandsContainer.AddChild(button);
             LayoutContainer.SetPosition(button, new Vector2i(_handCount, 0) * (SlotControl.DefaultButtonSize + ButtonSeparation));
             _handCount++;
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index bf81036807..4fe4252741 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -17,6 +17,7 @@ using Content.Client.Launcher;
 using Content.Client.Mapping;
 using Content.Client.Parallax.Managers;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.Playtime;
 using Content.Client.Replay;
 using Content.Client.Screenshot;
 using Content.Client.Stylesheets;
@@ -65,6 +66,7 @@ namespace Content.Client.IoC
             collection.Register<PlayerRateLimitManager>();
             collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
             collection.Register<TitleWindowManager>();
+            collection.Register<ClientsidePlaytimeTrackingManager>();
 
             // Sunrise-Start
             collection.Register<ServersHubManager>();
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 1e71d1ae89..66d875b0f2 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -223,13 +223,14 @@ public sealed partial class LatheMenu : DefaultWindow
     /// Populates the build queue list with all queued items
     /// </summary>
     /// <param name="queue"></param>
-    public void PopulateQueueList(List<LatheRecipePrototype> queue)
+    public void PopulateQueueList(IReadOnlyCollection<ProtoId<LatheRecipePrototype>> queue)
     {
         QueueList.DisposeAllChildren();
 
         var idx = 1;
-        foreach (var recipe in queue)
+        foreach (var recipeProto in queue)
         {
+            var recipe = _prototypeManager.Index(recipeProto);
             var queuedRecipeBox = new BoxContainer();
             queuedRecipeBox.Orientation = BoxContainer.LayoutOrientation.Horizontal;
 
@@ -243,12 +244,14 @@ public sealed partial class LatheMenu : DefaultWindow
         }
     }
 
-    public void SetQueueInfo(LatheRecipePrototype? recipe)
+    public void SetQueueInfo(ProtoId<LatheRecipePrototype>? recipeProto)
     {
-        FabricatingContainer.Visible = recipe != null;
-        if (recipe == null)
+        FabricatingContainer.Visible = recipeProto != null;
+        if (recipeProto == null)
             return;
 
+        var recipe = _prototypeManager.Index(recipeProto.Value);
+
         FabricatingDisplayContainer.Children.Clear();
         FabricatingDisplayContainer.AddChild(GetRecipeDisplayControl(recipe));
 
diff --git a/Content.Client/Light/AmbientOcclusionOverlay.cs b/Content.Client/Light/AmbientOcclusionOverlay.cs
new file mode 100644
index 0000000000..4caf654494
--- /dev/null
+++ b/Content.Client/Light/AmbientOcclusionOverlay.cs
@@ -0,0 +1,148 @@
+using System.Numerics;
+using Content.Shared.CCVar;
+using Content.Shared.Maps;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Light;
+
+/// <summary>
+/// Applies ambient-occlusion to the viewport.
+/// </summary>
+public sealed class AmbientOcclusionOverlay : Overlay
+{
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+    private static readonly ProtoId<ShaderPrototype> StencilMaskShader = "StencilMask";
+    private static readonly ProtoId<ShaderPrototype> StencilEqualDrawShader = "StencilEqualDraw";
+
+    [Dependency] private readonly IClyde _clyde = default!;
+    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
+
+    private IRenderTexture? _aoTarget;
+    private IRenderTexture? _aoBlurBuffer;
+
+    // Couldn't figure out a way to avoid this so if you can then please do.
+    private IRenderTexture? _aoStencilTarget;
+
+    public AmbientOcclusionOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        ZIndex = AfterLightTargetOverlay.ContentZIndex + 1;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        /*
+         * tl;dr
+         * - we draw a black square on each "ambient occlusion" entity.
+         * - we blur this.
+         * - We apply it to the viewport.
+         *
+         * We do this while ignoring lighting because it will wash out the actual effect.
+         * In 3D ambient occlusion is more complicated due top having to calculate normals but in 2D
+         * we don't have a concept of depth / corners necessarily.
+         */
+
+        var viewport = args.Viewport;
+        var mapId = args.MapId;
+        var worldBounds = args.WorldBounds;
+        var worldHandle = args.WorldHandle;
+        var color = Color.FromHex(_cfgManager.GetCVar(CCVars.AmbientOcclusionColor));
+        var distance = _cfgManager.GetCVar(CCVars.AmbientOcclusionDistance);
+        //var color = Color.Red;
+        var target = viewport.RenderTarget;
+        var lightScale = target.Size / (Vector2) viewport.Size;
+        var scale = viewport.RenderScale / (Vector2.One / lightScale);
+        var maps = _entManager.System<SharedMapSystem>();
+        var lookups = _entManager.System<EntityLookupSystem>();
+        var query = _entManager.System<OccluderSystem>();
+        var xformSystem = _entManager.System<SharedTransformSystem>();
+        var turfSystem = _entManager.System<TurfSystem>();
+        var invMatrix = args.Viewport.GetWorldToLocalMatrix();
+
+        if (_aoTarget?.Texture.Size != target.Size)
+        {
+            _aoTarget?.Dispose();
+            _aoTarget = _clyde.CreateRenderTarget(target.Size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "ambient-occlusion-target");
+        }
+
+        if (_aoBlurBuffer?.Texture.Size != target.Size)
+        {
+            _aoBlurBuffer?.Dispose();
+            _aoBlurBuffer = _clyde.CreateRenderTarget(target.Size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "ambient-occlusion-blur-target");
+        }
+
+        if (_aoStencilTarget?.Texture.Size != target.Size)
+        {
+            _aoStencilTarget?.Dispose();
+            _aoStencilTarget = _clyde.CreateRenderTarget(target.Size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "ambient-occlusion-stencil-target");
+        }
+
+        // Draw the texture data to the texture.
+        args.WorldHandle.RenderInRenderTarget(_aoTarget,
+            () =>
+            {
+                worldHandle.UseShader(_proto.Index(UnshadedShader).Instance());
+                var invMatrix = _aoTarget.GetWorldToLocalMatrix(viewport.Eye!, scale);
+
+                foreach (var entry in query.QueryAabb(mapId, worldBounds))
+                {
+                    DebugTools.Assert(entry.Component.Enabled);
+                    var matrix = xformSystem.GetWorldMatrix(entry.Transform);
+                    var localMatrix = Matrix3x2.Multiply(matrix, invMatrix);
+
+                    worldHandle.SetTransform(localMatrix);
+                    // 4 pixels
+                    worldHandle.DrawRect(Box2.UnitCentered.Enlarged(distance / EyeManager.PixelsPerMeter), Color.White);
+                }
+            }, Color.Transparent);
+
+        _clyde.BlurRenderTarget(viewport, _aoTarget, _aoBlurBuffer, viewport.Eye!, 14f);
+
+        // Need to do stencilling after blur as it will nuke it.
+        // Draw stencil for the grid so we don't draw in space.
+        args.WorldHandle.RenderInRenderTarget(_aoStencilTarget,
+            () =>
+            {
+                // Don't want lighting affecting it.
+                worldHandle.UseShader(_proto.Index(UnshadedShader).Instance());
+
+                foreach (var grid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
+                {
+                    var transform = xformSystem.GetWorldMatrix(grid.Owner);
+                    var worldToTextureMatrix = Matrix3x2.Multiply(transform, invMatrix);
+                    var tiles = maps.GetTilesEnumerator(grid.Owner, grid, worldBounds);
+                    worldHandle.SetTransform(worldToTextureMatrix);
+                    while (tiles.MoveNext(out var tileRef))
+                    {
+                        if (turfSystem.IsSpace(tileRef))
+                            continue;
+
+                        var bounds = lookups.GetLocalBounds(tileRef, grid.TileSize);
+                        worldHandle.DrawRect(bounds, Color.White);
+                    }
+                }
+
+            }, Color.Transparent);
+
+        // Draw the stencil texture to depth buffer.
+        worldHandle.UseShader(_proto.Index(StencilMaskShader).Instance());
+        worldHandle.DrawTextureRect(_aoStencilTarget!.Texture, worldBounds);
+
+        // Draw the Blurred AO texture finally.
+        worldHandle.UseShader(_proto.Index(StencilEqualDrawShader).Instance());
+        worldHandle.DrawTextureRect(_aoTarget!.Texture, worldBounds, color);
+
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
+        args.WorldHandle.UseShader(null);
+    }
+}
diff --git a/Content.Client/Light/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs
index 246863ba60..03452c6112 100644
--- a/Content.Client/Light/Components/LightBehaviourComponent.cs
+++ b/Content.Client/Light/Components/LightBehaviourComponent.cs
@@ -238,6 +238,9 @@ namespace Content.Client.Light.Components
 
         public override void OnInitialize()
         {
+            // This is very janky. This could easily result in no visible animation at all if the random values happen
+            // to all be close to each other.
+            // TODO ANIMATIONS
             _randomValue1 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble());
             _randomValue2 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble());
             _randomValue3 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble());
diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
index 5b823946f7..d4eaad3882 100644
--- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
@@ -63,7 +63,7 @@ public sealed class LightBehaviorSystem : EntitySystem
     /// </summary>
     private void CopyLightSettings(Entity<LightBehaviourComponent> entity, string property)
     {
-        if (EntityManager.TryGetComponent(entity, out PointLightComponent? light))
+        if (TryComp(entity, out PointLightComponent? light))
         {
             var propertyValue = AnimationHelper.GetAnimatableProperty(light, property);
             if (propertyValue != null)
@@ -73,7 +73,7 @@ public sealed class LightBehaviorSystem : EntitySystem
         }
         else
         {
-            Log.Warning($"{EntityManager.GetComponent<MetaDataComponent>(entity).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!");
+            Log.Warning($"{Comp<MetaDataComponent>(entity).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!");
         }
     }
 
@@ -84,7 +84,7 @@ public sealed class LightBehaviorSystem : EntitySystem
     /// </summary>
     public void StartLightBehaviour(Entity<LightBehaviourComponent> entity, string id = "")
     {
-        if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
+        if (!TryComp(entity, out AnimationPlayerComponent? animation))
         {
             return;
         }
@@ -113,7 +113,7 @@ public sealed class LightBehaviorSystem : EntitySystem
     /// <param name="resetToOriginalSettings">Should the light have its original settings applied?</param>
     public void StopLightBehaviour(Entity<LightBehaviourComponent> entity, string id = "", bool removeBehaviour = false, bool resetToOriginalSettings = false)
     {
-        if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
+        if (!TryComp(entity, out AnimationPlayerComponent? animation))
         {
             return;
         }
@@ -143,7 +143,7 @@ public sealed class LightBehaviorSystem : EntitySystem
             comp.Animations.Remove(container);
         }
 
-        if (resetToOriginalSettings && EntityManager.TryGetComponent(entity, out PointLightComponent? light))
+        if (resetToOriginalSettings && TryComp(entity, out PointLightComponent? light))
         {
             foreach (var (property, value) in comp.OriginalPropertyValues)
             {
@@ -161,7 +161,7 @@ public sealed class LightBehaviorSystem : EntitySystem
     public bool HasRunningBehaviours(Entity<LightBehaviourComponent> entity)
     {
         //var uid = Owner;
-        if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
+        if (!TryComp(entity, out AnimationPlayerComponent? animation))
         {
             return false;
         }
diff --git a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
index cbe2f47f78..deabadaddf 100644
--- a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
@@ -1,17 +1,51 @@
+using Content.Shared.CCVar;
 using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.Light.EntitySystems;
 
 public sealed class PlanetLightSystem : EntitySystem
 {
+    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
 
+    /// <summary>
+    /// Enables / disables the ambient occlusion overlay.
+    /// </summary>
+    public bool AmbientOcclusion
+    {
+        get => _ambientOcclusion;
+        set
+        {
+            if (_ambientOcclusion == value)
+                return;
+
+            _ambientOcclusion = value;
+
+            if (value)
+            {
+                _overlayMan.AddOverlay(new AmbientOcclusionOverlay());
+            }
+            else
+            {
+                _overlayMan.RemoveOverlay<AmbientOcclusionOverlay>();
+            }
+        }
+    }
+
+    private bool _ambientOcclusion;
+
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<GetClearColorEvent>(OnClearColor);
 
+        _cfgManager.OnValueChanged(CCVars.AmbientOcclusion, val =>
+        {
+            AmbientOcclusion = val;
+        }, true);
+
         _overlayMan.AddOverlay(new BeforeLightTargetOverlay());
         _overlayMan.AddOverlay(new RoofOverlay(EntityManager));
         _overlayMan.AddOverlay(new TileEmissionOverlay(EntityManager));
diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs
index 9977a35118..292820ec27 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/Light/RoofOverlay.cs b/Content.Client/Light/RoofOverlay.cs
index 6e43466c24..9be4bfe4c4 100644
--- a/Content.Client/Light/RoofOverlay.cs
+++ b/Content.Client/Light/RoofOverlay.cs
@@ -62,6 +62,8 @@ public sealed class RoofOverlay : Overlay
         worldHandle.RenderInRenderTarget(target,
             () =>
             {
+                var invMatrix = target.GetWorldToLocalMatrix(eye, scale);
+
                 for (var i = 0; i < _grids.Count; i++)
                 {
                     var grid = _grids[i];
@@ -69,8 +71,6 @@ public sealed class RoofOverlay : Overlay
                     if (!_entManager.TryGetComponent(grid.Owner, out ImplicitRoofComponent? roof))
                         continue;
 
-                    var invMatrix = target.GetWorldToLocalMatrix(eye, scale);
-
                     var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
                     var matty = Matrix3x2.Multiply(gridMatrix, invMatrix);
 
@@ -94,13 +94,13 @@ public sealed class RoofOverlay : Overlay
         worldHandle.RenderInRenderTarget(target,
             () =>
             {
+                var invMatrix = target.GetWorldToLocalMatrix(eye, scale);
+
                 foreach (var grid in _grids)
                 {
                     if (!_entManager.TryGetComponent(grid.Owner, out RoofComponent? roof))
                         continue;
 
-                    var invMatrix = target.GetWorldToLocalMatrix(eye, scale);
-
                     var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
                     var matty = Matrix3x2.Multiply(gridMatrix, invMatrix);
 
diff --git a/Content.Client/Light/SunShadowOverlay.cs b/Content.Client/Light/SunShadowOverlay.cs
index a296f95479..f30f4c0409 100644
--- a/Content.Client/Light/SunShadowOverlay.cs
+++ b/Content.Client/Light/SunShadowOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Light;
 
 public sealed class SunShadowOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> MixShader = "Mix";
+
     public override OverlaySpace Space => OverlaySpace.BeforeLighting;
 
     [Dependency] private readonly IClyde _clyde = default!;
@@ -150,7 +152,7 @@ public sealed class SunShadowOverlay : Overlay
                         viewport.LightRenderTarget.GetWorldToLocalMatrix(eye, scale);
                     worldHandle.SetTransform(invMatrix);
 
-                    var maskShader = _protoManager.Index<ShaderPrototype>("Mix").Instance();
+                    var maskShader = _protoManager.Index(MixShader).Instance();
                     worldHandle.UseShader(maskShader);
 
                     worldHandle.DrawTextureRect(_target.Texture, worldBounds, Color.Black.WithAlpha(alpha));
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 82150ce1c0..9dde94cde8 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -6,6 +6,7 @@ using Content.Client.Audio;
 using Content.Client.GameTicking.Managers;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
+using Content.Client.Playtime;
 using Content.Client.UserInterface.Systems.Chat;
 using Content.Client.Voting;
 using Content.Shared.CCVar;
@@ -44,6 +45,7 @@ namespace Content.Client.Lobby
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IVoteManager _voteManager = default!;
+        [Dependency] private readonly ClientsidePlaytimeTrackingManager _playtimeTracking = default!;
         [Dependency] private readonly IParallaxManager _parallaxManager = default!;
         [Dependency] private readonly ISerializationManager _serialization = default!;
         [Dependency] private readonly IResourceManager _resource = default!;
@@ -273,6 +275,26 @@ namespace Content.Client.Lobby
             {
                 Lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
             }
+
+            var minutesToday = _playtimeTracking.PlaytimeMinutesToday;
+            if (minutesToday > 60)
+            {
+                Lobby!.PlaytimeComment.Visible = true;
+
+                var hoursToday = Math.Round(minutesToday / 60f, 1);
+
+                var chosenString = minutesToday switch
+                {
+                    < 180 => "lobby-state-playtime-comment-normal",
+                    < 360 => "lobby-state-playtime-comment-concerning",
+                    < 720 => "lobby-state-playtime-comment-grasstouchless",
+                    _ => "lobby-state-playtime-comment-selfdestructive"
+                };
+
+                Lobby.PlaytimeComment.SetMarkup(Loc.GetString(chosenString, ("hours", hoursToday)));
+            }
+            else
+                Lobby!.PlaytimeComment.Visible = false;
         }
 
         private void UpdateLobbySoundtrackInfo(LobbySoundtrackChangedEvent ev)
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 7ad95faa21..2f7ad4a8b2 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -109,8 +109,7 @@ namespace Content.Client.Lobby.UI
 
         private bool _isDirty;
 
-        [ValidatePrototypeId<GuideEntryPrototype>]
-        private const string DefaultSpeciesGuidebook = "Species";
+        private static readonly ProtoId<GuideEntryPrototype> DefaultSpeciesGuidebook = "Species";
 
         public event Action<List<ProtoId<GuideEntryPrototype>>>? OnOpenGuidebook;
 
@@ -320,6 +319,7 @@ namespace Content.Client.Lobby.UI
             };
 
             RgbSkinColorContainer.AddChild(_rgbSkinColorSelector = new ColorSelectorSliders());
+            _rgbSkinColorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
             _rgbSkinColorSelector.OnColorChanged += _ =>
             {
                 OnSkinColorOnValueChanged();
@@ -932,9 +932,9 @@ namespace Content.Client.Lobby.UI
             var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
             var page = DefaultSpeciesGuidebook;
             if (_prototypeManager.HasIndex<GuideEntryPrototype>(species))
-                page = species;
+                page = new ProtoId<GuideEntryPrototype>(species.Id); // Gross. See above todo comment.
 
-            if (_prototypeManager.TryIndex<GuideEntryPrototype>(DefaultSpeciesGuidebook, out var guideRoot))
+            if (_prototypeManager.TryIndex(DefaultSpeciesGuidebook, out var guideRoot))
             {
                 var dict = new Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry>();
                 dict.Add(DefaultSpeciesGuidebook, guideRoot);
@@ -1168,7 +1168,7 @@ namespace Content.Client.Lobby.UI
 
             _loadoutWindow = new LoadoutWindow(Profile, roleLoadout, roleLoadoutProto, _playerManager.LocalSession, collection, _sponsorsMgr)
             {
-                Title = Loc.GetString($"{jobProto?.ID}-loadout"),
+                Title = Loc.GetString("loadout-window-title-loadout", ("job", $"{jobProto?.LocalizedName}")),
             };
 
             // Refresh the buttons etc.
@@ -1725,33 +1725,13 @@ namespace Content.Client.Lobby.UI
             {
                 return;
             }
-            var hairMarking = Profile.Appearance.HairStyleId switch
-            {
-                HairStyles.DefaultHairStyle => new List<Marking>(),
-                _ => new List<Marking>
-                {
-                    new(
-                        Profile.Appearance.HairStyleId,
-                        new[] { Profile.Appearance.HairColor },
-                        Profile.Appearance.HairMarkingEffect is { } hairExt
-                            ? new List<MarkingEffect> { hairExt.Clone() }
-                            : null)
-                }
-            };
+            var hairMarking = Profile.Appearance.HairStyleId == HairStyles.DefaultHairStyle
+                ? new List<Marking>()
+                : new() { new(Profile.Appearance.HairStyleId, new List<Color>() { Profile.Appearance.HairColor }) };
 
-            var facialHairMarking = Profile.Appearance.FacialHairStyleId switch
-            {
-                HairStyles.DefaultFacialHairStyle => new List<Marking>(),
-                _ => new List<Marking>
-                {
-                    new(
-                        Profile.Appearance.FacialHairStyleId,
-                        new[] { Profile.Appearance.FacialHairColor },
-                        Profile.Appearance.FacialHairMarkingEffect is { } facialExt
-                            ? new List<MarkingEffect> { facialExt.Clone() }
-                            : null)
-                }
-            };
+            var facialHairMarking = Profile.Appearance.FacialHairStyleId == HairStyles.DefaultFacialHairStyle
+                ? new List<Marking>()
+                : new() { new(Profile.Appearance.FacialHairStyleId, new List<Color>() { Profile.Appearance.FacialHairColor }) };
 
             HairStylePicker.UpdateData(
                 hairMarking,
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
index 2ab40fb37d..2264cecd23 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
@@ -20,6 +20,12 @@ public sealed partial class LoadoutContainer : BoxContainer
 
     public Button Select => SelectButton;
 
+    public string? Text
+    {
+        get => SelectButton.Text;
+        set => SelectButton.Text = value;
+    }
+
     public LoadoutContainer(ProtoId<LoadoutPrototype> proto, bool disabled, FormattedMessage? reason)
     {
         RobustXamlLoader.Load(this);
@@ -54,22 +60,9 @@ public sealed partial class LoadoutContainer : BoxContainer
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-
         if (!disposing)
             return;
 
         _entManager.DeleteEntity(_entity);
     }
-
-    public bool Pressed
-    {
-        get => SelectButton.Pressed;
-        set => SelectButton.Pressed = value;
-    }
-
-    public string? Text
-    {
-        get => SelectButton.Text;
-        set => SelectButton.Text = value;
-    }
 }
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml
index 1e3eb14d3f..0deb1c82ba 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml
@@ -1,10 +1,14 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical">
-    <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True">
-        <BoxContainer Name="LoadoutsContainer" Orientation="Vertical"/>
+    <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5">
+        <BoxContainer Name="LoadoutsContainer" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True"/>
     </PanelContainer>
     <!-- Buffer space so we have 10 margin between controls but also 10 to the borders -->
-    <Label Text="{Loc 'loadout-restrictions'}" Margin="5 0 5 5"/>
-    <BoxContainer Name="RestrictionsContainer" Orientation="Vertical" HorizontalExpand="True" />
+    <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5">
+        <BoxContainer Orientation="Vertical">
+            <Label Text="{Loc 'loadout-restrictions'}"/>
+            <BoxContainer Name="RestrictionsContainer" Orientation="Vertical" HorizontalExpand="True" />
+        </BoxContainer>
+    </PanelContainer>
 </BoxContainer>
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
index 7e455f648e..d9dce6bffd 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Shared.Clothing;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
@@ -7,6 +6,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using System.Linq;
 using Content.Sunrise.Interfaces.Shared; // Sunrise-Sponsors
 
 namespace Content.Client.Lobby.UI.Loadouts;
@@ -14,6 +14,14 @@ namespace Content.Client.Lobby.UI.Loadouts;
 [GenerateTypedNameReferences]
 public sealed partial class LoadoutGroupContainer : BoxContainer
 {
+    private const string ClosedGroupMark = "▶";
+    private const string OpenedGroupMark = "▼";
+
+    /// <summary>
+    /// A dictionary that stores open groups
+    /// </summary>
+    private Dictionary<string, bool> _openedGroups = new();
+
     private readonly LoadoutGroupPrototype _groupProto;
     private readonly ISharedSponsorsManager? _sponsors;  // Sunrise-Sponsors
 
@@ -23,6 +31,7 @@ public sealed partial class LoadoutGroupContainer : BoxContainer
     public LoadoutGroupContainer(HumanoidCharacterProfile profile, RoleLoadout loadout, LoadoutGroupPrototype groupProto, ICommonSession session, IDependencyCollection collection, ISharedSponsorsManager? sponsorsManager)  // Sunrise-Sponsors
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
         _groupProto = groupProto;
         _sponsors = sponsorsManager;  // Sunrise-Sponsors
 
@@ -66,33 +75,169 @@ public sealed partial class LoadoutGroupContainer : BoxContainer
         }
 
         LoadoutsContainer.DisposeAllChildren();
-        // Didn't use options because this is more robust in future.
 
-        var selected = loadout.SelectedLoadouts[_groupProto.ID];
+        // Get all loadout prototypes for this group.
+        var validProtos = _groupProto.Loadouts.Select(id => protoMan.Index(id));
 
-        foreach (var loadoutProto in _groupProto.Loadouts)
+        /*
+         * Group the prototypes based on their GroupBy field.
+         * - If GroupBy is null or empty, fallback to grouping by the prototype ID itself.
+         * - The result is a dictionary where:
+         *   - The key is either GroupBy or ID (if GroupBy is not set).
+         *   - The value is the list of prototypes that belong to that group.
+         *
+         * This allows grouping loadouts into sub-categories within the group.
+         */
+        var groups = validProtos
+        .GroupBy(p => string.IsNullOrEmpty(p.GroupBy)
+                         ? p.ID
+                         : p.GroupBy)
+        .ToDictionary(g => g.Key, g => g.ToList());
+
+        foreach (var kvp in groups)
         {
-            if (!protoMan.TryIndex(loadoutProto, out var loadProto))
-                continue;
+            var protos = kvp.Value;
 
-            var matchingLoadout = selected.FirstOrDefault(e => e.Prototype == loadoutProto);
-            var pressed = matchingLoadout != null;
-
-            var sponsorPrototypes = _sponsors?.GetClientPrototypes().ToArray() ?? [];
-            var enabled = loadout.IsValid(profile, session, loadoutProto, collection, sponsorPrototypes, out var reason); // Sunrise-Sponsors
-            var loadoutContainer = new LoadoutContainer(loadoutProto, !enabled, reason);
-            loadoutContainer.Select.Pressed = pressed;
-            loadoutContainer.Text = loadoutSystem.GetName(loadProto);
-
-            loadoutContainer.Select.OnPressed += args =>
+            if (protos.Count > 1)
             {
-                if (args.Button.Pressed)
-                    OnLoadoutPressed?.Invoke(loadoutProto);
-                else
-                    OnLoadoutUnpressed?.Invoke(loadoutProto);
-            };
+                /*
+                 * Build the list of UI elements for each loadout prototype:
+                 * - For each prototype, create its corresponding LoadoutContainer UI element.
+                 * - Set HorizontalExpand to true so elements properly stretch in layout.
+                 * - Collect all UI elements into a list for further processing.
+                 */
+                var uiElements = protos
+                    .Select(proto =>
+                    {
+                        var elem = CreateLoadoutUI(proto, profile, loadout, session, collection, loadoutSystem);
+                        elem.HorizontalExpand = true;
+                        return elem;
+                    })
+                    .ToList();
 
-            LoadoutsContainer.AddChild(loadoutContainer);
+                /*
+                * Determine which element should be displayed first:
+                * - If any element is currently selected (its button is pressed), use it.
+                * - Otherwise, fallback to the first element in the list.
+                *
+                * This moves the selected item outside of the sublist for better usability,
+                * making it easier for players to quickly toggle loadout options (e.g. clothing, accessories)
+                * without having to search inside expanded subgroups.
+                */
+                var firstElement = uiElements.FirstOrDefault(e => e.Select.Pressed) ?? uiElements[0];
+
+                /*
+                 * Get all remaining elements except the first one:
+                 * - Use ReferenceEquals to ensure we exclude the exact instance used as firstElement.
+                 */
+                var otherElements = uiElements.Where(e => !ReferenceEquals(e, firstElement)).ToList();
+
+                firstElement.HorizontalExpand = true;
+                var subContainer = new SubLoadoutContainer()
+                {
+                    Visible = _openedGroups.GetValueOrDefault(kvp.Key, false)
+                };
+                var toggle = CreateToggleButton(kvp, firstElement, subContainer);
+
+                LoadoutsContainer.AddChild(firstElement);
+                LoadoutsContainer.AddChild(subContainer);
+
+                var subList = subContainer.Grid;
+                foreach (var proto in otherElements)
+                {
+                    subList.AddChild(proto);
+                }
+                var itemName = firstElement.Text ?? "";
+                UpdateSubGroupSelectedInfo(firstElement, itemName, subList);
+            }
+            else
+            {
+                LoadoutsContainer.AddChild(
+                    CreateLoadoutUI(protos[0], profile, loadout, session, collection, loadoutSystem)
+                );
+            }
         }
     }
+
+    private ToggleLoadoutButton CreateToggleButton(KeyValuePair<string, List<LoadoutPrototype>> kvp, LoadoutContainer firstElement, SubLoadoutContainer subContainer)
+    {
+        var toggle = new ToggleLoadoutButton
+        {
+            Text = ClosedGroupMark
+        };
+
+        toggle.Text = subContainer.Visible ? OpenedGroupMark : ClosedGroupMark;
+        toggle.Pressed = subContainer.Visible;
+
+        toggle.OnPressed += _ =>
+        {
+            var willOpen = !subContainer.Visible;
+            subContainer.Visible = willOpen;
+            toggle.Text = willOpen ? OpenedGroupMark : ClosedGroupMark;
+            toggle.Pressed = willOpen;
+            _openedGroups[kvp.Key] = willOpen;
+        };
+
+        firstElement.AddChild(toggle);
+        toggle.SetPositionFirst();
+        return toggle;
+    }
+
+    private void UpdateSubGroupSelectedInfo(LoadoutContainer loadout, string itemName, BoxContainer subList)
+    {
+        var countSubSelected = subList.Children
+            .OfType<LoadoutContainer>()
+            .Count(c => c.Select.Pressed);
+
+        if (countSubSelected > 0)
+        {
+            loadout.Text = Loc.GetString("loadouts-count-items-in-group", ("item", itemName), ("count", countSubSelected));
+        }
+    }
+
+    /// <summary>
+    /// Creates a UI container for a single Loadout item.
+    ///
+    /// This method was extracted from RefreshLoadouts because the logic for creating
+    /// individual loadout items is used multiple times inside that method, and duplicating
+    /// the code made it harder to maintain.
+    ///
+    /// Logic:
+    /// - Checks if the item is currently selected in the loadout.
+    /// - Checks if the item is valid for selection (IsValid).
+    /// - Creates a LoadoutContainer with the appropriate status (disabled / active).
+    /// - Subscribes to button press events to handle selection and deselection.
+    /// </summary>
+    /// <param name="proto">The loadout item prototype.</param>
+    /// <param name="profile">The humanoid character profile.</param>
+    /// <param name="loadout">The current role loadout for the user.</param>
+    /// <param name="session">The user's session.</param>
+    /// <param name="collection">The dependency injection container.</param>
+    /// <param name="loadoutSystem">The loadout system instance.</param>
+    /// <returns>A fully initialized LoadoutContainer for UI display.</returns>
+    private LoadoutContainer CreateLoadoutUI(LoadoutPrototype proto, HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, LoadoutSystem loadoutSystem)
+    {
+        var selected = loadout.SelectedLoadouts[_groupProto.ID];
+
+        var pressed = selected.Any(e => e.Prototype == proto.ID);
+
+        var sponsorPrototypes = _sponsors?.GetClientPrototypes().ToArray() ?? [];
+        var enabled = loadout.IsValid(profile, session, proto.ID, collection, sponsorPrototypes, out var reason);
+
+        var cont = new LoadoutContainer(proto, !enabled, reason);
+
+        cont.Text = loadoutSystem.GetName(proto);
+
+        cont.Select.Pressed = pressed;
+
+        cont.Select.OnPressed += args =>
+        {
+            if (args.Button.Pressed)
+                OnLoadoutPressed?.Invoke(proto.ID);
+            else
+                OnLoadoutUnpressed?.Invoke(proto.ID);
+        };
+
+        return cont;
+    }
 }
diff --git a/Content.Client/Lobby/UI/Loadouts/SubLoadoutContainer.xaml b/Content.Client/Lobby/UI/Loadouts/SubLoadoutContainer.xaml
new file mode 100644
index 0000000000..b825e44adb
--- /dev/null
+++ b/Content.Client/Lobby/UI/Loadouts/SubLoadoutContainer.xaml
@@ -0,0 +1,8 @@
+<PanelContainer Name="SubContainer"
+              xmlns="https://spacestation14.io"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <BoxContainer Name="SubGridContainer"
+                  Orientation="Vertical"
+                  HorizontalExpand="true"/>
+  
+</PanelContainer>
diff --git a/Content.Client/Lobby/UI/Loadouts/SubLoadoutContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/SubLoadoutContainer.xaml.cs
new file mode 100644
index 0000000000..4fa9ee5799
--- /dev/null
+++ b/Content.Client/Lobby/UI/Loadouts/SubLoadoutContainer.xaml.cs
@@ -0,0 +1,21 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Lobby.UI.Loadouts;
+
+/// <summary>
+/// A simple container used to group additional loadout UI elements 
+/// that are part of the same GroupBy subgroup.
+/// 
+/// - Used when a loadout group contains multiple prototypes.
+/// - The first prototype is shown directly; the remaining ones are placed inside this container.
+/// - Allows toggling visibility of the subgroup via expandable UI (collapsible behavior).
+/// 
+/// Internally inherits from PanelContainer to allow for border/background styling if needed.
+/// Exposes its internal BoxContainer (SubGridContainer) via the <see cref="Grid"/> property for adding children.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class SubLoadoutContainer : PanelContainer
+{
+    public BoxContainer Grid => SubGridContainer;
+}
diff --git a/Content.Client/Lobby/UI/Loadouts/ToggleLoadoutButton.xaml b/Content.Client/Lobby/UI/Loadouts/ToggleLoadoutButton.xaml
new file mode 100644
index 0000000000..75898df0be
--- /dev/null
+++ b/Content.Client/Lobby/UI/Loadouts/ToggleLoadoutButton.xaml
@@ -0,0 +1,9 @@
+<Button Name="ToggleButton"
+        xmlns="https://spacestation14.io"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        VerticalExpand="False"
+        HorizontalExpand="False"
+        SetSize="64 64"
+        HorizontalAlignment="Right"
+        VerticalAlignment="Center"
+        Margin="0 0 5 0"/>
diff --git a/Content.Client/Lobby/UI/Loadouts/ToggleLoadoutButton.xaml.cs b/Content.Client/Lobby/UI/Loadouts/ToggleLoadoutButton.xaml.cs
new file mode 100644
index 0000000000..1a118e2132
--- /dev/null
+++ b/Content.Client/Lobby/UI/Loadouts/ToggleLoadoutButton.xaml.cs
@@ -0,0 +1,10 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Lobby.UI.Loadouts;
+
+/// <summary>
+/// A button that toggles the loadout groups. Needs for override default styles.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class ToggleLoadoutButton : Button;
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
index ed44b43d52..e461440996 100644
--- a/Content.Client/Mapping/MappingOverlay.cs
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.Mapping;
 
 public sealed class MappingOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
@@ -35,7 +37,7 @@ public sealed class MappingOverlay : Overlay
         _sprite = _entities.System<SpriteSystem>();
 
         _state = state;
-        _shader = _prototypes.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = _prototypes.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Mapping/MappingState.cs b/Content.Client/Mapping/MappingState.cs
index 6430f1db1e..97fbee70bc 100644
--- a/Content.Client/Mapping/MappingState.cs
+++ b/Content.Client/Mapping/MappingState.cs
@@ -793,7 +793,7 @@ public sealed class MappingState : GameplayStateBase
 
             if (_mapMan.TryFindGridAt(mapPos, out var gridUid, out var grid) &&
                 _entityManager.System<SharedMapSystem>().TryGetTileRef(gridUid, grid, coords, out var tileRef) &&
-                _allPrototypesDict.TryGetValue(tileRef.GetContentTileDefinition(), out button))
+                _allPrototypesDict.TryGetValue(_entityManager.System<TurfSystem>().GetContentTileDefinition(tileRef), out button))
             {
                 OnSelected(button);
                 return true;
diff --git a/Content.Client/Markers/MarkerSystem.cs b/Content.Client/Markers/MarkerSystem.cs
index 2ff567e69e..37888d16c2 100644
--- a/Content.Client/Markers/MarkerSystem.cs
+++ b/Content.Client/Markers/MarkerSystem.cs
@@ -33,7 +33,7 @@ public sealed class MarkerSystem : EntitySystem
 
     private void UpdateVisibility(EntityUid uid)
     {
-        if (EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
+        if (TryComp(uid, out SpriteComponent? sprite))
         {
             _sprite.SetVisible((uid, sprite), MarkersVisible);
         }
diff --git a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
index 13db5a8421..c1cbfc573e 100644
--- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
@@ -1,7 +1,5 @@
 using System.Numerics;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Medical.Cryogenics;
-using Content.Shared.Verbs;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Medical.Cryogenics;
@@ -15,11 +13,6 @@ public sealed class CryoPodSystem : SharedCryoPodSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
-        SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<CryoPodComponent, CryoPodPryFinished>(OnCryoPodPryFinished);
-
         SubscribeLocalEvent<CryoPodComponent, AppearanceChangeEvent>(OnAppearanceChange);
         SubscribeLocalEvent<InsideCryoPodComponent, ComponentStartup>(OnCryoPodInsertion);
         SubscribeLocalEvent<InsideCryoPodComponent, ComponentRemove>(OnCryoPodRemoval);
@@ -53,8 +46,8 @@ public sealed class CryoPodSystem : SharedCryoPodSystem
             return;
         }
 
-        if (!_appearance.TryGetData<bool>(uid, CryoPodComponent.CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
-            || !_appearance.TryGetData<bool>(uid, CryoPodComponent.CryoPodVisuals.IsOn, out var isOn, args.Component))
+        if (!_appearance.TryGetData<bool>(uid, CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
+            || !_appearance.TryGetData<bool>(uid, CryoPodVisuals.IsOn, out var isOn, args.Component))
         {
             return;
         }
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 18d60d9a7b..2ee6e43368 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -57,7 +57,8 @@ public sealed class MouseRotatorSystem : SharedMouseRotatorSystem
                 rotation += 2 * Math.PI;
             RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
             {
-                Rotation = rotation
+                Rotation = rotation,
+                User = GetNetEntity(player)
             });
 
             return;
@@ -77,7 +78,8 @@ public sealed class MouseRotatorSystem : SharedMouseRotatorSystem
 
         RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
         {
-            Rotation = angle
+            Rotation = angle,
+            User = GetNetEntity(player)
         });
     }
 }
diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
index 44573f8e08..6520d98ac9 100644
--- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
+++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Client.Movement.Systems;
 
 public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
 {
+    private static readonly ProtoId<ShaderPrototype> HorizontalCut = "HorizontalCut";
+
     [Dependency] private readonly IPrototypeManager _proto = default!;
 
     private EntityQuery<SpriteComponent> _spriteQuery;
@@ -48,7 +50,7 @@ public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
         if (!_spriteQuery.Resolve(sprite.Owner, ref sprite.Comp, false))
             return;
 
-        var shader = _proto.Index<ShaderPrototype>("HorizontalCut").Instance();
+        var shader = _proto.Index(HorizontalCut).Instance();
 
         if (sprite.Comp.PostShader is not null && sprite.Comp.PostShader != shader)
             return;
diff --git a/Content.Client/NPC/ShowHTNCommand.cs b/Content.Client/NPC/ShowHTNCommand.cs
index b6adc0759f..c1f0027087 100644
--- a/Content.Client/NPC/ShowHTNCommand.cs
+++ b/Content.Client/NPC/ShowHTNCommand.cs
@@ -3,14 +3,14 @@ using Robust.Shared.Console;
 
 namespace Content.Client.NPC;
 
-public sealed class ShowHTNCommand : IConsoleCommand
+public sealed class ShowHtnCommand : LocalizedEntityCommands
 {
-    public string Command => "showhtn";
-    public string Description => "Shows the current status for HTN NPCs";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    [Dependency] private readonly HTNSystem _htnSystem = default!;
+
+    public override string Command => "showhtn";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var npcs = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<HTNSystem>();
-        npcs.EnableOverlay ^= true;
+        _htnSystem.EnableOverlay ^= true;
     }
 }
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
index dd3ffd3607..da0b9f60d8 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
@@ -5,15 +5,15 @@
     <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
         <networkConfigurator:NetworkConfiguratorDeviceList Name="DeviceList" MinHeight="500" />
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="8 8 8 1">
-            <Button Name="Set" Text="{Loc 'network-configurator-name-set'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-set'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
-            <Button Name="Add" Text="{Loc 'network-configurator-name-add'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-add'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
+            <Button Name="Set" Text="{Loc 'network-configurator-text-set'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-set'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
+            <Button Name="Add" Text="{Loc 'network-configurator-text-add'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-add'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
             <!-- Edit might not be needed  -->
             <!--<Button Name="Edit" Text="Edit" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-edit'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>-->
-            <Button Name="Clear" Text="{Loc 'network-configurator-name-clear'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-clear'}" HorizontalExpand="True"/>
+            <Button Name="Clear" Text="{Loc 'network-configurator-text-clear'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-clear'}" HorizontalExpand="True"/>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="8 0 8 8">
-            <Button Name="Copy" Text="{Loc 'network-configurator-name-copy'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-copy'}" HorizontalExpand="True" StyleClasses="OpenRight"/>
-            <Button Name="Show" Text="{Loc 'network-configurator-name-show'}" Access="Public" ToggleMode="True" ToolTip="{Loc 'network-configurator-tooltip-show'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
+            <Button Name="Copy" Text="{Loc 'network-configurator-text-copy'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-copy'}" HorizontalExpand="True" StyleClasses="OpenRight"/>
+            <Button Name="Show" Text="{Loc 'network-configurator-text-show'}" Access="Public" ToggleMode="True" ToolTip="{Loc 'network-configurator-tooltip-show'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
         </BoxContainer>
         <Label Name="Count" StyleClasses="LabelSubText" HorizontalAlignment="Right" Margin="0 0 12 8"/>
     </BoxContainer>
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index 8cdffd16af..a316b9e34a 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using System.Linq;
+using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceNetwork;
@@ -14,6 +15,8 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
     private const string PanelBgColor = "#202023";
 
     private readonly LinksRender _links;
@@ -33,6 +36,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
     public NetworkConfiguratorLinkMenu()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
         var footerStyleBox = new StyleBoxFlat()
         {
@@ -61,7 +65,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
         ButtonContainerRight.RemoveAllChildren();
 
         _sources.Clear();
-        _sources.AddRange(linkState.Sources);
+        _sources.AddRange(linkState.Sources.Select(s => _prototypeManager.Index(s)));
         _links.SourceButtons.Clear();
         var i = 0;
         foreach (var source in _sources)
@@ -73,7 +77,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
         }
 
         _sinks.Clear();
-        _sinks.AddRange(linkState.Sinks);
+        _sinks.AddRange(linkState.Sinks.Select(s => _prototypeManager.Index(s)));
         _links.SinkButtons.Clear();
         i = 0;
         foreach (var sink in _sinks)
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 2d561ba5f2..9828222447 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -23,8 +23,7 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
     [Dependency] private readonly ActionsSystem _actions = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string Action = "ActionClearNetworkLinkOverlays";
+    private static readonly EntProtoId Action = "ActionClearNetworkLinkOverlays";
 
     public override void Initialize()
     {
@@ -137,15 +136,14 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
     }
 }
 
-public sealed class ClearAllNetworkLinkOverlays : IConsoleCommand
+public sealed class ClearAllNetworkLinkOverlays : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _e = default!;
+    [Dependency] private readonly NetworkConfiguratorSystem _network = default!;
 
-    public string Command => "clearnetworklinkoverlays";
-    public string Description => "Clear all network link overlays.";
-    public string Help => Command;
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "clearnetworklinkoverlays";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _e.System<NetworkConfiguratorSystem>().ClearAllOverlays();
+        _network.ClearAllOverlays();
     }
 }
diff --git a/Content.Client/NodeContainer/NodeVisCommand.cs b/Content.Client/NodeContainer/NodeVisCommand.cs
index 249c0d9427..e5f0f8f5fa 100644
--- a/Content.Client/NodeContainer/NodeVisCommand.cs
+++ b/Content.Client/NodeContainer/NodeVisCommand.cs
@@ -1,48 +1,39 @@
 using Content.Client.Administration.Managers;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.Client.NodeContainer
 {
-    public sealed class NodeVisCommand : IConsoleCommand
+    public sealed class NodeVisCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly IClientAdminManager _adminManager = default!;
+        [Dependency] private readonly NodeGroupSystem _nodeSystem = default!;
 
-        public string Command => "nodevis";
-        public string Description => "Toggles node group visualization";
-        public string Help => "";
+        public override string Command => "nodevis";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var adminMan = IoCManager.Resolve<IClientAdminManager>();
-            if (!adminMan.HasFlag(AdminFlags.Debug))
+            if (!_adminManager.HasFlag(AdminFlags.Debug))
             {
-                shell.WriteError("You need +DEBUG for this command");
+                shell.WriteError(Loc.GetString($"shell-missing-required-permission", ("perm", "+DEBUG")));
                 return;
             }
 
-            var sys = _e.System<NodeGroupSystem>();
-            sys.SetVisEnabled(!sys.VisEnabled);
+            _nodeSystem.SetVisEnabled(!_nodeSystem.VisEnabled);
         }
     }
 
-    public sealed class NodeVisFilterCommand : IConsoleCommand
+    public sealed class NodeVisFilterCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly NodeGroupSystem _nodeSystem = default!;
 
-        public string Command => "nodevisfilter";
-        public string Description => "Toggles showing a specific group on nodevis";
-        public string Help => "Usage: nodevis [filter]\nOmit filter to list currently masked-off";
+        public override string Command => "nodevisfilter";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var sys = _e.System<NodeGroupSystem>();
-
             if (args.Length == 0)
             {
-                foreach (var filtered in sys.Filtered)
+                foreach (var filtered in _nodeSystem.Filtered)
                 {
                     shell.WriteLine(filtered);
                 }
@@ -50,10 +41,8 @@ namespace Content.Client.NodeContainer
             else
             {
                 var filter = args[0];
-                if (!sys.Filtered.Add(filter))
-                {
-                    sys.Filtered.Remove(filter);
-                }
+                if (!_nodeSystem.Filtered.Add(filter))
+                    _nodeSystem.Filtered.Remove(filter);
             }
         }
     }
diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index 81eedce7d0..c3cc487439 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -6,18 +6,20 @@
             Resizable="False">
 
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
-        <Button Access="Public" Name="RoadmapButton" Text="{Loc 'ui-roadmap'}" StyleClasses="Caution" />
-        <changelog:ChangelogButton Access="Public" Name="ChangelogButton"/>
         <ui:VoteCallMenuButton />
-        <!-- Sunrise-Sponsor-Start -->
+        <!-- Sunrise-Start -->
+        <Button Access="Public" Name="RoadmapButton" Text="{Loc 'ui-roadmap'}" StyleClasses="Caution" />
         <Button Access="Public" Name="DonateButton" Text="{Loc 'ui-escape-donate'}" />
-        <Button Access="Public" Name="ForumButton" Text="{Loc 'ui-escape-forum'}" />
-        <!-- Sunrise-Sponsor-End -->
-        <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
+        <!-- Sunrise-End -->
+        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
         <Button Access="Public" Name="RulesButton" Text="{Loc 'ui-escape-rules'}" />
         <Button Access="Public" Name="GuidebookButton" Text="{Loc 'ui-escape-guidebook'}" />
         <Button Access="Public" Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" />
+        <changelog:ChangelogButton Access="Public" Name="ChangelogButton" />
+        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
+        <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
+        <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
         <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
-        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
+        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" StyleClasses="ButtonColorRed" />
     </BoxContainer>
 </ui1:EscapeMenu>
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index f1b9743cad..f764d18b47 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -14,6 +14,7 @@
                 <ui:OptionDropDown Name="DropDownLightingQuality" Title="{Loc 'ui-options-lighting-label'}" />
                 <CheckBox Name="ViewportLowResCheckBox" Text="{Loc 'ui-options-vp-low-res'}" />
                 <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
+                <CheckBox Name="AmbientOcclusionCheckBox" Text="{Loc 'ui-options-ambient-occlusion'}" />
 
                 <!-- Interface -->
                 <Label Text="{Loc 'ui-options-interface-label'}" StyleClasses="LabelKeyText"/>
@@ -24,6 +25,7 @@
                 <CheckBox Name="IntegerScalingCheckBox"
                           Text="{Loc 'ui-options-vp-integer-scaling'}"
                           ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+                <ui:OptionDropDown Name="DropDownFilterMode" Title="{Loc 'ui-options-filter-label'}" />
                 <CheckBox Name="ViewportVerticalFitCheckBox"
                           Text="{Loc 'ui-options-vp-vertical-fit'}"
                           ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index f53a2edd95..c9c7300155 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -20,6 +20,7 @@ public sealed partial class GraphicsTab : Control
         RobustXamlLoader.Load(this);
 
         Control.AddOptionCheckBox(CVars.DisplayVSync, VSyncCheckBox);
+        Control.AddOptionCheckBox(CCVars.AmbientOcclusion, AmbientOcclusionCheckBox);
         Control.AddOption(new OptionFullscreen(Control, _cfg, FullscreenCheckBox));
         Control.AddOption(new OptionLightingQuality(Control, _cfg, DropDownLightingQuality));
 
@@ -38,6 +39,14 @@ public sealed partial class GraphicsTab : Control
                 new OptionDropDownCVar<float>.ValueOption(2.00f, Loc.GetString("ui-options-scale-200")),
             ]);
 
+        Control.AddOptionDropDown(
+            CCVars.ViewportScalingFilterMode,
+            DropDownFilterMode,
+            [
+                new OptionDropDownCVar<string>.ValueOption("nearest", Loc.GetString("ui-options-filter-nearest")),
+                new OptionDropDownCVar<string>.ValueOption("bilinear", Loc.GetString("ui-options-filter-bilinear")),
+            ]);
+
         var vpStretch = Control.AddOptionCheckBox(CCVars.ViewportStretch, ViewportStretchCheckBox);
         var vpVertFit = Control.AddOptionCheckBox(CCVars.ViewportVerticalFit, ViewportVerticalFitCheckBox);
         Control.AddOptionSlider(
@@ -49,6 +58,7 @@ public sealed partial class GraphicsTab : Control
 
         vpStretch.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
         vpVertFit.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
+        IntegerScalingCheckBox.OnToggled += _ => UpdateViewportSettingsVisibility();
 
         Control.AddOptionSlider(
             CCVars.ViewportWidth,
@@ -76,6 +86,7 @@ public sealed partial class GraphicsTab : Control
         IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportWidthSlider.Visible = !ViewportStretchCheckBox.Pressed || !ViewportVerticalFitCheckBox.Pressed;
+        DropDownFilterMode.Visible = !IntegerScalingCheckBox.Pressed && ViewportStretchCheckBox.Pressed;
     }
 
     private void UpdateViewportWidthRange()
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index f6ba2d2dbe..c334294b57 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -183,6 +183,7 @@ namespace Content.Client.Options.UI.Tabs
             AddButton(EngineKeyFunctions.Walk);
             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/Orbit/OrbitVisualsSystem.cs b/Content.Client/Orbit/OrbitVisualsSystem.cs
index 9824ccac29..144c489a54 100644
--- a/Content.Client/Orbit/OrbitVisualsSystem.cs
+++ b/Content.Client/Orbit/OrbitVisualsSystem.cs
@@ -64,7 +64,7 @@ public sealed class OrbitVisualsSystem : EntitySystem
     {
         base.FrameUpdate(frameTime);
 
-        var query = EntityManager.EntityQueryEnumerator<OrbitVisualsComponent, SpriteComponent>();
+        var query = EntityQueryEnumerator<OrbitVisualsComponent, SpriteComponent>();
         while (query.MoveNext(out var uid, out var orbit, out var sprite))
         {
             var progress = (float)(_timing.CurTime.TotalSeconds / orbit.OrbitLength) % 1;
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 0d9b9787ae..73d45a17a9 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -15,6 +15,9 @@ namespace Content.Client.Outline;
 /// </summary>
 public sealed class TargetOutlineSystem : EntitySystem
 {
+    private static readonly ProtoId<ShaderPrototype> ShaderTargetValid = "SelectionOutlineInrange";
+    private static readonly ProtoId<ShaderPrototype> ShaderTargetInvalid = "SelectionOutline";
+
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -70,12 +73,6 @@ public sealed class TargetOutlineSystem : EntitySystem
 
     private Vector2 LookupVector => new(LookupSize, LookupSize);
 
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderTargetValid = "SelectionOutlineInrange";
-
-    [ValidatePrototypeId<ShaderPrototype>]
-    private const string ShaderTargetInvalid = "SelectionOutline";
-
     private ShaderInstance? _shaderTargetValid;
     private ShaderInstance? _shaderTargetInvalid;
 
@@ -85,8 +82,8 @@ public sealed class TargetOutlineSystem : EntitySystem
     {
         base.Initialize();
 
-        _shaderTargetValid = _prototypeManager.Index<ShaderPrototype>(ShaderTargetValid).InstanceUnique();
-        _shaderTargetInvalid = _prototypeManager.Index<ShaderPrototype>(ShaderTargetInvalid).InstanceUnique();
+        _shaderTargetValid = _prototypeManager.Index(ShaderTargetValid).InstanceUnique();
+        _shaderTargetInvalid = _prototypeManager.Index(ShaderTargetInvalid).InstanceUnique();
     }
 
     public void Disable()
diff --git a/Content.Client/Overlays/BlackAndWhiteOverlay.cs b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
index 785d1dad7f..251a9534a2 100644
--- a/Content.Client/Overlays/BlackAndWhiteOverlay.cs
+++ b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Overlays;
 
 public sealed partial class BlackAndWhiteOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "GreyscaleFullscreen";
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -15,7 +17,7 @@ public sealed partial class BlackAndWhiteOverlay : Overlay
     public BlackAndWhiteOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _greyscaleShader = _prototypeManager.Index<ShaderPrototype>("GreyscaleFullscreen").InstanceUnique();
+        _greyscaleShader = _prototypeManager.Index(Shader).InstanceUnique();
         ZIndex = 10; // draw this over the DamageOverlay, RainbowOverlay etc.
     }
 
diff --git a/Content.Client/Overlays/NoirOverlay.cs b/Content.Client/Overlays/NoirOverlay.cs
index d2a6cbe8b3..f9e468f995 100644
--- a/Content.Client/Overlays/NoirOverlay.cs
+++ b/Content.Client/Overlays/NoirOverlay.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Overlays;
 
 public sealed partial class NoirOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Noir";
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -15,7 +17,7 @@ public sealed partial class NoirOverlay : Overlay
     public NoirOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _noirShader = _prototypeManager.Index<ShaderPrototype>("Noir").InstanceUnique();
+        _noirShader = _prototypeManager.Index(Shader).InstanceUnique();
         ZIndex = 9; // draw this over the DamageOverlay, RainbowOverlay etc, but before the black and white shader
     }
 
diff --git a/Content.Client/Overlays/ShowJobIconsSystem.cs b/Content.Client/Overlays/ShowJobIconsSystem.cs
index cea9f16d5e..24ac8e4902 100644
--- a/Content.Client/Overlays/ShowJobIconsSystem.cs
+++ b/Content.Client/Overlays/ShowJobIconsSystem.cs
@@ -15,8 +15,7 @@ public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponen
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
     [Dependency] private readonly SharedStandingStateSystem _standing = default!;
 
-    [ValidatePrototypeId<JobIconPrototype>]
-    private const string JobIconForNoId = "JobIconNoId";
+    private static readonly ProtoId<JobIconPrototype> JobIconForNoId = "JobIconNoId";
 
     public override void Initialize()
     {
@@ -57,7 +56,7 @@ public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponen
             }
         }
 
-        if (_prototype.TryIndex<JobIconPrototype>(iconId, out var iconPrototype))
+        if (_prototype.TryIndex(iconId, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
         else
             Log.Error($"Invalid job icon prototype: {iconPrototype}");
diff --git a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
index d29564caa9..a5efacc16c 100644
--- a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
+++ b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
@@ -45,13 +45,13 @@ public sealed partial class StencilOverlay
         }, Color.Transparent);
 
         worldHandle.SetTransform(Matrix3x2.Identity);
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilMask).Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
         var sprite = _sprite.GetFrame(new SpriteSpecifier.Texture(new ResPath("/Textures/Parallaxes/noise.png")), curTime);
 
         // Draw the rain
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilDraw).Instance());
         _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, new Vector2(0.5f, 0f));
     }
 }
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index b1a521433a..509b946ad4 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -55,13 +55,13 @@ public sealed partial class StencilOverlay
         }, Color.Transparent);
 
         worldHandle.SetTransform(Matrix3x2.Identity);
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilMask).Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
         var sprite = _sprite.GetFrame(weatherProto.Sprite, curTime);
 
         // Draw the rain
-        worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.UseShader(_protoManager.Index(StencilDraw).Instance());
         _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, Vector2.Zero, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha));
 
         worldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index e8461ae5a3..0796be08e1 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -17,6 +17,10 @@ namespace Content.Client.Overlays;
 /// </summary>
 public sealed partial class StencilOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> CircleShader = "WorldGradientCircle";
+    private static readonly ProtoId<ShaderPrototype> StencilMask = "StencilMask";
+    private static readonly ProtoId<ShaderPrototype> StencilDraw = "StencilDraw";
+
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -43,7 +47,7 @@ public sealed partial class StencilOverlay : Overlay
         _sprite = sprite;
         _weather = weather;
         IoCManager.InjectDependencies(this);
-        _shader = _protoManager.Index<ShaderPrototype>("WorldGradientCircle").InstanceUnique();
+        _shader = _protoManager.Index(CircleShader).InstanceUnique();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Paper/UI/StampLabel.xaml.cs b/Content.Client/Paper/UI/StampLabel.xaml.cs
index be6d52baea..1750110c4c 100644
--- a/Content.Client/Paper/UI/StampLabel.xaml.cs
+++ b/Content.Client/Paper/UI/StampLabel.xaml.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Paper.UI;
 [GenerateTypedNameReferences]
 public sealed partial class StampLabel : Label
 {
+    private static readonly ProtoId<ShaderPrototype> PaperStamp = "PaperStamp";
+
     /// A scale that's applied to the text to ensure it
     /// fits in the allowed space.
     private Vector2 _textScaling = Vector2.One;
@@ -26,7 +28,7 @@ public sealed partial class StampLabel : Label
         RobustXamlLoader.Load(this);
 
         var prototypes = IoCManager.Resolve<IPrototypeManager>();
-        _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
+        _stampShader = prototypes.Index(PaperStamp).InstanceUnique();
     }
 
     protected override Vector2 MeasureOverride(Vector2 availableSize)
diff --git a/Content.Client/Paper/UI/StampWidget.xaml.cs b/Content.Client/Paper/UI/StampWidget.xaml.cs
index 487e0732b4..a462d40e69 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml.cs
+++ b/Content.Client/Paper/UI/StampWidget.xaml.cs
@@ -12,6 +12,8 @@ namespace Content.Client.Paper.UI;
 [GenerateTypedNameReferences]
 public sealed partial class StampWidget : PanelContainer
 {
+    private static readonly ProtoId<ShaderPrototype> PaperStamp = "PaperStamp";
+
     private StyleBoxTexture _borderTexture;
     private ShaderInstance? _stampShader;
 
@@ -42,7 +44,7 @@ public sealed partial class StampWidget : PanelContainer
         PanelOverride = _borderTexture;
 
         var prototypes = IoCManager.Resolve<IPrototypeManager>();
-        _stampShader = prototypes.Index<ShaderPrototype>("PaperStamp").InstanceUnique();
+        _stampShader = prototypes.Index(PaperStamp).InstanceUnique();
     }
 
     protected override void Draw(DrawingHandleScreen handle)
diff --git a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
index 845f631de8..911f655c6d 100644
--- a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
+++ b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs
@@ -195,7 +195,6 @@ public sealed class GeneratedParallaxCache : IPostInjectInit
         public required ResPath ConfigPath;
         public required Task<Texture> LoadTask;
         public required CancellationTokenSource CancellationSource;
-        public ValueList<CancellationTokenRegistration> CancelRegistrations;
 
         public int RefCount;
     }
diff --git a/Content.Client/Parallax/ParallaxSystem.cs b/Content.Client/Parallax/ParallaxSystem.cs
index 465bc9cef4..7fed53782a 100644
--- a/Content.Client/Parallax/ParallaxSystem.cs
+++ b/Content.Client/Parallax/ParallaxSystem.cs
@@ -14,8 +14,7 @@ public sealed class ParallaxSystem : SharedParallaxSystem
     [Dependency] private readonly IParallaxManager _parallax = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
 
-    [ValidatePrototypeId<ParallaxPrototype>]
-    private const string Fallback = "Default";
+    private static readonly ProtoId<ParallaxPrototype> Fallback = "Default";
 
     public const int ParallaxZIndex = 0;
 
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
index cc5016c4a7..27a585119e 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
@@ -262,6 +262,7 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow
 
 public sealed class PASegmentControl : Control
 {
+    private static readonly ProtoId<ShaderPrototype> GreyscaleShaderId = "Greyscale";
     private readonly ShaderInstance _greyScaleShader;
     private readonly TextureRect _base;
     private readonly TextureRect _unlit;
@@ -272,7 +273,7 @@ public sealed class PASegmentControl : Control
 
     public PASegmentControl()
     {
-        _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("Greyscale").Instance();
+        _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index(GreyscaleShaderId).Instance();
 
         AddChild(_base = new TextureRect());
         AddChild(_unlit = new TextureRect());
diff --git a/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs b/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs
new file mode 100644
index 0000000000..9a4f75d596
--- /dev/null
+++ b/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs
@@ -0,0 +1,108 @@
+using Content.Shared.CCVar;
+using Robust.Client.Player;
+using Robust.Shared.Network;
+using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Playtime;
+
+/// <summary>
+///     Keeps track of how long the player has played today.
+/// </summary>
+/// <remarks>
+/// <para>
+///     Playtime is treated as any time in which the player is attached to an entity.
+///     This notably excludes scenarios like the lobby.
+/// </para>
+/// </remarks>
+public sealed class ClientsidePlaytimeTrackingManager
+{
+    [Dependency] private readonly IClientNetManager _clientNetManager = default!;
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    private ISawmill _sawmill = default!;
+
+    private const string InternalDateFormat = "yyyy-MM-dd";
+
+    [ViewVariables]
+    private TimeSpan? _mobAttachmentTime;
+
+    /// <summary>
+    /// The total amount of time played today, in minutes.
+    /// </summary>
+    [ViewVariables]
+    public float PlaytimeMinutesToday
+    {
+        get
+        {
+            var cvarValue = _configurationManager.GetCVar(CCVars.PlaytimeMinutesToday);
+            if (_mobAttachmentTime == null)
+                return cvarValue;
+
+            return cvarValue + (float)(_gameTiming.RealTime - _mobAttachmentTime.Value).TotalMinutes;
+        }
+    }
+
+    public void Initialize()
+    {
+        _sawmill = _logManager.GetSawmill("clientplaytime");
+        _clientNetManager.Connected += OnConnected;
+
+        // The downside to relying on playerattached and playerdetached is that unsaved playtime won't be saved in the event of a crash
+        // But then again, the config doesn't get saved in the event of a crash, either, so /shrug
+        // Playerdetached gets called on quit, though, so at least that's covered.
+        _playerManager.LocalPlayerAttached += OnPlayerAttached;
+        _playerManager.LocalPlayerDetached += OnPlayerDetached;
+    }
+
+    private void OnConnected(object? sender, NetChannelArgs args)
+    {
+        var datatimey = DateTime.Now;
+        _sawmill.Info($"Current day: {datatimey.Day} Current Date: {datatimey.Date.ToString(InternalDateFormat)}");
+
+        var recordedDateString = _configurationManager.GetCVar(CCVars.PlaytimeLastConnectDate);
+        var formattedDate = datatimey.Date.ToString(InternalDateFormat);
+
+        if (formattedDate == recordedDateString)
+            return;
+
+        _configurationManager.SetCVar(CCVars.PlaytimeMinutesToday, 0);
+        _configurationManager.SetCVar(CCVars.PlaytimeLastConnectDate, formattedDate);
+    }
+
+    private void OnPlayerAttached(EntityUid entity)
+    {
+        _mobAttachmentTime = _gameTiming.RealTime;
+    }
+
+    private void OnPlayerDetached(EntityUid entity)
+    {
+        if (_mobAttachmentTime == null)
+            return;
+
+        var newTimeValue = PlaytimeMinutesToday;
+
+        _mobAttachmentTime = null;
+
+        var timeDiffMinutes = newTimeValue - _configurationManager.GetCVar(CCVars.PlaytimeMinutesToday);
+        if (timeDiffMinutes < 0)
+        {
+            _sawmill.Error("Time differential on player detachment somehow less than zero!");
+            return;
+        }
+
+        // At less than 1 minute of time diff, there's not much point
+        // The reason this isn't checking for 0 is because TotalMinutes is fractional, rather than solely whole minutes
+        if (timeDiffMinutes < 1)
+            return;
+
+        _configurationManager.SetCVar(CCVars.PlaytimeMinutesToday, newTimeValue);
+
+        _sawmill.Info($"Recorded {timeDiffMinutes} minutes of living playtime!");
+
+        _configurationManager.SaveToFile(); // We don't like that we have to save the entire config just to store playtime stats '^'
+    }
+}
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index 18e81b368c..c12de90c15 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -16,6 +16,8 @@ namespace Content.Client.Popups;
 /// </summary>
 public sealed class PopupOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     private readonly IConfigurationManager _configManager;
     private readonly IEntityManager _entManager;
     private readonly IPlayerManager _playerMgr;
@@ -48,7 +50,7 @@ public sealed class PopupOverlay : Overlay
         _popup = popup;
         _controller = controller;
 
-        _shader = protoManager.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = protoManager.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index 25e885b3c7..65464abd54 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.UserInterface.XAML;
 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/EntitySystems/StaticPowerSystem.cs b/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
index 2ca945cbbd..f803b92067 100644
--- a/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
+++ b/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
@@ -9,7 +9,7 @@ public static class StaticPowerSystem
     public static bool IsPowered(this EntitySystem system, EntityUid uid, IEntityManager entManager, ApcPowerReceiverComponent? receiver = null)
     {
         if (receiver == null && !entManager.TryGetComponent(uid, out receiver))
-            return false;
+            return true;
 
         return receiver.Powered;
     }
diff --git a/Content.Client/Power/Generation/Teg/TegSystem.cs b/Content.Client/Power/Generation/Teg/TegSystem.cs
index 92b5062b6d..0ae1b5e496 100644
--- a/Content.Client/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Client/Power/Generation/Teg/TegSystem.cs
@@ -15,8 +15,7 @@ namespace Content.Client.Power.Generation.Teg;
 /// <seealso cref="TegCirculatorComponent"/>
 public sealed class TegSystem : EntitySystem
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string ArrowPrototype = "TegCirculatorArrow";
+    private static readonly EntProtoId ArrowPrototype = "TegCirculatorArrow";
 
     public override void Initialize()
     {
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index d3671e265a..e2b27c1b62 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -6,7 +6,6 @@ using Robust.Shared.Utility;
 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/PowerCell/PowerCellSystem.cs b/Content.Client/PowerCell/PowerCellSystem.cs
index 66fa1fa98f..8d9dd5ebdd 100644
--- a/Content.Client/PowerCell/PowerCellSystem.cs
+++ b/Content.Client/PowerCell/PowerCellSystem.cs
@@ -48,17 +48,15 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
         if (!_sprite.LayerExists((uid, args.Sprite), PowerCellVisualLayers.Unshaded))
             return;
 
-        if (_appearance.TryGetData<byte>(uid, PowerCellVisuals.ChargeLevel, out var level, args.Component))
-        {
-            if (level == 0)
-            {
-                _sprite.LayerSetVisible((uid, args.Sprite), PowerCellVisualLayers.Unshaded, false);
-                return;
-            }
+        // If no appearance data is set, rely on whatever existing sprite state is set being correct.
+        if (!_appearance.TryGetData<byte>(uid, PowerCellVisuals.ChargeLevel, out var level, args.Component))
+            return;
 
-            _sprite.LayerSetVisible((uid, args.Sprite), PowerCellVisualLayers.Unshaded, false);
+        var positiveCharge = level > 0;
+        _sprite.LayerSetVisible((uid, args.Sprite), PowerCellVisualLayers.Unshaded, positiveCharge);
+
+        if (positiveCharge)
             _sprite.LayerSetRsiState((uid, args.Sprite), PowerCellVisualLayers.Unshaded, $"o{level}");
-        }
     }
 
     private enum PowerCellVisualLayers : byte
diff --git a/Content.Client/RCD/AlignRCDConstruction.cs b/Content.Client/RCD/AlignRCDConstruction.cs
index fbaf62c83d..b155458836 100644
--- a/Content.Client/RCD/AlignRCDConstruction.cs
+++ b/Content.Client/RCD/AlignRCDConstruction.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Client.Gameplay;
+using Content.Client.Hands.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.RCD.Components;
@@ -17,6 +18,7 @@ public sealed class AlignRCDConstruction : PlacementMode
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     private readonly SharedMapSystem _mapSystem;
+    private readonly HandsSystem _handsSystem;
     private readonly RCDSystem _rcdSystem;
     private readonly SharedTransformSystem _transformSystem;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -34,6 +36,7 @@ public sealed class AlignRCDConstruction : PlacementMode
     {
         IoCManager.InjectDependencies(this);
         _mapSystem = _entityManager.System<SharedMapSystem>();
+        _handsSystem = _entityManager.System<HandsSystem>();
         _rcdSystem = _entityManager.System<RCDSystem>();
         _transformSystem = _entityManager.System<SharedTransformSystem>();
 
@@ -88,11 +91,9 @@ public sealed class AlignRCDConstruction : PlacementMode
         }
 
         // Determine if player is carrying an RCD in their active hand
-        if (!_entityManager.TryGetComponent<HandsComponent>(player, out var hands))
+        if (!_handsSystem.TryGetActiveItem(player.Value, out var heldEntity))
             return false;
 
-        var heldEntity = hands.ActiveHand?.HeldEntity;
-
         if (!_entityManager.TryGetComponent<RCDComponent>(heldEntity, out var rcd))
             return false;
 
diff --git a/Content.Client/RCD/RCDConstructionGhostSystem.cs b/Content.Client/RCD/RCDConstructionGhostSystem.cs
index 23dcf6485f..fcbe3aece7 100644
--- a/Content.Client/RCD/RCDConstructionGhostSystem.cs
+++ b/Content.Client/RCD/RCDConstructionGhostSystem.cs
@@ -1,8 +1,7 @@
-using Content.Shared.Hands.Components;
+using Content.Client.Hands.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.RCD;
 using Content.Shared.RCD.Components;
-using Content.Shared.RCD.Systems;
 using Robust.Client.Placement;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
@@ -10,13 +9,18 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Client.RCD;
 
+/// <summary>
+/// System for handling structure ghost placement in places where RCD can create objects.
+/// </summary>
 public sealed class RCDConstructionGhostSystem : EntitySystem
 {
+    private const string PlacementMode = nameof(AlignRCDConstruction);
+
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPlacementManager _placementManager = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
-
-    private string _placementMode = typeof(AlignRCDConstruction).Name;
+    [Dependency] private readonly HandsSystem _hands = default!;
+    
     private Direction _placementDirection = default;
 
     public override void Update(float frameTime)
@@ -33,12 +37,10 @@ public sealed class RCDConstructionGhostSystem : EntitySystem
             return;
 
         // Determine if player is carrying an RCD in their active hand
-        var player = _playerManager.LocalSession?.AttachedEntity;
-
-        if (!TryComp<HandsComponent>(player, out var hands))
+        if (_playerManager.LocalSession?.AttachedEntity is not { } player)
             return;
 
-        var heldEntity = hands.ActiveHand?.HeldEntity;
+        var heldEntity = _hands.GetActiveItem(player);
 
         if (!TryComp<RCDComponent>(heldEntity, out var rcd))
         {
@@ -65,7 +67,7 @@ public sealed class RCDConstructionGhostSystem : EntitySystem
         var newObjInfo = new PlacementInformation
         {
             MobUid = heldEntity.Value,
-            PlacementOption = _placementMode,
+            PlacementOption = PlacementMode,
             EntityType = prototype.Prototype,
             Range = (int) Math.Ceiling(SharedInteractionSystem.InteractionRange),
             IsTile = (prototype.Mode == RcdMode.ConstructTile),
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index d6e36dd0ad..4cbeaa52f5 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -13,6 +13,8 @@ namespace Content.Client.Radiation.Overlays
 {
     public sealed class RadiationPulseOverlay : Overlay
     {
+        private static readonly ProtoId<ShaderPrototype> RadiationShader = "Radiation";
+
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -29,7 +31,7 @@ namespace Content.Client.Radiation.Overlays
         public RadiationPulseOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _baseShader = _prototypeManager.Index<ShaderPrototype>("Radiation").Instance().Duplicate();
+            _baseShader = _prototypeManager.Index(RadiationShader).Instance().Duplicate();
         }
 
         protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Revenant/RevenantSystem.cs b/Content.Client/Revenant/RevenantSystem.cs
index 0534522b40..21d2d7888d 100644
--- a/Content.Client/Revenant/RevenantSystem.cs
+++ b/Content.Client/Revenant/RevenantSystem.cs
@@ -1,4 +1,6 @@
 using Content.Client.Alerts;
+using Content.Shared.Alert;
+using Content.Shared.Alert.Components;
 using Content.Shared.Revenant;
 using Content.Shared.Revenant.Components;
 using Robust.Client.GameObjects;
@@ -15,7 +17,7 @@ public sealed class RevenantSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<RevenantComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        SubscribeLocalEvent<RevenantComponent, UpdateAlertSpriteEvent>(OnUpdateAlert);
+        SubscribeLocalEvent<RevenantComponent, GetGenericAlertCounterAmountEvent>(OnGetCounterAmount);
     }
 
     private void OnAppearanceChange(EntityUid uid, RevenantComponent component, ref AppearanceChangeEvent args)
@@ -40,14 +42,14 @@ public sealed class RevenantSystem : EntitySystem
         }
     }
 
-    private void OnUpdateAlert(Entity<RevenantComponent> ent, ref UpdateAlertSpriteEvent args)
+    private void OnGetCounterAmount(Entity<RevenantComponent> ent, ref GetGenericAlertCounterAmountEvent args)
     {
-        if (args.Alert.ID != ent.Comp.EssenceAlert)
+        if (args.Handled)
             return;
 
-        var essence = Math.Clamp(ent.Comp.Essence.Int(), 0, 999);
-        _sprite.LayerSetRsiState(args.SpriteViewEnt.AsNullable(), RevenantVisualLayers.Digit1, $"{(essence / 100) % 10}");
-        _sprite.LayerSetRsiState(args.SpriteViewEnt.AsNullable(), RevenantVisualLayers.Digit2, $"{(essence / 10) % 10}");
-        _sprite.LayerSetRsiState(args.SpriteViewEnt.AsNullable(), RevenantVisualLayers.Digit3, $"{essence % 10}");
+        if (ent.Comp.EssenceAlert != args.Alert)
+            return;
+
+        args.Amount = ent.Comp.Essence.Int();
     }
 }
diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs
index 8dbcf97320..b5be4d0b17 100644
--- a/Content.Client/Rotation/RotationVisualizerSystem.cs
+++ b/Content.Client/Rotation/RotationVisualizerSystem.cs
@@ -24,7 +24,7 @@ public sealed class RotationVisualizerSystem : SharedRotationVisualsSystem
             return;
 
         if (!_appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, args.Component))
-            return;
+            state = RotationState.Vertical;
 
         switch (state)
         {
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index abc717642c..99a84fa23b 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -90,7 +90,7 @@ namespace Content.Client.Sandbox
 
             // Try copy entity.
             if (uid.IsValid()
-                && EntityManager.TryGetComponent(uid, out MetaDataComponent? comp)
+                && TryComp(uid, out MetaDataComponent? comp)
                 && !comp.EntityDeleted)
             {
                 if (comp.EntityPrototype == null || comp.EntityPrototype.HideSpawnMenu || comp.EntityPrototype.Abstract)
diff --git a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
index 717ab40765..e833e7d7a9 100644
--- a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
+++ b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
@@ -25,6 +25,29 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
     private TimeSpan _retentionTime;
     private readonly Dictionary<int, SensorData> _sensorData = new();
 
+    /// <summary>
+    /// <para>A shared array used to store vertices for drawing graphs in <see cref="GraphView"/>.
+    /// Prevents excessive allocations by reusing the same array across multiple graph views.</para>
+    /// <para>This effectively makes it so that each <see cref="SensorMonitoringWindow"/> has its own pooled array.</para>
+    /// </summary>
+    private Vector2[] _sharedVertices = [];
+
+    /// <summary>
+    /// Retrieves a shared array of vertices, ensuring that it has at least the requested size.
+    /// Assigns a new array of the requested size if the current shared array is smaller than the requested size.
+    /// </summary>
+    /// <param name="requestedSize">The minimum number of vertices required in the shared array.</param>
+    /// <returns>An array of <see cref="System.Numerics.Vector2"/> representing the shared vertices.</returns>
+    /// <remarks>This does not prevent other threads from accessing the same shared pool.</remarks>
+    public Vector2[] GetSharedVertices(int requestedSize)
+    {
+        if (_sharedVertices.Length < requestedSize)
+        {
+            _sharedVertices = new Vector2[requestedSize];
+        }
+        return _sharedVertices;
+    }
+
     public SensorMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
@@ -145,7 +168,7 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
                     }
                 });
 
-                Asdf.AddChild(new GraphView(stream.Samples, startTime, curTime, maxValue * 1.1f) { MinHeight = 150 });
+                Asdf.AddChild(new GraphView(stream.Samples, startTime, curTime, maxValue * 1.1f, this) { MinHeight = 150 });
                 Asdf.AddChild(new PanelContainer { StyleClasses = { StyleBase.ClassLowDivider } });
             }
         }
@@ -197,31 +220,37 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
         private readonly TimeSpan _startTime;
         private readonly TimeSpan _curTime;
         private readonly float _maxY;
+        private readonly SensorMonitoringWindow _parentWindow;
 
-        public GraphView(Queue<SensorSample> samples, TimeSpan startTime, TimeSpan curTime, float maxY)
+        public GraphView(Queue<SensorSample> samples,
+            TimeSpan startTime,
+            TimeSpan curTime,
+            float maxY,
+            SensorMonitoringWindow parentWindow)
         {
             _samples = samples;
             _startTime = startTime;
             _curTime = curTime;
             _maxY = maxY;
             RectClipContent = true;
+            _parentWindow = parentWindow;
         }
 
         protected override void Draw(DrawingHandleScreen handle)
         {
             base.Draw(handle);
 
-            var window = (float) (_curTime - _startTime).TotalSeconds;
-
-            // TODO: omg this is terrible don't fucking hardcode this size to something uncached huge omfg.
-            var vertices = new Vector2[25000];
+            var window = (float)(_curTime - _startTime).TotalSeconds;
             var countVtx = 0;
 
             var lastPoint = new Vector2(float.NaN, float.NaN);
+            var requiredVertices = 6 * (_samples.Count - 1);
+
+            var vertices = _parentWindow.GetSharedVertices(requiredVertices);
 
             foreach (var (time, sample) in _samples)
             {
-                var relTime = (float) (time - _startTime).TotalSeconds;
+                var relTime = (float)(time - _startTime).TotalSeconds;
 
                 var posY = PixelHeight - (sample / _maxY) * PixelHeight;
                 var posX = (relTime / window) * PixelWidth;
@@ -242,8 +271,9 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
 
                 lastPoint = newPoint;
             }
-
-            handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, vertices.AsSpan(0, countVtx), Color.White.WithAlpha(0.1f));
+            handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList,
+                vertices.AsSpan(0, countVtx),
+                Color.White.WithAlpha(0.1f));
         }
     }
 }
diff --git a/Content.Client/Shuttles/FtlArrivalOverlay.cs b/Content.Client/Shuttles/FtlArrivalOverlay.cs
index ec6a555873..050f256d49 100644
--- a/Content.Client/Shuttles/FtlArrivalOverlay.cs
+++ b/Content.Client/Shuttles/FtlArrivalOverlay.cs
@@ -14,6 +14,8 @@ namespace Content.Client.Shuttles;
 /// </summary>
 public sealed class FtlArrivalOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
 
     private EntityLookupSystem _lookups;
@@ -36,7 +38,7 @@ public sealed class FtlArrivalOverlay : Overlay
         _maps = _entManager.System<SharedMapSystem>();
         _sprites = _entManager.System<SpriteSystem>();
 
-        _shader = _protos.Index<ShaderPrototype>("unshaded").Instance();
+        _shader = _protos.Index(UnshadedShader).Instance();
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index 8bb49bdb2b..c2d978e609 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -10,7 +10,6 @@ using Robust.Shared.Physics;
 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 1a0e3aae81..2dcec6b44a 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -220,9 +220,9 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
 
                 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/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
index e1fbd376b5..be59b07b65 100644
--- a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
@@ -25,7 +25,6 @@ public sealed partial class BorgSelectTypeMenu : FancyWindow
 
     public event Action<ProtoId<BorgTypePrototype>>? ConfirmedBorgType;
 
-    [ValidatePrototypeId<GuideEntryPrototype>]
     private static readonly List<ProtoId<GuideEntryPrototype>> GuidebookEntries = new() { "Cyborgs", "Robotics" };
 
     public BorgSelectTypeMenu()
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index bb0dba2f57..245ea194f0 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -84,12 +84,13 @@ public sealed partial class LawDisplay : Control
 
             radioChannelButton.OnPressed += _ =>
             {
-                switch (radioChannel)
+                if (radioChannel == SharedChatSystem.CommonChannel)
                 {
-                    case SharedChatSystem.CommonChannel:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
-                    default:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
+                    _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio);
+                }
+                else
+                {
+                    _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio);
                 }
                 _nextAllowedPress[radioChannelButton] = _timing.CurTime + PressCooldown;
             };
diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
index ee0c8d26d1..e1e7bd6556 100644
--- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs
+++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
@@ -13,6 +13,10 @@ namespace Content.Client.Silicons.StationAi;
 
 public sealed class StationAiOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> CameraStaticShader = "CameraStatic";
+    private static readonly ProtoId<ShaderPrototype> StencilMaskShader = "StencilMask";
+    private static readonly ProtoId<ShaderPrototype> StencilDrawShader = "StencilDraw";
+
     [Dependency] private readonly IClyde _clyde = default!;
     [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -98,7 +102,7 @@ public sealed class StationAiOverlay : Overlay
             () =>
             {
                 worldHandle.SetTransform(invMatrix);
-                var shader = _proto.Index<ShaderPrototype>("CameraStatic").Instance();
+                var shader = _proto.Index(CameraStaticShader).Instance();
                 worldHandle.UseShader(shader);
                 worldHandle.DrawRect(worldBounds, Color.White);
             },
@@ -121,11 +125,11 @@ public sealed class StationAiOverlay : Overlay
         }
 
         // Use the lighting as a mask
-        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilMask").Instance());
+        worldHandle.UseShader(_proto.Index(StencilMaskShader).Instance());
         worldHandle.DrawTextureRect(_stencilTexture!.Texture, worldBounds);
 
         // Draw the static
-        worldHandle.UseShader(_proto.Index<ShaderPrototype>("StencilDraw").Instance());
+        worldHandle.UseShader(_proto.Index(StencilDrawShader).Instance());
         worldHandle.DrawTextureRect(_staticTexture!.Texture, worldBounds);
 
         worldHandle.SetTransform(Matrix3x2.Identity);
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index e71b6e96b8..39b0758bf1 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -9,6 +9,8 @@ namespace Content.Client.Singularity
 {
     public sealed class SingularityOverlay : Overlay, IEntityEventSubscriber
     {
+        private static readonly ProtoId<ShaderPrototype> Shader = "Singularity";
+
         [Dependency] private readonly IEntityManager _entMan = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         private SharedTransformSystem? _xformSystem = null;
@@ -29,7 +31,7 @@ namespace Content.Client.Singularity
         public SingularityOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("Singularity").Instance().Duplicate();
+            _shader = _prototypeManager.Index(Shader).Instance().Duplicate();
             _shader.SetParameter("maxDistance", MaxDistance * EyeManager.PixelsPerMeter);
             _entMan.EventBus.SubscribeEvent<PixelToMapEvent>(EventSource.Local, this, OnProjectFromScreenToMap);
             ZIndex = 101; // Should be drawn after the placement overlay so admins placing items near the singularity can tell where they're going.
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index e9e0846340..b35c3297a1 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -12,6 +12,8 @@ public sealed class EmitterSystem : SharedEmitterSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<EmitterComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
diff --git a/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs b/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs
new file mode 100644
index 0000000000..60d8ea413a
--- /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 0000000000..3960d7ce42
--- /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 0000000000..c69d2e7de2
--- /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 0000000000..73cb0f3925
--- /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 0000000000..c896e7fada
--- /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 0000000000..4068c27e05
--- /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/SprayPainter/SprayPainterSystem.cs b/Content.Client/SprayPainter/SprayPainterSystem.cs
index 6a1d27e98b..8f7d7f0362 100644
--- a/Content.Client/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Client/SprayPainter/SprayPainterSystem.cs
@@ -1,56 +1,129 @@
-using Content.Shared.SprayPainter;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Utility;
 using System.Linq;
-using Robust.Shared.Graphics;
+using Content.Client.Items;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Decals;
+using Content.Shared.SprayPainter;
+using Content.Shared.SprayPainter.Components;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.SprayPainter;
 
+/// <summary>
+/// Client-side spray painter functions. Caches information for spray painter windows and updates the UI to reflect component state.
+/// </summary>
 public sealed class SprayPainterSystem : SharedSprayPainterSystem
 {
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
-    public List<SprayPainterEntry> Entries { get; private set; } = new();
+    public List<SprayPainterDecalEntry> Decals = [];
+    public Dictionary<string, List<string>> PaintableGroupsByCategory = new();
+    public Dictionary<string, Dictionary<string, EntProtoId>> PaintableStylesByGroup = new();
 
-    protected override void CacheStyles()
+    public override void Initialize()
     {
-        base.CacheStyles();
+        base.Initialize();
 
-        Entries.Clear();
-        foreach (var style in Styles)
+        Subs.ItemStatus<SprayPainterComponent>(ent => new StatusControl(ent));
+        SubscribeLocalEvent<SprayPainterComponent, AfterAutoHandleStateEvent>(OnStateUpdate);
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
+        CachePrototypes();
+    }
+
+    private void OnStateUpdate(Entity<SprayPainterComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateUi(ent);
+    }
+
+    protected override void UpdateUi(Entity<SprayPainterComponent> ent)
+    {
+        if (_ui.TryGetOpenUi(ent.Owner, SprayPainterUiKey.Key, out var bui))
+            bui.Update();
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    {
+        if (!args.WasModified<PaintableGroupCategoryPrototype>() || !args.WasModified<PaintableGroupPrototype>() || !args.WasModified<DecalPrototype>())
+            return;
+
+        CachePrototypes();
+    }
+
+    private void CachePrototypes()
+    {
+        PaintableGroupsByCategory.Clear();
+        PaintableStylesByGroup.Clear();
+        foreach (var category in Proto.EnumeratePrototypes<PaintableGroupCategoryPrototype>().OrderBy(x => x.ID))
         {
-            var name = style.Name;
-            string? iconPath = Groups
-              .FindAll(x => x.StylePaths.ContainsKey(name))?
-              .MaxBy(x => x.IconPriority)?.StylePaths[name];
-            if (iconPath == null)
+            var groupList = new List<string>();
+            foreach (var groupId in category.Groups)
             {
-                Entries.Add(new SprayPainterEntry(name, null));
-                continue;
+                if (!Proto.TryIndex(groupId, out var group))
+                    continue;
+
+                groupList.Add(groupId);
+                PaintableStylesByGroup[groupId] = group.Styles;
             }
 
-            RSIResource doorRsi = _resourceCache.GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / new ResPath(iconPath));
-            if (!doorRsi.RSI.TryGetState("closed", out var icon))
-            {
-                Entries.Add(new SprayPainterEntry(name, null));
-                continue;
-            }
+            if (groupList.Count > 0)
+                PaintableGroupsByCategory[category.ID] = groupList;
+        }
 
-            Entries.Add(new SprayPainterEntry(name, icon.Frame0));
+        Decals.Clear();
+        foreach (var decalPrototype in Proto.EnumeratePrototypes<DecalPrototype>().OrderBy(x => x.ID))
+        {
+            if (!decalPrototype.Tags.Contains("station")
+                && !decalPrototype.Tags.Contains("markings")
+                || decalPrototype.Tags.Contains("dirty"))
+                continue;
+
+            Decals.Add(new SprayPainterDecalEntry(decalPrototype.ID, decalPrototype.Sprite));
+        }
+    }
+
+    private sealed class StatusControl : Control
+    {
+        private readonly RichTextLabel _label;
+        private readonly Entity<SprayPainterComponent> _entity;
+        private DecalPaintMode? _lastPaintingDecals = null;
+
+        public StatusControl(Entity<SprayPainterComponent> ent)
+        {
+            _entity = ent;
+            _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+            AddChild(_label);
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            if (_entity.Comp.DecalMode == _lastPaintingDecals)
+                return;
+
+            _lastPaintingDecals = _entity.Comp.DecalMode;
+
+            string modeLocString = _entity.Comp.DecalMode switch
+            {
+                DecalPaintMode.Add => "spray-painter-item-status-add",
+                DecalPaintMode.Remove => "spray-painter-item-status-remove",
+                _ => "spray-painter-item-status-off"
+            };
+
+            _label.SetMarkupPermissive(Robust.Shared.Localization.Loc.GetString("spray-painter-item-status-label",
+                ("mode", Robust.Shared.Localization.Loc.GetString(modeLocString))));
         }
     }
 }
 
-public sealed class SprayPainterEntry
-{
-    public string Name;
-    public Texture? Icon;
-
-    public SprayPainterEntry(string name, Texture? icon)
-    {
-        Name = name;
-        Icon = icon;
-    }
-}
+/// <summary>
+/// A spray paintable decal, mapped by ID.
+/// </summary>
+public sealed record SprayPainterDecalEntry(string Name, SpriteSpecifier Sprite);
diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
index 7d6a6cf2a5..701ec80bac 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
@@ -1,42 +1,96 @@
+using Content.Shared.Decals;
 using Content.Shared.SprayPainter;
 using Content.Shared.SprayPainter.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.SprayPainter.UI;
 
-public sealed class SprayPainterBoundUserInterface : BoundUserInterface
+/// <summary>
+/// A BUI for a spray painter. Allows selecting pipe colours, decals, and paintable object types sorted by category.
+/// </summary>
+public sealed class SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     [ViewVariables]
     private SprayPainterWindow? _window;
 
-    public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
     protected override void Open()
     {
         base.Open();
 
-        _window = this.CreateWindow<SprayPainterWindow>();
-
-        _window.OnSpritePicked = OnSpritePicked;
-        _window.OnColorPicked = OnColorPicked;
-
-        if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp))
+        if (_window == null)
         {
-            _window.Populate(EntMan.System<SprayPainterSystem>().Entries, comp.Index, comp.PickedColor, comp.ColorPalette);
+            _window = this.CreateWindow<SprayPainterWindow>();
+
+            _window.OnSpritePicked += OnSpritePicked;
+            _window.OnSetPipeColor += OnSetPipeColor;
+            _window.OnTabChanged += OnTabChanged;
+            _window.OnDecalChanged += OnDecalChanged;
+            _window.OnDecalColorChanged += OnDecalColorChanged;
+            _window.OnDecalAngleChanged += OnDecalAngleChanged;
+            _window.OnDecalSnapChanged += OnDecalSnapChanged;
         }
+
+        var sprayPainter = EntMan.System<SprayPainterSystem>();
+        _window.PopulateCategories(sprayPainter.PaintableStylesByGroup, sprayPainter.PaintableGroupsByCategory, sprayPainter.Decals);
+        Update();
+
+        if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? sprayPainterComp))
+            _window.SetSelectedTab(sprayPainterComp.SelectedTab);
     }
 
-    private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args)
+    public override void Update()
     {
-        SendMessage(new SprayPainterSpritePickedMessage(args.ItemIndex));
+        if (_window == null)
+            return;
+
+        if (!EntMan.TryGetComponent(Owner, out SprayPainterComponent? sprayPainter))
+            return;
+
+        _window.PopulateColors(sprayPainter.ColorPalette);
+        if (sprayPainter.PickedColor != null)
+            _window.SelectColor(sprayPainter.PickedColor);
+        _window.SetSelectedStyles(sprayPainter.StylesByGroup);
+        _window.SetSelectedDecal(sprayPainter.SelectedDecal);
+        _window.SetDecalAngle(sprayPainter.SelectedDecalAngle);
+        _window.SetDecalColor(sprayPainter.SelectedDecalColor);
+        _window.SetDecalSnap(sprayPainter.SnapDecals);
     }
 
-    private void OnColorPicked(ItemList.ItemListSelectedEventArgs args)
+    private void OnDecalSnapChanged(bool snap)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalSnapMessage(snap));
+    }
+
+    private void OnDecalAngleChanged(int angle)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalAngleMessage(angle));
+    }
+
+    private void OnDecalColorChanged(Color? color)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalColorMessage(color));
+    }
+
+    private void OnDecalChanged(ProtoId<DecalPrototype> protoId)
+    {
+        SendPredictedMessage(new SprayPainterSetDecalMessage(protoId));
+    }
+
+    private void OnTabChanged(int index, bool isSelectedTabWithDecals)
+    {
+        SendPredictedMessage(new SprayPainterTabChangedMessage(index, isSelectedTabWithDecals));
+    }
+
+    private void OnSpritePicked(string group, string style)
+    {
+        SendPredictedMessage(new SprayPainterSetPaintableStyleMessage(group, style));
+    }
+
+    private void OnSetPipeColor(ItemList.ItemListSelectedEventArgs args)
     {
         var key = _window?.IndexToColorKey(args.ItemIndex);
-        SendMessage(new SprayPainterColorPickedMessage(key));
+        SendPredictedMessage(new SprayPainterSetPipeColorMessage(key));
     }
 }
diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
new file mode 100644
index 0000000000..0d5c8e4f16
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml
@@ -0,0 +1,26 @@
+<controls:SprayPainterDecals
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.SprayPainter.UI">
+    <BoxContainer Orientation="Vertical">
+        <Label Text="{Loc 'spray-painter-selected-decals'}" />
+        <ScrollContainer VerticalExpand="True">
+            <GridContainer Columns="7" Name="DecalsGrid">
+                <!-- populated by code -->
+            </GridContainer>
+        </ScrollContainer>
+
+        <BoxContainer Orientation="Vertical">
+            <ColorSelectorSliders Name="ColorSelector" IsAlphaVisible="True" />
+            <CheckBox Name="UseCustomColorCheckBox" Text="{Loc 'spray-painter-use-custom-color'}" />
+            <CheckBox Name="SnapToTileCheckBox" Text="{Loc 'spray-painter-use-snap-to-tile'}" />
+        </BoxContainer>
+
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'spray-painter-angle-rotation'}" />
+            <SpinBox Name="AngleSpinBox" HorizontalExpand="True" />
+            <Button Text="{Loc 'spray-painter-angle-rotation-90-sub'}" Name="SubAngleButton" />
+            <Button Text="{Loc 'spray-painter-angle-rotation-reset'}" Name="SetZeroAngleButton" />
+            <Button Text="{Loc 'spray-painter-angle-rotation-90-add'}" Name="AddAngleButton" />
+        </BoxContainer>
+    </BoxContainer>
+</controls:SprayPainterDecals>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
new file mode 100644
index 0000000000..64d1f78d3c
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs
@@ -0,0 +1,174 @@
+using System.Numerics;
+using Content.Client.Stylesheets;
+using Content.Shared.Decals;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SprayPainter.UI;
+
+/// <summary>
+/// Used to control decal painting parameters for the spray painter.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class SprayPainterDecals : Control
+{
+    public Action<ProtoId<DecalPrototype>>? OnDecalSelected;
+    public Action<Color?>? OnColorChanged;
+    public Action<int>? OnAngleChanged;
+    public Action<bool>? OnSnapChanged;
+
+    private SpriteSystem? _sprite;
+    private string _selectedDecal = string.Empty;
+    private List<SprayPainterDecalEntry> _decals = [];
+
+    public SprayPainterDecals()
+    {
+        RobustXamlLoader.Load(this);
+
+        AddAngleButton.OnButtonUp += _ => AngleSpinBox.Value += 90;
+        SubAngleButton.OnButtonUp += _ => AngleSpinBox.Value -= 90;
+        SetZeroAngleButton.OnButtonUp += _ => AngleSpinBox.Value = 0;
+        AngleSpinBox.ValueChanged += args => OnAngleChanged?.Invoke(args.Value);
+
+        UseCustomColorCheckBox.OnPressed += UseCustomColorCheckBoxOnOnPressed;
+        SnapToTileCheckBox.OnPressed += SnapToTileCheckBoxOnOnPressed;
+        ColorSelector.OnColorChanged += OnColorSelected;
+    }
+
+    private void UseCustomColorCheckBoxOnOnPressed(BaseButton.ButtonEventArgs _)
+    {
+        OnColorChanged?.Invoke(UseCustomColorCheckBox.Pressed ? ColorSelector.Color : null);
+        UpdateColorButtons(UseCustomColorCheckBox.Pressed);
+    }
+
+    private void SnapToTileCheckBoxOnOnPressed(BaseButton.ButtonEventArgs _)
+    {
+        OnSnapChanged?.Invoke(SnapToTileCheckBox.Pressed);
+    }
+
+    /// <summary>
+    /// Updates the decal list.
+    /// </summary>
+    public void PopulateDecals(List<SprayPainterDecalEntry> decals, SpriteSystem sprite)
+    {
+        _sprite ??= sprite;
+
+        _decals = decals;
+        DecalsGrid.Children.Clear();
+
+        foreach (var decal in decals)
+        {
+            var button = new TextureButton()
+            {
+                TextureNormal = sprite.Frame0(decal.Sprite),
+                Name = decal.Name,
+                ToolTip = decal.Name,
+                Scale = new Vector2(2, 2),
+            };
+            button.OnPressed += DecalButtonOnPressed;
+
+            if (UseCustomColorCheckBox.Pressed)
+            {
+                button.Modulate = ColorSelector.Color;
+            }
+
+            if (_selectedDecal == decal.Name)
+            {
+                var panelContainer = new PanelContainer()
+                {
+                    PanelOverride = new StyleBoxFlat()
+                    {
+                        BackgroundColor = StyleNano.ButtonColorDefault,
+                    },
+                    Children =
+                    {
+                        button,
+                    },
+                };
+                DecalsGrid.AddChild(panelContainer);
+            }
+            else
+            {
+                DecalsGrid.AddChild(button);
+            }
+        }
+    }
+
+    private void OnColorSelected(Color color)
+    {
+        if (!UseCustomColorCheckBox.Pressed)
+            return;
+
+        OnColorChanged?.Invoke(color);
+
+        UpdateColorButtons(UseCustomColorCheckBox.Pressed);
+    }
+
+    private void UpdateColorButtons(bool apply)
+    {
+        Color modulateColor = apply ? ColorSelector.Color : Color.White;
+        foreach (var button in DecalsGrid.Children)
+        {
+            switch (button)
+            {
+                case TextureButton:
+                    button.Modulate = modulateColor;
+                    break;
+                case PanelContainer panelContainer:
+                    {
+                        foreach (TextureButton textureButton in panelContainer.Children)
+                            textureButton.Modulate = modulateColor;
+
+                        break;
+                    }
+            }
+        }
+    }
+
+    private void DecalButtonOnPressed(BaseButton.ButtonEventArgs obj)
+    {
+        if (obj.Button.Name is not { } name)
+            return;
+
+        _selectedDecal = name;
+        OnDecalSelected?.Invoke(_selectedDecal);
+
+        if (_sprite is null)
+            return;
+
+        PopulateDecals(_decals, _sprite);
+    }
+
+    public void SetSelectedDecal(string name)
+    {
+        _selectedDecal = name;
+
+        if (_sprite is null)
+            return;
+
+        PopulateDecals(_decals, _sprite);
+    }
+
+    public void SetAngle(int degrees)
+    {
+        AngleSpinBox.OverrideValue(degrees);
+    }
+
+    public void SetColor(Color? color)
+    {
+        UseCustomColorCheckBox.Pressed = color != null;
+        if (color != null)
+            ColorSelector.Color = color.Value;
+        UpdateColorButtons(UseCustomColorCheckBox.Pressed);
+    }
+
+    public void SetSnap(bool snap)
+    {
+        SnapToTileCheckBox.Pressed = snap;
+    }
+}
diff --git a/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml
new file mode 100644
index 0000000000..aeb0d07158
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml
@@ -0,0 +1,12 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Orientation="Vertical">
+    <Label Text="{Loc 'spray-painter-selected-style'}" />
+    <controls:ListContainer
+        Name="StyleList"
+        Toggle="True"
+        Group="True">
+        <!-- populated by code -->
+    </controls:ListContainer>
+</BoxContainer>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml.cs
new file mode 100644
index 0000000000..fe2f5a87af
--- /dev/null
+++ b/Content.Client/SprayPainter/UI/SprayPainterGroup.xaml.cs
@@ -0,0 +1,66 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.SprayPainter.UI;
+
+/// <summary>
+/// Used to display a group of paintable styles in the spray painter menu.
+/// (e.g. each type of paintable locker or plastic crate)
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class SprayPainterGroup : BoxContainer
+{
+    public event Action<SpriteListData>? OnButtonPressed;
+
+    public SprayPainterGroup()
+    {
+        RobustXamlLoader.Load(this);
+
+        StyleList.GenerateItem = GenerateItems;
+    }
+
+    public void PopulateList(List<SpriteListData> spriteList)
+    {
+        StyleList.PopulateList(spriteList);
+    }
+
+    public void SelectItemByStyle(string key)
+    {
+        foreach (var elem in StyleList.Data)
+        {
+            if (elem is not SpriteListData spriteElem)
+                continue;
+
+            if (spriteElem.Style == key)
+            {
+                StyleList.Select(spriteElem);
+                break;
+            }
+        }
+    }
+
+    private void GenerateItems(ListData data, ListContainerButton button)
+    {
+        if (data is not SpriteListData spriteListData)
+            return;
+
+        var box = new BoxContainer() { Orientation = LayoutOrientation.Horizontal };
+        var protoView = new EntityPrototypeView();
+        protoView.SetPrototype(spriteListData.Prototype);
+        var label = new Label()
+        {
+            Text = Loc.GetString($"spray-painter-style-{spriteListData.Group.ToLower()}-{spriteListData.Style.ToLower()}")
+        };
+
+        box.AddChild(protoView);
+        box.AddChild(label);
+        button.AddChild(box);
+        button.AddStyleClass(ListContainer.StyleClassListContainerButton);
+        button.OnPressed += _ => OnButtonPressed?.Invoke(spriteListData);
+
+        if (spriteListData.SelectedIndex == button.Index)
+            button.Pressed = true;
+    }
+}
diff --git a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml
index 13e500c46c..46facb5d32 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml
+++ b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml
@@ -1,34 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-               MinSize="500 300"
-               SetSize="500 500"
-               Title="{Loc 'spray-painter-window-title'}">
-    <BoxContainer Orientation="Horizontal"
-                  HorizontalExpand="True"
-                  VerticalExpand="True"
-                  SeparationOverride="4"
-                  MinWidth="450">
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True"
-                      VerticalExpand="True"
-                      SeparationOverride="4"
-                      MinWidth="200">
-            <Label Name="SelectedSpriteLabel"
-                   Text="{Loc 'spray-painter-selected-style'}">
-            </Label>
-            <ItemList Name="SpriteList"
-                      SizeFlagsStretchRatio="8"
-                      VerticalExpand="True"/>
-        </BoxContainer>
-        <BoxContainer Orientation="Vertical"
-                      HorizontalExpand="True"
-                      VerticalExpand="True"
-                      SeparationOverride="4"
-                      MinWidth="200">
-            <Label Name="SelectedColorLabel"
-                   Text="{Loc 'spray-painter-selected-color'}"/>
-            <ItemList Name="ColorList"
-                      SizeFlagsStretchRatio="8"
-                      VerticalExpand="True"/>
-        </BoxContainer>
-    </BoxContainer>
+       MinSize="520 300"
+       SetSize="520 700"
+       Title="{Loc 'spray-painter-window-title'}">
+       <TabContainer Name="Tabs"/>
 </DefaultWindow>
diff --git a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs
index 4e7bdd8973..eb1218ad67 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs
@@ -1,12 +1,19 @@
+using System.Linq;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.SprayPainter.UI;
 
+/// <summary>
+/// A window to select spray painter settings by object type, as well as pipe colours and decals.
+/// </summary>
 [GenerateTypedNameReferences]
 public sealed partial class SprayPainterWindow : DefaultWindow
 {
@@ -15,13 +22,33 @@ public sealed partial class SprayPainterWindow : DefaultWindow
 
     private readonly SpriteSystem _spriteSystem;
 
-    public Action<ItemList.ItemListSelectedEventArgs>? OnSpritePicked;
-    public Action<ItemList.ItemListSelectedEventArgs>? OnColorPicked;
+    // Events
+    public event Action<string, string>? OnSpritePicked;
+    public event Action<int, bool>? OnTabChanged;
+    public event Action<ProtoId<DecalPrototype>>? OnDecalChanged;
+    public event Action<ItemList.ItemListSelectedEventArgs>? OnSetPipeColor;
+    public event Action<Color?>? OnDecalColorChanged;
+    public event Action<int>? OnDecalAngleChanged;
+    public event Action<bool>? OnDecalSnapChanged;
+
+    // Pipe color data
+    private ItemList _colorList = default!;
     public Dictionary<string, int> ItemColorIndex = new();
 
-    private Dictionary<string, Color> currentPalette = new();
-    private const string colorLocKeyPrefix = "pipe-painter-color-";
-    private List<SprayPainterEntry> CurrentEntries = new List<SprayPainterEntry>();
+    private Dictionary<string, Color> _currentPalette = new();
+    private const string ColorLocKeyPrefix = "pipe-painter-color-";
+
+    // Paintable objects
+    private Dictionary<string, Dictionary<string, EntProtoId>> _currentStylesByGroup = new();
+    private Dictionary<string, List<string>> _currentGroupsByCategory = new();
+
+    // Tab controls
+    private Dictionary<string, SprayPainterGroup> _paintableControls = new();
+    private BoxContainer? _pipeControl;
+
+    // Decals
+    private List<SprayPainterDecalEntry> _currentDecals = [];
+    private SprayPainterDecals? _sprayPainterDecals;
 
     private readonly SpriteSpecifier _colorEntryIconTexture = new SpriteSpecifier.Rsi(
         new ResPath("Structures/Piping/Atmospherics/pipe.rsi"),
@@ -32,13 +59,14 @@ public sealed partial class SprayPainterWindow : DefaultWindow
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
         _spriteSystem = _sysMan.GetEntitySystem<SpriteSystem>();
+        Tabs.OnTabChanged += (index) => OnTabChanged?.Invoke(index, _sprayPainterDecals?.GetPositionInParent() == index);
     }
 
     private string GetColorLocString(string? colorKey)
     {
         if (string.IsNullOrEmpty(colorKey))
             return Loc.GetString("pipe-painter-no-color-selected");
-        var locKey = colorLocKeyPrefix + colorKey;
+        var locKey = ColorLocKeyPrefix + colorKey;
 
         if (!_loc.TryGetString(locKey, out var locString))
             locString = colorKey;
@@ -48,51 +76,229 @@ public sealed partial class SprayPainterWindow : DefaultWindow
 
     public string? IndexToColorKey(int index)
     {
-        return (string?) ColorList[index].Metadata;
+        return _colorList[index].Text;
     }
 
-    public void Populate(List<SprayPainterEntry> entries, int selectedStyle, string? selectedColorKey, Dictionary<string, Color> palette)
+    private void OnStyleSelected(ListData data)
     {
-        // Only clear if the entries change. Otherwise the list would "jump" after selecting an item
-        if (!CurrentEntries.Equals(entries))
+        if (data is SpriteListData listData)
+            OnSpritePicked?.Invoke(listData.Group, listData.Style);
+    }
+
+    /// <summary>
+    /// Wrapper to allow for selecting/deselecting the event to avoid loops
+    /// </summary>
+    private void OnColorPicked(ItemList.ItemListSelectedEventArgs args)
+    {
+        OnSetPipeColor?.Invoke(args);
+    }
+
+    /// <summary>
+    /// Setup function for the window.
+    /// </summary>
+    /// <param name="stylesByGroup">Each group, mapped by name to the set of named styles by their associated entity prototype.</param>
+    /// <param name="groupsByCategory">The set of categories and the groups associated with them.</param>
+    /// <param name="decals">A list of each decal.</param>
+    public void PopulateCategories(Dictionary<string, Dictionary<string, EntProtoId>> stylesByGroup, Dictionary<string, List<string>> groupsByCategory, List<SprayPainterDecalEntry> decals)
+    {
+        bool tabsCleared = false;
+        var lastTab = Tabs.CurrentTab;
+
+        if (!_currentGroupsByCategory.Equals(groupsByCategory))
         {
-            CurrentEntries = entries;
-            SpriteList.Clear();
-            foreach (var entry in entries)
+            // Destroy all existing tabs
+            tabsCleared = true;
+            _paintableControls.Clear();
+            _pipeControl = null;
+            _sprayPainterDecals = null;
+            Tabs.RemoveAllChildren();
+        }
+
+        // Only clear if the entries change. Otherwise the list would "jump" after selecting an item
+        if (tabsCleared || !_currentStylesByGroup.Equals(stylesByGroup))
+        {
+            _currentStylesByGroup = stylesByGroup;
+
+            var tabIndex = 0;
+            foreach (var (categoryName, categoryGroups) in groupsByCategory.OrderBy(c => c.Key))
             {
-                SpriteList.AddItem(entry.Name, entry.Icon);
+                if (categoryGroups.Count <= 0)
+                    continue;
+
+                // Repopulating controls:
+                //      ensure that categories with multiple groups have separate subtabs
+                //      but single-group categories do not.
+                if (tabsCleared)
+                {
+                    TabContainer? subTabs = null;
+                    if (categoryGroups.Count > 1)
+                        subTabs = new();
+
+                    foreach (var group in categoryGroups)
+                    {
+                        if (!stylesByGroup.TryGetValue(group, out var styles))
+                            continue;
+
+                        var groupControl = new SprayPainterGroup();
+                        groupControl.OnButtonPressed += OnStyleSelected;
+                        _paintableControls[group] = groupControl;
+                        if (categoryGroups.Count > 1)
+                        {
+                            if (subTabs != null)
+                            {
+                                subTabs?.AddChild(groupControl);
+                                var subTabLocalization = Loc.GetString("spray-painter-tab-group-" + group.ToLower());
+                                TabContainer.SetTabTitle(groupControl, subTabLocalization);
+                            }
+                        }
+                        else
+                        {
+                            Tabs.AddChild(groupControl);
+                        }
+                    }
+
+                    if (subTabs != null)
+                        Tabs.AddChild(subTabs);
+
+                    var tabLocalization = Loc.GetString("spray-painter-tab-category-" + categoryName.ToLower());
+                    Tabs.SetTabTitle(tabIndex, tabLocalization);
+                    tabIndex++;
+                }
+
+                // Finally, populate all groups with new data.
+                foreach (var group in categoryGroups)
+                {
+                    if (!stylesByGroup.TryGetValue(group, out var styles) ||
+                        !_paintableControls.TryGetValue(group, out var control))
+                        continue;
+
+                    var dataList = styles
+                        .Select(e => new SpriteListData(group, e.Key, e.Value, 0))
+                        .OrderBy(d => Loc.GetString($"spray-painter-style-{group.ToLower()}-{d.Style.ToLower()}"))
+                        .ToList();
+                    control.PopulateList(dataList);
+                }
             }
         }
 
-        if (!currentPalette.Equals(palette))
-        {
-            currentPalette = palette;
-            ItemColorIndex.Clear();
-            ColorList.Clear();
+        PopulateColors(_currentPalette);
 
+        if (!_currentDecals.Equals(decals))
+        {
+            _currentDecals = decals;
+
+            if (_sprayPainterDecals is null)
+            {
+                _sprayPainterDecals = new SprayPainterDecals();
+
+                _sprayPainterDecals.OnDecalSelected += id => OnDecalChanged?.Invoke(id);
+                _sprayPainterDecals.OnColorChanged += color => OnDecalColorChanged?.Invoke(color);
+                _sprayPainterDecals.OnAngleChanged += angle => OnDecalAngleChanged?.Invoke(angle);
+                _sprayPainterDecals.OnSnapChanged += snap => OnDecalSnapChanged?.Invoke(snap);
+
+                Tabs.AddChild(_sprayPainterDecals);
+                TabContainer.SetTabTitle(_sprayPainterDecals, Loc.GetString("spray-painter-tab-category-decals"));
+            }
+
+            _sprayPainterDecals.PopulateDecals(decals, _spriteSystem);
+        }
+
+        if (tabsCleared)
+            SetSelectedTab(lastTab);
+    }
+
+    public void PopulateColors(Dictionary<string, Color> palette)
+    {
+        // Create pipe tab controls if they don't exist
+        bool tabCreated = false;
+        if (_pipeControl == null)
+        {
+            _pipeControl = new BoxContainer() { Orientation = BoxContainer.LayoutOrientation.Vertical };
+
+            var label = new Label() { Text = Loc.GetString("spray-painter-selected-color") };
+
+            _colorList = new ItemList() { VerticalExpand = true };
+            _colorList.OnItemSelected += OnColorPicked;
+
+            _pipeControl.AddChild(label);
+            _pipeControl.AddChild(_colorList);
+
+            Tabs.AddChild(_pipeControl);
+            TabContainer.SetTabTitle(_pipeControl, Loc.GetString("spray-painter-tab-category-pipes"));
+            tabCreated = true;
+        }
+
+        // Populate the tab if needed (new tab/new data)
+        if (tabCreated || !_currentPalette.Equals(palette))
+        {
+            _currentPalette = palette;
+            ItemColorIndex.Clear();
+            _colorList.Clear();
+
+            int index = 0;
             foreach (var color in palette)
             {
                 var locString = GetColorLocString(color.Key);
-                var item = ColorList.AddItem(locString, _spriteSystem.Frame0(_colorEntryIconTexture));
+                var item = _colorList.AddItem(locString, _spriteSystem.Frame0(_colorEntryIconTexture), metadata: color.Key);
                 item.IconModulate = color.Value;
-                item.Metadata = color.Key;
 
-                ItemColorIndex.Add(color.Key, ColorList.IndexOf(item));
+                ItemColorIndex.Add(color.Key, index);
+                index++;
             }
         }
-
-        // Disable event so we don't send a new event for pre-selectedStyle entry and end up in a loop
-
-        if (selectedColorKey != null)
-        {
-            var index = ItemColorIndex[selectedColorKey];
-            ColorList.OnItemSelected -= OnColorPicked;
-            ColorList[index].Selected = true;
-            ColorList.OnItemSelected += OnColorPicked;
-        }
-
-        SpriteList.OnItemSelected -= OnSpritePicked;
-        SpriteList[selectedStyle].Selected = true;
-        SpriteList.OnItemSelected += OnSpritePicked;
     }
+
+    # region Setters
+    public void SetSelectedStyles(Dictionary<string, string> selectedStyles)
+    {
+        foreach (var (group, style) in selectedStyles)
+        {
+            if (!_paintableControls.TryGetValue(group, out var control))
+                continue;
+
+            control.SelectItemByStyle(style);
+        }
+    }
+
+    public void SelectColor(string color)
+    {
+        if (_colorList != null && ItemColorIndex.TryGetValue(color, out var colorIdx))
+        {
+            _colorList.OnItemSelected -= OnColorPicked;
+            _colorList[colorIdx].Selected = true;
+            _colorList.OnItemSelected += OnColorPicked;
+        }
+    }
+
+    public void SetSelectedTab(int tab)
+    {
+        Tabs.CurrentTab = int.Min(tab, Tabs.ChildCount - 1);
+    }
+
+    public void SetSelectedDecal(string decal)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetSelectedDecal(decal);
+    }
+
+    public void SetDecalAngle(int angle)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetAngle(angle);
+    }
+
+    public void SetDecalColor(Color? color)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetColor(color);
+    }
+
+    public void SetDecalSnap(bool snap)
+    {
+        if (_sprayPainterDecals != null)
+            _sprayPainterDecals.SetSnap(snap);
+    }
+    # endregion
 }
+
+public record SpriteListData(string Group, string Style, EntProtoId Prototype, int SelectedIndex) : ListData;
diff --git a/Content.Client/Sprite/ScaleVisualsSystem.cs b/Content.Client/Sprite/ScaleVisualsSystem.cs
new file mode 100644
index 0000000000..06d25e0a1d
--- /dev/null
+++ b/Content.Client/Sprite/ScaleVisualsSystem.cs
@@ -0,0 +1,38 @@
+using System.Numerics;
+using Content.Shared.Sprite;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Sprite;
+
+public sealed class ScaleVisualsSystem : SharedScaleVisualsSystem
+{
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScaleVisualsComponent, AppearanceChangeEvent>(OnChangeData);
+    }
+
+    private void OnChangeData(Entity<ScaleVisualsComponent> ent, ref AppearanceChangeEvent args)
+    {
+        if (!args.AppearanceData.TryGetValue(ScaleVisuals.Scale, out var scale) ||
+            args.Sprite == null) return;
+
+        // save the original scale
+        ent.Comp.OriginalScale ??= args.Sprite.Scale;
+
+        var vecScale = (Vector2)scale;
+        _sprite.SetScale((ent.Owner, args.Sprite), vecScale);
+    }
+
+    // revert to the original scale
+    protected override void ResetScale(Entity<ScaleVisualsComponent> ent)
+    {
+        base.ResetScale(ent);
+
+        if (ent.Comp.OriginalScale != null)
+            _sprite.SetScale(ent.Owner, ent.Comp.OriginalScale.Value);
+    }
+}
diff --git a/Content.Client/Station/StationSystem.cs b/Content.Client/Station/StationSystem.cs
index 5a4a1853d2..e1ccd14d7b 100644
--- a/Content.Client/Station/StationSystem.cs
+++ b/Content.Client/Station/StationSystem.cs
@@ -2,34 +2,5 @@
 
 namespace Content.Client.Station;
 
-/// <summary>
-/// This handles letting the client know stations are a thing. Only really used by an admin menu.
-/// </summary>
-public sealed partial class StationSystem : SharedStationSystem
-{
-    private readonly List<(string Name, NetEntity Entity)> _stations = new();
-
-    /// <summary>
-    /// All stations that currently exist.
-    /// </summary>
-    /// <remarks>
-    /// I'd have this just invoke an entity query, but we're on the client and the client barely knows about stations.
-    /// </remarks>
-    // TODO: Stations have a global PVS override now, this can probably be changed into a query.
-    public IReadOnlyList<(string Name, NetEntity Entity)> Stations => _stations;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeNetworkEvent<StationsUpdatedEvent>(StationsUpdated);
-    }
-
-    private void StationsUpdated(StationsUpdatedEvent ev)
-    {
-        _stations.Clear();
-        // TODO this needs to be done in component states and with the Ensure() methods
-        _stations.AddRange(ev.Stations);
-    }
-}
+/// <inheritdoc/>
+public sealed partial class StationSystem : SharedStationSystem;
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index aff450e657..4d3be5439c 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -11,6 +11,8 @@ namespace Content.Client.StatusIcon;
 
 public sealed class StatusIconOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -29,7 +31,7 @@ public sealed class StatusIconOverlay : Overlay
         _sprite = _entity.System<SpriteSystem>();
         _transform = _entity.System<TransformSystem>();
         _statusIcon = _entity.System<StatusIconSystem>();
-        _unshadedShader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
+        _unshadedShader = _prototype.Index(UnshadedShader).Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs
index 9976547428..095624898c 100644
--- a/Content.Client/Stealth/StealthSystem.cs
+++ b/Content.Client/Stealth/StealthSystem.cs
@@ -10,6 +10,9 @@ namespace Content.Client.Stealth;
 
 public sealed class StealthSystem : SharedStealthSystem
 {
+    private static readonly ProtoId<ShaderPrototype> Shader = "Stealth";
+    private static readonly ProtoId<ShaderPrototype> NoMirageShader = "NoMirageStealth";
+
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
@@ -21,8 +24,8 @@ public sealed class StealthSystem : SharedStealthSystem
     {
         base.Initialize();
 
-        _shader = _protoMan.Index<ShaderPrototype>("Stealth").InstanceUnique();
-        _noMirageShader = _protoMan.Index<ShaderPrototype>("NoMirageStealth").InstanceUnique(); // Sunrise-Edit
+        _shader = _protoMan.Index(Shader).InstanceUnique();
+        _noMirageShader = _protoMan.Index(NoMirageShader).InstanceUnique(); // Sunrise-Edit
 
         SubscribeLocalEvent<StealthComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StealthComponent, ComponentStartup>(OnStartup);
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index bd6659de01..1a21de4b99 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -40,6 +40,11 @@ public sealed class StorageSystem : SharedStorageSystem
         component.MaxItemSize = state.MaxItemSize;
         component.Whitelist = state.Whitelist;
         component.Blacklist = state.Blacklist;
+        component.StorageInsertSound = state.StorageInsertSound;
+        component.StorageRemoveSound = state.StorageRemoveSound;
+        component.StorageOpenSound = state.StorageOpenSound;
+        component.StorageCloseSound = state.StorageCloseSound;
+        component.DefaultStorageOrientation = state.DefaultStorageOrientation;
 
         _oldStoredItems.Clear();
 
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
index e6e53ae87a..c10a24ac32 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
@@ -1,10 +1,15 @@
+using Content.Shared.SprayPainter.Prototypes;
 using Content.Shared.Storage;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Storage.Visualizers;
 
 public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStorageVisualsComponent>
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -26,12 +31,34 @@ public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStora
         SpriteSystem.LayerSetRsiState((uid, sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
     }
 
-    protected override void OnAppearanceChange(EntityUid uid, EntityStorageVisualsComponent comp, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(EntityUid uid,
+        EntityStorageVisualsComponent comp,
+        ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null
-        || !AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
+            || !AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
             return;
 
+        var forceRedrawBase = false;
+        if (AppearanceSystem.TryGetData<string>(uid, PaintableVisuals.Prototype, out var prototype, args.Component))
+        {
+            if (_prototypeManager.TryIndex(prototype, out var proto))
+            {
+                if (proto.TryGetComponent(out SpriteComponent? sprite, _componentFactory))
+                {
+                    SpriteSystem.SetBaseRsi((uid, args.Sprite), sprite.BaseRSI);
+                }
+                if (proto.TryGetComponent(out EntityStorageVisualsComponent? visuals, _componentFactory))
+                {
+                    comp.StateBaseOpen = visuals.StateBaseOpen;
+                    comp.StateBaseClosed = visuals.StateBaseClosed;
+                    comp.StateDoorOpen = visuals.StateDoorOpen;
+                    comp.StateDoorClosed = visuals.StateDoorClosed;
+                    forceRedrawBase = true;
+                }
+            }
+        }
+
         // Open/Closed state for the storage entity.
         if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), StorageVisualLayers.Door, out _, false))
         {
@@ -52,6 +79,8 @@ public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStora
 
                 if (comp.StateBaseOpen != null)
                     SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
+                else if (forceRedrawBase && comp.StateBaseClosed != null)
+                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
             }
             else
             {
@@ -68,6 +97,8 @@ public sealed class EntityStorageVisualizerSystem : VisualizerSystem<EntityStora
 
                 if (comp.StateBaseClosed != null)
                     SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
+                else if (forceRedrawBase && comp.StateBaseOpen != null)
+                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
             }
         }
     }
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml
index 3142f1cb06..b779672726 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml
@@ -1,24 +1,28 @@
 <Control xmlns="https://spacestation14.io">
-    <BoxContainer Margin="8,8,8,8" Orientation="Vertical">
+    <BoxContainer Margin="8,0,8,8" Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Name="StoreItemName" HorizontalExpand="True" />
-            <Label Name="DiscountSubText"
-                   HorizontalAlignment="Right"/>
-            <Button
-                Name="StoreItemBuyButton"
-                MinWidth="64"
-                HorizontalAlignment="Right"
-                Access="Public" />
         </BoxContainer>
-        <PanelContainer StyleClasses="HighDivider" />
+        <PanelContainer StyleClasses="HighDivider" Margin="0,1,0,2"/>
         <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-            <TextureRect
-                Name="StoreItemTexture"
-                Margin="0,0,4,0"
-                MinSize="48 48"
-                Stretch="KeepAspectCentered" />
-            <Control MinWidth="5"/>
-            <RichTextLabel Name="StoreItemDescription" />
+            <BoxContainer Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,4,0">
+                <TextureRect
+                    Name="StoreItemTexture"
+                    Margin="0,0,4,0"
+                    MinSize="48 48"
+                    Stretch="KeepAspectCentered" />
+                <Button
+                    Name="StoreItemBuyButton"
+                    MinWidth="48"
+                    MaxHeight="48"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Margin="0,4,0,0"
+                    Access="Public" />
+                <Label Name="DiscountSubText"
+                       HorizontalAlignment="Center"/>
+            </BoxContainer>
+            <RichTextLabel Name="StoreItemDescription" VerticalAlignment="Top"/>
         </BoxContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml b/Content.Client/Store/Ui/StoreMenu.xaml
index 843c9dc029..1ee86a5a68 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml
+++ b/Content.Client/Store/Ui/StoreMenu.xaml
@@ -21,7 +21,7 @@
                     Name="RefundButton"
                     MinWidth="64"
                     HorizontalAlignment="Right"
-                    Text="Refund" />
+                    Text="{Loc 'store-ui-refund-text'}" />
             </BoxContainer>
             <LineEdit Name="SearchBar" Margin="4" PlaceHolder="Search" HorizontalExpand="True"/>
                 <PanelContainer VerticalExpand="True">
diff --git a/Content.Client/Stunnable/StunSystem.cs b/Content.Client/Stunnable/StunSystem.cs
index e519a0d5f0..6947b80664 100644
--- a/Content.Client/Stunnable/StunSystem.cs
+++ b/Content.Client/Stunnable/StunSystem.cs
@@ -1,9 +1,182 @@
+using System.Numerics;
+using Content.Shared.CombatMode;
+using Content.Shared.Interaction;
 using Content.Shared.Stunnable;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Random;
 
-namespace Content.Client.Stunnable
+namespace Content.Client.Stunnable;
+
+public sealed class StunSystem : SharedStunSystem
 {
-    public sealed class StunSystem : SharedStunSystem
-    {
+    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SpriteSystem _spriteSystem = default!;
 
+    private readonly int[] _sign = [-1, 1];
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StunVisualsComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<StunVisualsComponent, AppearanceChangeEvent>(OnAppearanceChanged);
+
+        CommandBinds.Builder
+            .BindAfter(EngineKeyFunctions.UseSecondary, new PointerInputCmdHandler(OnUseSecondary, true, true), typeof(SharedInteractionSystem))
+            .Register<StunSystem>();
+    }
+
+    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>
+    ///     Add stun visual layers
+    /// </summary>
+    private void OnComponentInit(Entity<StunVisualsComponent> entity, ref ComponentInit args)
+    {
+        if (!TryComp<SpriteComponent>(entity, out var sprite))
+            return;
+
+        var spriteEntity = (entity.Owner, sprite);
+
+        _spriteSystem.LayerMapReserve(spriteEntity, StunVisualLayers.StamCrit);
+        _spriteSystem.LayerSetVisible(spriteEntity, StunVisualLayers.StamCrit, false);
+        _spriteSystem.LayerSetOffset(spriteEntity, StunVisualLayers.StamCrit, new Vector2(0, 0.3125f));
+
+        _spriteSystem.LayerSetRsi(spriteEntity, StunVisualLayers.StamCrit, entity.Comp.StarsPath);
+
+        UpdateAppearance((entity, sprite), entity.Comp.State);
+    }
+
+    private void OnAppearanceChanged(Entity<StunVisualsComponent> entity, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite != null)
+            UpdateAppearance((entity, args.Sprite), entity.Comp.State);
+    }
+
+    private void UpdateAppearance(Entity<SpriteComponent?> entity, string state)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        if (!_spriteSystem.LayerMapTryGet((entity, entity.Comp), StunVisualLayers.StamCrit, out var index, false))
+            return;
+
+        var visible = Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars) && stars;
+
+        _spriteSystem.LayerSetVisible((entity, entity.Comp), index, visible);
+        _spriteSystem.LayerSetRsiState((entity, entity.Comp), index, state);
+    }
+
+    /// <summary>
+    /// A simple fatigue animation, a mild modification of the jittering animation. The animation constructor is
+    /// quite complex, but that's because the AnimationSystem doesn't have proper adjustment layers. In a potential
+    /// future where proper adjustment layers are added feel free to clean this up to be an animation with two adjustment
+    /// layers rather than one mega layer.
+    /// </summary>
+    /// <param name="sprite">The spriteComponent we're adjusting the offset of</param>
+    /// <param name="frequency">How many times per second does the animation run?</param>
+    /// <param name="jitters">How many times should we jitter during the animation? Also determines breathing frequency</param>
+    /// <param name="minJitter">Mininum jitter offset multiplier for X and Y directions</param>
+    /// <param name="maxJitter">Maximum jitter offset multiplier for X and Y directions</param>
+    /// <param name="breathing">Maximum breathing offset, this is in the Y direction</param>
+    /// <param name="startOffset">Starting offset because we don't have adjustment layers</param>
+    /// <param name="lastJitter">Last jitter so we don't jitter to the same quadrant</param>
+    /// <returns></returns>
+    public Animation GetFatigueAnimation(SpriteComponent sprite,
+        float frequency,
+        int jitters,
+        Vector2 minJitter,
+        Vector2 maxJitter,
+        float breathing,
+        Vector2 startOffset,
+        ref Vector2 lastJitter)
+    {
+        // avoid animations with negative length or infinite length
+        if (frequency <= 0)
+            return new Animation();
+
+        var breaths = new Vector2(0, breathing * 2) / jitters;
+
+        var length =  1 / frequency;
+        var frames = length / jitters;
+
+        var keyFrames = new List<AnimationTrackProperty.KeyFrame> { new(sprite.Offset, 0f) };
+
+        // Spits out a list of keyframes to feed to the AnimationPlayer based on the variables we've inputted
+        for (var i = 1; i <= jitters; i++)
+        {
+            var offset = new Vector2(_random.NextFloat(minJitter.X, maxJitter.X),
+                _random.NextFloat(minJitter.Y, maxJitter.Y));
+            offset.X *= _random.Pick(_sign);
+            offset.Y *= _random.Pick(_sign);
+
+            if (i == 1 && Math.Sign(offset.X) == Math.Sign(lastJitter.X)
+                       && Math.Sign(offset.Y) == Math.Sign(lastJitter.Y))
+            {
+                // If the sign is the same as last time on both axis we flip one randomly
+                // to avoid jitter staying in one quadrant too much.
+                if (_random.Prob(0.5f))
+                    offset.X *= -1;
+                else
+                    offset.Y *= -1;
+            }
+
+            lastJitter = offset;
+
+            // For the first half of the jitter, we vertically displace the sprite upwards to simulate breathing in
+            if (i <= jitters / 2)
+            {
+                keyFrames.Add(new AnimationTrackProperty.KeyFrame(startOffset + breaths * i + offset, frames));
+            }
+            // For the next quarter we displace the sprite down, to about 12.5% breathing offset below our starting position
+            // Simulates breathing out
+            else if (i < jitters * 3 / 4)
+            {
+                keyFrames.Add(
+                    new AnimationTrackProperty.KeyFrame(startOffset + breaths * ( jitters - i * 1.5f ) + offset, frames));
+            }
+            // Return to our starting position for breathing, jitter reaches its final position
+            else
+            {
+                keyFrames.Add(
+                    new AnimationTrackProperty.KeyFrame(startOffset + breaths * ( i - jitters ) + offset, frames));
+            }
+        }
+
+        return new Animation
+        {
+            Length = TimeSpan.FromSeconds(length),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    // Heavy Breathing
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
+                    InterpolationMode = AnimationInterpolationMode.Cubic,
+                    KeyFrames = keyFrames,
+                },
+            }
+        };
     }
 }
+
+public enum StunVisualLayers : byte
+{
+    StamCrit,
+}
diff --git a/Content.Client/SubFloor/TrayScannerSystem.cs b/Content.Client/SubFloor/TrayScannerSystem.cs
index 194453ab75..4c67890f6a 100644
--- a/Content.Client/SubFloor/TrayScannerSystem.cs
+++ b/Content.Client/SubFloor/TrayScannerSystem.cs
@@ -68,11 +68,15 @@ public sealed class TrayScannerSystem : SharedTrayScannerSystem
 
         foreach (var hand in _hands.EnumerateHands(player.Value))
         {
-            if (!scannerQuery.TryGetComponent(hand.HeldEntity, out var heldScanner) || !heldScanner.Enabled)
+            if (!_hands.TryGetHeldItem(player.Value, hand, out var heldEntity))
+                continue;
+
+            if (!scannerQuery.TryGetComponent(heldEntity, out var heldScanner) || !heldScanner.Enabled)
                 continue;
 
             range = MathF.Max(heldScanner.Range, range);
             canSee = true;
+            break;
         }
 
         inRange = new HashSet<Entity<SubFloorHideComponent>>();
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
index 25af4a7e93..cd79ac4441 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -19,8 +19,11 @@ namespace Content.Client.SurveillanceCamera.UI;
 [GenerateTypedNameReferences]
 public sealed partial class SurveillanceCameraMonitorWindow : FancyWindow
 {
+    private static readonly ProtoId<ShaderPrototype> CameraStaticShader = "CameraStatic";
+
     private readonly IPrototypeManager _prototypeManager; // Sunrise-edit
     private readonly IEntityManager _entManager; // Sunrise-edit
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
 
     public event Action<string, string>? CameraSelected;
     public event Action? CameraRefresh;
@@ -49,8 +52,8 @@ public sealed partial class SurveillanceCameraMonitorWindow : FancyWindow
         // Sunrise-end
 
         // This could be done better. I don't want to deal with stylesheets at the moment.
-        var texture = resourceCache.GetTexture("/Textures/Interface/Nano/square_black.png"); // Sunrise-edit
-        var shader = _prototypeManager.Index<ShaderPrototype>("CameraStatic").Instance().Duplicate();
+        var texture = _resourceCache.GetTexture("/Textures/Interface/Nano/square_black.png");
+        var shader = _prototypeManager.Index(CameraStaticShader).Instance().Duplicate();
 
         // Sunrise-edit
         _blipTexture = spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs
index a7feb9db54..1c8568b2bd 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs
@@ -38,7 +38,7 @@ public sealed partial class SurveillanceCameraSetupWindow : DefaultWindow
     }
 
     // Pass in a list of frequency prototype IDs.
-    public void LoadAvailableNetworks(uint currentNetwork, List<string> networks)
+    public void LoadAvailableNetworks(uint currentNetwork, List<ProtoId<DeviceFrequencyPrototype>> networks)
     {
         NetworkSelector.Clear();
 
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index f83b0e0bd0..25d5907b05 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -131,7 +131,7 @@ namespace Content.Client.Tabletop
             // Get the camera entity that the server has created for us
             var camera = GetEntity(msg.CameraUid);
 
-            if (!EntityManager.TryGetComponent<EyeComponent>(camera, out var eyeComponent))
+            if (!TryComp<EyeComponent>(camera, out var eyeComponent))
             {
                 // If there is no eye, print error and do not open any window
                 Log.Error("Camera entity does not have eye component!");
@@ -258,7 +258,7 @@ namespace Content.Client.Tabletop
         private void StopDragging(bool broadcast = true)
         {
             // Set the dragging player on the component to noone
-            if (broadcast && _draggedEntity != null && EntityManager.HasComponent<TabletopDraggableComponent>(_draggedEntity.Value))
+            if (broadcast && _draggedEntity != null && HasComp<TabletopDraggableComponent>(_draggedEntity.Value))
             {
                 RaisePredictiveEvent(new TabletopMoveEvent(GetNetEntity(_draggedEntity.Value), Transforms.GetMapCoordinates(_draggedEntity.Value), GetNetEntity(_table!.Value)));
                 RaisePredictiveEvent(new TabletopDraggingPlayerChangedEvent(GetNetEntity(_draggedEntity.Value), false));
diff --git a/Content.Client/Trigger/TimerTriggerVisualizerComponent.cs b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
similarity index 84%
rename from Content.Client/Trigger/TimerTriggerVisualizerComponent.cs
rename to Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
index 0e5a74b83b..0cb89edd89 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizerComponent.cs
+++ b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
@@ -1,7 +1,8 @@
+using Content.Client.Trigger.Systems;
 using Robust.Client.Animations;
 using Robust.Shared.Audio;
 
-namespace Content.Client.Trigger;
+namespace Content.Client.Trigger.Components;
 
 [RegisterComponent]
 [Access(typeof(TimerTriggerVisualizerSystem))]
@@ -16,28 +17,27 @@ public sealed partial class TimerTriggerVisualsComponent : Component
     /// <summary>
     /// The RSI state used while the device has not been primed.
     /// </summary>
-    [DataField("unprimedSprite")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string UnprimedSprite = "icon";
 
     /// <summary>
     /// The RSI state used when the device is primed.
     /// Not VVWrite-able because it's only used at component init to construct the priming animation.
     /// </summary>
-    [DataField("primingSprite")]
+    [DataField]
     public string PrimingSprite = "primed";
 
     /// <summary>
     /// The sound played when the device is primed.
     /// Not VVWrite-able because it's only used at component init to construct the priming animation.
     /// </summary>
-    [DataField("primingSound")]
+    [DataField, ViewVariables]
     public SoundSpecifier? PrimingSound;
 
     /// <summary>
     /// The actual priming animation.
     /// Constructed at component init from the sprite and sound.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [ViewVariables]
     public Animation PrimingAnimation = default!;
 }
diff --git a/Content.Client/Explosion/TriggerSystem.Proximity.cs b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
similarity index 90%
rename from Content.Client/Explosion/TriggerSystem.Proximity.cs
rename to Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
index d49f483664..7954399505 100644
--- a/Content.Client/Explosion/TriggerSystem.Proximity.cs
+++ b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
@@ -1,11 +1,12 @@
 using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Triggers;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 
-namespace Content.Client.Explosion;
+namespace Content.Client.Trigger.Systems;
 
-public sealed partial class TriggerSystem
+public sealed class ProximityTriggerAnimationSystem : EntitySystem
 {
     [Dependency] private readonly AnimationPlayerSystem _player = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -18,7 +19,7 @@ public sealed partial class TriggerSystem
 
     private const string AnimKey = "proximity";
 
-    private static readonly Animation _flasherAnimation = new Animation
+    private static readonly Animation FlasherAnimation = new Animation
     {
         Length = TimeSpan.FromSeconds(0.6f),
         AnimationTracks = {
@@ -42,8 +43,10 @@ public sealed partial class TriggerSystem
         }
     };
 
-    private void InitializeProximity()
+    public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<TriggerOnProximityComponent, ComponentInit>(OnProximityInit);
         SubscribeLocalEvent<TriggerOnProximityComponent, AppearanceChangeEvent>(OnProxAppChange);
         SubscribeLocalEvent<TriggerOnProximityComponent, AnimationCompletedEvent>(OnProxAnimation);
@@ -61,7 +64,7 @@ public sealed partial class TriggerSystem
 
     private void OnProximityInit(EntityUid uid, TriggerOnProximityComponent component, ComponentInit args)
     {
-        EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
+        EnsureComp<AnimationPlayerComponent>(uid);
     }
 
     private void OnProxAppChange(EntityUid uid, TriggerOnProximityComponent component, ref AppearanceChangeEvent args)
@@ -94,7 +97,7 @@ public sealed partial class TriggerSystem
                 break;
             case ProximityTriggerVisuals.Active:
                 if (_player.HasRunningAnimation(uid, player, AnimKey)) return;
-                _player.Play((uid, player), _flasherAnimation, AnimKey);
+                _player.Play((uid, player), FlasherAnimation, AnimKey);
                 break;
             case ProximityTriggerVisuals.Off:
             default:
diff --git a/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
new file mode 100644
index 0000000000..a183282dde
--- /dev/null
+++ b/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Client.Trigger.Systems;
+
+public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem;
diff --git a/Content.Client/Trigger/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
similarity index 80%
rename from Content.Client/Trigger/TimerTriggerVisualizerSystem.cs
rename to Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
index b3d85f2017..7c977c7589 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizerSystem.cs
+++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
@@ -1,11 +1,10 @@
+using Content.Client.Trigger.Components;
 using Content.Shared.Trigger;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameObjects;
 
-namespace Content.Client.Trigger;
+namespace Content.Client.Trigger.Systems;
 
 public sealed class TimerTriggerVisualizerSystem : VisualizerSystem<TimerTriggerVisualsComponent>
 {
@@ -17,25 +16,26 @@ public sealed class TimerTriggerVisualizerSystem : VisualizerSystem<TimerTrigger
         SubscribeLocalEvent<TimerTriggerVisualsComponent, ComponentInit>(OnComponentInit);
     }
 
-    private void OnComponentInit(EntityUid uid, TimerTriggerVisualsComponent comp, ComponentInit args)
+    private void OnComponentInit(Entity<TimerTriggerVisualsComponent> ent, ref ComponentInit args)
     {
-        comp.PrimingAnimation = new Animation
+        ent.Comp.PrimingAnimation = new Animation
         {
             Length = TimeSpan.MaxValue,
             AnimationTracks = {
-                new AnimationTrackSpriteFlick() {
+                new AnimationTrackSpriteFlick()
+                {
                     LayerKey = TriggerVisualLayers.Base,
-                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.PrimingSprite, 0f) }
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.PrimingSprite, 0f) }
                 }
             },
         };
 
-        if (comp.PrimingSound != null)
+        if (ent.Comp.PrimingSound != null)
         {
-            comp.PrimingAnimation.AnimationTracks.Add(
+            ent.Comp.PrimingAnimation.AnimationTracks.Add(
                 new AnimationTrackPlaySound()
                 {
-                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(comp.PrimingSound), 0) }
+                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.PrimingSound), 0) }
                 }
             );
         }
diff --git a/Content.Client/UserInterface/Controls/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs
index 721d750115..0e947da7cf 100644
--- a/Content.Client/UserInterface/Controls/MainViewport.cs
+++ b/Content.Client/UserInterface/Controls/MainViewport.cs
@@ -30,6 +30,8 @@ namespace Content.Client.UserInterface.Controls
             };
 
             AddChild(Viewport);
+
+            _cfg.OnValueChanged(CCVars.ViewportScalingFilterMode, _ => UpdateCfg(), true);
         }
 
         protected override void EnteredTree()
@@ -52,6 +54,7 @@ namespace Content.Client.UserInterface.Controls
             var renderScaleUp = _cfg.GetCVar(CCVars.ViewportScaleRender);
             var fixedFactor = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
             var verticalFit = _cfg.GetCVar(CCVars.ViewportVerticalFit);
+            var filterMode = _cfg.GetCVar(CCVars.ViewportScalingFilterMode);
 
             if (stretch)
             {
@@ -60,7 +63,11 @@ namespace Content.Client.UserInterface.Controls
                 {
                     // Did not find a snap, enable stretching.
                     Viewport.FixedStretchSize = null;
-                    Viewport.StretchMode = ScalingViewportStretchMode.Bilinear;
+                    Viewport.StretchMode = filterMode switch
+                    {
+                        "nearest" => ScalingViewportStretchMode.Nearest,
+                        "bilinear" => ScalingViewportStretchMode.Bilinear
+                    };
                     Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;
 
                     if (renderScaleUp)
diff --git a/Content.Client/UserInterface/RichText/MonoTag.cs b/Content.Client/UserInterface/RichText/MonoTag.cs
index aee41c324a..d97997dc83 100644
--- a/Content.Client/UserInterface/RichText/MonoTag.cs
+++ b/Content.Client/UserInterface/RichText/MonoTag.cs
@@ -12,7 +12,7 @@ namespace Content.Client.UserInterface.RichText;
 /// </summary>
 public sealed class MonoTag : IMarkupTag
 {
-    [ValidatePrototypeId<FontPrototype>] public const string MonoFont = "Monospace";
+    public static readonly ProtoId<FontPrototype> MonoFont = "Monospace";
 
     [Dependency] private readonly IResourceCache _resourceCache = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Client/UserInterface/StatsWindow.xaml b/Content.Client/UserInterface/StatsWindow.xaml
index 9cda4e41c6..8a287b4aa7 100644
--- a/Content.Client/UserInterface/StatsWindow.xaml
+++ b/Content.Client/UserInterface/StatsWindow.xaml
@@ -5,7 +5,7 @@
         <ScrollContainer HorizontalExpand="True"
                          VerticalExpand="True"
                          SizeFlagsStretchRatio="6">
-            <GridContainer Name="Values"/>
+            <GridContainer Name="Values" HSeparationOverride="0" VSeparationOverride="15"/>
         </ScrollContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
index 5c19512038..3fe553be3b 100644
--- a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
@@ -98,7 +98,8 @@ public sealed class AlertsUIController : UIController, IOnStateEntered<GameplayS
         if (!EntityManager.TryGetComponent<SpriteComponent>(spriteViewEnt, out var sprite))
             return;
 
-        var ev = new UpdateAlertSpriteEvent((spriteViewEnt, sprite), alert);
+        var ev = new UpdateAlertSpriteEvent((spriteViewEnt, sprite), player, alert);
         EntityManager.EventBus.RaiseLocalEvent(player, ref ev);
+        EntityManager.EventBus.RaiseLocalEvent(spriteViewEnt, ref ev);
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
index 847b253586..fe22ebba40 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
@@ -57,10 +57,15 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls
             _sprite = _entityManager.System<SpriteSystem>();
             TooltipSupplier = SupplyTooltip;
             Alert = alert;
+
+            HorizontalAlignment = HAlignment.Left;
             _severity = severity;
             _icon = new SpriteView
             {
-                Scale = new Vector2(2, 2)
+                Scale = new Vector2(2, 2),
+                MaxSize = new Vector2(64, 64),
+                Stretch = SpriteView.StretchMode.None,
+                HorizontalAlignment = HAlignment.Left
             };
 
             SetupIcon();
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index 638df36504..2b06eb7f8d 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -207,7 +207,9 @@ public sealed class GasTankWindow
         _btnInternals.Disabled = !canConnectInternals;
         _lblInternals.SetMarkup(Loc.GetString("gas-tank-window-internal-text",
             ("status", Loc.GetString(internalsConnected ? "gas-tank-window-internal-connected" : "gas-tank-window-internal-disconnected"))));
-        _spbPressure.Value = outputPressure;
+        if (!_spbPressure.HasKeyboardFocus())
+            // Don't update release pressure if we're currently editing it
+            _spbPressure.Value = outputPressure;
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index bb6bd92097..f1745bee91 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -70,8 +70,7 @@ public sealed partial class ChatUIController : UIController
     [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
     [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!;
 
-    [ValidatePrototypeId<ColorPalettePrototype>]
-    private const string ChatNamePalette = "ChatNames";
+    private static readonly ProtoId<ColorPalettePrototype> ChatNamePalette = "ChatNames";
     private string[] _chatNameColors = default!;
     private bool _chatNameColorsEnabled;
 
@@ -243,7 +242,7 @@ public sealed partial class ChatUIController : UIController
         gameplayStateLoad.OnScreenLoad += OnScreenLoad;
         gameplayStateLoad.OnScreenUnload += OnScreenUnload;
 
-        var nameColors = _prototypeManager.Index<ColorPalettePrototype>(ChatNamePalette).Colors.Values.ToArray();
+        var nameColors = _prototypeManager.Index(ChatNamePalette).Colors.Values.ToArray();
         _chatNameColors = new string[nameColors.Length];
         for (var i = 0; i < nameColors.Length; i++)
         {
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 4e83672c8b..a696ac1868 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -22,8 +22,11 @@ namespace Content.Client.UserInterface.Systems.Chat.Widgets;
 [Virtual]
 public partial class ChatBox : UIWidget
 {
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly ILogManager _log = default!;
+
+    private readonly ISawmill _sawmill;
     private readonly ChatUIController _controller;
-    private readonly IEntityManager _entManager;
     private readonly IConfigurationManager _configurationManager;
 
     public bool Main { get; set; }
@@ -33,6 +36,7 @@ public partial class ChatBox : UIWidget
     public ChatBox()
     {
         RobustXamlLoader.Load(this);
+        _sawmill = _log.GetSawmill("chat");
         _entManager = IoCManager.Resolve<IEntityManager>();
         _configurationManager = IoCManager.Resolve<IConfigurationManager>();
 
@@ -62,7 +66,7 @@ public partial class ChatBox : UIWidget
 
     private void OnMessageAdded(ChatMessage msg)
     {
-        Logger.DebugS("chat", $"{msg.Channel}: {msg.Message}");
+        _sawmill.Debug($"{msg.Channel}: {msg.Message}");
         if (!ChatInput.FilterButton.Popup.IsActive(msg.Channel))
         {
             return;
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
index de70fe16f8..1b9e4e2c4a 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;
@@ -9,6 +10,8 @@ namespace Content.Client.UserInterface.Systems.DamageOverlays.Overlays;
 
 public sealed class DamageOverlay : Overlay
 {
+    private static readonly ProtoId<ShaderPrototype> CircleMaskShader = "GradientCircleMask";
+
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
@@ -49,9 +52,9 @@ public sealed class DamageOverlay : Overlay
     {
         // TODO: Replace
         IoCManager.InjectDependencies(this);
-        _oxygenShader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
-        _critShader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
-        _bruteShader = _prototypeManager.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
+        _oxygenShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
+        _critShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
+        _bruteShader = _prototypeManager.Index(CircleMaskShader).InstanceUnique();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
diff --git a/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs b/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
index b91f52537c..8d74e2efe7 100644
--- a/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
+++ b/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
@@ -22,16 +22,19 @@ public sealed class EmotesUIController : UIController, IOnStateChanged<GameplayS
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
-    //private MenuButton? EmotesButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.EmotesButton;
+    private MenuButton? EmotesButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.EmotesButton;
     private SimpleRadialMenu? _menu;
 
-    private static readonly Dictionary<EmoteCategory, (string Tooltip, SpriteSpecifier Sprite)> EmoteGroupingInfo
-        = new Dictionary<EmoteCategory, (string Tooltip, SpriteSpecifier Sprite)>
-    {
-        [EmoteCategory.General] = ("emote-menu-category-general", new SpriteSpecifier.Texture(new ResPath("/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"))),
-        [EmoteCategory.Hands] = ("emote-menu-category-hands", new SpriteSpecifier.Texture(new ResPath("/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"))),
-        [EmoteCategory.Vocal] = ("emote-menu-category-vocal", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Emotes/vocal.png"))),
-    };
+    private static readonly Dictionary<EmoteCategory, (string Tooltip, SpriteSpecifier Sprite)> EmoteGroupingInfo =
+        new()
+        {
+            [EmoteCategory.General] = ("emote-menu-category-general",
+                new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Head/Soft/mimesoft.rsi"), "icon")),
+            [EmoteCategory.Hands] = ("emote-menu-category-hands",
+                new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/latex.rsi"), "icon")),
+            [EmoteCategory.Vocal] = ("emote-menu-category-vocal",
+                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Emotes/vocal.png"))),
+        };
 
     public void OnStateEntered(GameplayState state)
     {
@@ -59,11 +62,11 @@ public sealed class EmotesUIController : UIController, IOnStateChanged<GameplayS
 
             _menu.Open();
 
-            // _menu.OnClose += OnWindowClosed;
-            // _menu.OnOpen += OnWindowOpen;
+            _menu.OnClose += OnWindowClosed;
+            _menu.OnOpen += OnWindowOpen;
 
-            //if (EmotesButton != null)
-            //    EmotesButton.SetClickPressed(true);
+            if (EmotesButton != null)
+                EmotesButton.SetClickPressed(true);
 
             if (centered)
             {
@@ -76,50 +79,50 @@ public sealed class EmotesUIController : UIController, IOnStateChanged<GameplayS
         }
         else
         {
-            // _menu.OnClose -= OnWindowClosed;
-            // _menu.OnOpen -= OnWindowOpen;
+            _menu.OnClose -= OnWindowClosed;
+            _menu.OnOpen -= OnWindowOpen;
 
-            //if (EmotesButton != null)
-            //    EmotesButton.SetClickPressed(false);
+            if (EmotesButton != null)
+                EmotesButton.SetClickPressed(false);
 
             CloseMenu();
         }
     }
 
-    // public void UnloadButton()
-    // {
-    //     if (EmotesButton == null)
-    //         return;
-    //
-    //     EmotesButton.OnPressed -= ActionButtonPressed;
-    // }
+    public void UnloadButton()
+    {
+        if (EmotesButton == null)
+            return;
 
-    // public void LoadButton()
-    // {
-    //     if (EmotesButton == null)
-    //         return;
-    //
-    //     EmotesButton.OnPressed += ActionButtonPressed;
-    // }
+        EmotesButton.OnPressed -= ActionButtonPressed;
+    }
+
+    public void LoadButton()
+    {
+        if (EmotesButton == null)
+            return;
+
+        EmotesButton.OnPressed += ActionButtonPressed;
+    }
 
     private void ActionButtonPressed(BaseButton.ButtonEventArgs args)
     {
         ToggleEmotesMenu(true);
     }
 
-    // private void OnWindowClosed()
-    // {
-    //     if (EmotesButton != null)
-    //         EmotesButton.Pressed = false;
-    //
-    //     CloseMenu();
-    // }
+    private void OnWindowClosed()
+    {
+        if (EmotesButton != null)
+            EmotesButton.Pressed = false;
 
-    // private void OnWindowOpen()
-    // {
-    //     if (EmotesButton != null)
-    //         EmotesButton.Pressed = true;
-    // }
+        CloseMenu();
+    }
+
+    private void OnWindowOpen()
+    {
+        if (EmotesButton != null)
+            EmotesButton.Pressed = true;
+    }
 
     private void CloseMenu()
     {
diff --git a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
index 8bd6a532e1..d6573004d4 100644
--- a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
@@ -7,6 +7,7 @@ using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Timing;
+using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
@@ -28,7 +29,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
     private readonly Dictionary<string, int> _handContainerIndices = new();
     private readonly Dictionary<string, HandButton> _handLookup = new();
     private HandsComponent? _playerHandsComponent;
-    private HandButton? _activeHand = null;
+    private HandButton? _activeHand;
 
     // We only have two item status controls (left and right hand),
     // but we may have more than two hands.
@@ -38,7 +39,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
     private HandButton? _statusHandLeft;
     private HandButton? _statusHandRight;
 
-    private int _backupSuffix = 0; //this is used when autogenerating container names if they don't have names
+    private int _backupSuffix; //this is used when autogenerating container names if they don't have names
 
     private HotbarGui? HandsGui => UIManager.GetActiveUIWidgetOrNull<HotbarGui>();
 
@@ -48,7 +49,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
         _handsSystem.OnPlayerItemAdded += OnItemAdded;
         _handsSystem.OnPlayerItemRemoved += OnItemRemoved;
         _handsSystem.OnPlayerSetActiveHand += SetActiveHand;
-        _handsSystem.OnPlayerRemoveHand += RemoveHand;
+        _handsSystem.OnPlayerRemoveHand += OnRemoveHand;
         _handsSystem.OnPlayerHandsAdded += LoadPlayerHands;
         _handsSystem.OnPlayerHandsRemoved += UnloadPlayerHands;
         _handsSystem.OnPlayerHandBlocked += HandBlocked;
@@ -61,28 +62,35 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
         _handsSystem.OnPlayerItemAdded -= OnItemAdded;
         _handsSystem.OnPlayerItemRemoved -= OnItemRemoved;
         _handsSystem.OnPlayerSetActiveHand -= SetActiveHand;
-        _handsSystem.OnPlayerRemoveHand -= RemoveHand;
+        _handsSystem.OnPlayerRemoveHand -= OnRemoveHand;
         _handsSystem.OnPlayerHandsAdded -= LoadPlayerHands;
         _handsSystem.OnPlayerHandsRemoved -= UnloadPlayerHands;
         _handsSystem.OnPlayerHandBlocked -= HandBlocked;
         _handsSystem.OnPlayerHandUnblocked -= HandUnblocked;
     }
 
-    private void OnAddHand(string name, HandLocation location)
+    private void OnAddHand(Entity<HandsComponent> entity, string name, HandLocation location)
     {
+        if (entity.Owner != _player.LocalEntity)
+            return;
         AddHand(name, location);
     }
 
+    private void OnRemoveHand(Entity<HandsComponent> entity, string name)
+    {
+        if (entity.Owner != _player.LocalEntity)
+            return;
+        RemoveHand(name);
+    }
+
     private void HandPressed(GUIBoundKeyEventArgs args, SlotControl hand)
     {
-        if (_playerHandsComponent == null)
-        {
+        if (!_handsSystem.TryGetPlayerHands(out var hands))
             return;
-        }
 
         if (args.Function == EngineKeyFunctions.UIClick)
         {
-            _handsSystem.UIHandClick(_playerHandsComponent, hand.SlotName);
+            _handsSystem.UIHandClick(hands.Value, hand.SlotName);
             args.Handle();
         }
         else if (args.Function == EngineKeyFunctions.UseSecondary)
@@ -122,33 +130,33 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
         }
     }
 
-    private void LoadPlayerHands(HandsComponent handsComp)
+    private void LoadPlayerHands(Entity<HandsComponent> handsComp)
     {
         DebugTools.Assert(_playerHandsComponent == null);
         if (HandsGui != null)
             HandsGui.Visible = true;
 
         _playerHandsComponent = handsComp;
-        foreach (var (name, hand) in handsComp.Hands)
+        foreach (var (name, hand) in handsComp.Comp.Hands)
         {
             var handButton = AddHand(name, hand.Location);
 
-            if (_entities.TryGetComponent(hand.HeldEntity, out VirtualItemComponent? virt))
+            if (_handsSystem.TryGetHeldItem(handsComp.AsNullable(), name, out var held) &&
+                _entities.TryGetComponent(held, out VirtualItemComponent? virt))
             {
                 handButton.SetEntity(virt.BlockingEntity);
                 handButton.Blocked = true;
             }
             else
             {
-                handButton.SetEntity(hand.HeldEntity);
+                handButton.SetEntity(held);
                 handButton.Blocked = false;
             }
         }
 
-        var activeHand = handsComp.ActiveHand;
-        if (activeHand == null)
+        if (handsComp.Comp.ActiveHandId == null)
             return;
-        SetActiveHand(activeHand.Name);
+        SetActiveHand(handsComp.Comp.ActiveHandId);
     }
 
     private void HandBlocked(string handName)
@@ -260,19 +268,21 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
         if (HandsGui != null &&
             _playerHandsComponent != null &&
             _player.LocalSession?.AttachedEntity is { } playerEntity &&
-            _handsSystem.TryGetHand(playerEntity, handName, out var hand, _playerHandsComponent))
+            _handsSystem.TryGetHand((playerEntity, _playerHandsComponent), handName, out var hand))
         {
-            var foldedLocation = hand.Location.GetUILocation();
+            var heldEnt = _handsSystem.GetHeldItem((playerEntity, _playerHandsComponent), handName);
+
+            var foldedLocation = hand.Value.Location.GetUILocation();
             if (foldedLocation == HandUILocation.Left)
             {
                 _statusHandLeft = handControl;
-                HandsGui.UpdatePanelEntityLeft(hand.HeldEntity);
+                HandsGui.UpdatePanelEntityLeft(heldEnt);
             }
             else
             {
                 // Middle or right
                 _statusHandRight = handControl;
-                HandsGui.UpdatePanelEntityRight(hand.HeldEntity);
+                HandsGui.UpdatePanelEntityRight(heldEnt);
             }
 
             HandsGui.SetHighlightHand(foldedLocation);
@@ -293,7 +303,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
         var uiLocation = location.GetUILocation(); // 🌟Starlight🌟
 
         if (!_handLookup.TryAdd(handName, button))
-            throw new Exception("Tried to add hand with duplicate name to UI. Name:" + handName);
+            return _handLookup[handName];
 
         if (HandsGui != null)
         {
@@ -368,6 +378,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
         RemoveHand(handName, out _);
     }
 
+    [PublicAPI]
     private bool RemoveHand(string handName, out HandButton? handButton)
     {
         if (!_handLookup.TryGetValue(handName, out handButton))
@@ -383,7 +394,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
             _statusHandRight = null;
 
         _handLookup.Remove(handName);
-        handButton.Dispose();
+        handButton.Orphan();
         UpdateVisibleStatusPanels();
         return true;
     }
diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
index 9f3461eadd..692ee26774 100644
--- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
+++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
@@ -19,8 +19,7 @@ public sealed class InfoUIController : UIController, IOnStateExited<GameplayStat
     private RulesPopup? _rulesPopup;
     private RulesAndInfoWindow? _infoWindow;
 
-    [ValidatePrototypeId<GuideEntryPrototype>]
-    private const string DefaultRuleset = "DefaultRuleset";
+    private static readonly ProtoId<GuideEntryPrototype> DefaultRuleset = "DefaultRuleset";
 
     public ProtoId<GuideEntryPrototype> RulesEntryId = DefaultRuleset;
 
@@ -92,7 +91,7 @@ public sealed class InfoUIController : UIController, IOnStateExited<GameplayStat
     {
         if (!_prototype.TryIndex(RulesEntryId, out var guideEntryPrototype))
         {
-            guideEntryPrototype = _prototype.Index<GuideEntryPrototype>(DefaultRuleset);
+            guideEntryPrototype = _prototype.Index(DefaultRuleset);
             Log.Error($"Couldn't find the following prototype: {RulesEntryId}. Falling back to {DefaultRuleset}, please check that the server has the rules set up correctly");
             return guideEntryPrototype;
         }
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index e66ce2ae6c..ec6293811f 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -194,8 +194,6 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
             }
         }
 
-        return;
-
         int GetIndex(Vector2i position)
         {
             return position.Y * maxWidth + position.X;
@@ -329,9 +327,8 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
         var player = _playerUid;
 
         if (!control.MouseIsHovering ||
-            _playerInventory == null ||
-            !_entities.TryGetComponent<HandsComponent>(player, out var hands) ||
-            hands.ActiveHandEntity is not { } held ||
+            player == null ||
+            !_handsSystem.TryGetActiveItem(player.Value, out var held) ||
             !_entities.TryGetComponent(held, out SpriteComponent? sprite) ||
             !_inventorySystem.TryGetSlotContainer(player.Value, control.SlotName, out var container, out var slotDef))
         {
@@ -342,12 +339,12 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
         // Set green / red overlay at 50% transparency
         var hoverEntity = _entities.SpawnEntity("hoverentity", MapCoordinates.Nullspace);
         var hoverSprite = _entities.GetComponent<SpriteComponent>(hoverEntity);
-        var fits = _inventorySystem.CanEquip(player.Value, held, control.SlotName, out _, slotDef) &&
-                   _container.CanInsert(held, container);
+        var fits = _inventorySystem.CanEquip(player.Value, held.Value, control.SlotName, out _, slotDef) &&
+                   _container.CanInsert(held.Value, container);
 
         if (!fits && _entities.TryGetComponent<StorageComponent>(container.ContainedEntity, out var storage))
         {
-            fits = _entities.System<StorageSystem>().CanInsert(container.ContainedEntity.Value, held, out _, storage);
+            fits = _entities.System<StorageSystem>().CanInsert(container.ContainedEntity.Value, held.Value, out _, storage);
         }
         else if (!fits && _entities.TryGetComponent<ItemSlotsComponent>(container.ContainedEntity, out var itemSlots))
         {
@@ -357,14 +354,14 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
                 if (!slot.InsertOnInteract)
                     continue;
 
-                if (!itemSlotsSys.CanInsert(container.ContainedEntity.Value, held, null, slot))
+                if (!itemSlotsSys.CanInsert(container.ContainedEntity.Value, held.Value, null, slot))
                     continue;
                 fits = true;
                 break;
             }
         }
 
-        _sprite.CopySprite((held, sprite), (hoverEntity, hoverSprite));
+        _sprite.CopySprite((held.Value, sprite), (hoverEntity, hoverSprite));
         _sprite.SetColor((hoverEntity, hoverSprite), fits ? new Color(0, 255, 0, 127) : new Color(255, 0, 0, 127));
 
         control.HoverSpriteView.SetEntity(hoverEntity);
diff --git a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
index e5579801ec..3d5f8d9561 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 sealed class ProgressColorSystem : EntitySystem
 
             // 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/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 8b66ed8892..392532c7b7 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -621,7 +621,7 @@ public sealed class StorageWindow : BaseWindow
                         {
                             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/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index 5e6779193b..a7e130ccd6 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -225,6 +225,10 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
         if (!IsDragging && EntityManager.System<HandsSystem>().GetActiveHandEntity() == null)
             return;
 
+        // Do not rotate items unless we are either dragging them or hovering over a storage window.
+        if (DraggingGhost is null && UIManager.CurrentlyHovered is not StorageWindow)
+            return;
+
         //clamp it to a cardinal.
         DraggingRotation = (DraggingRotation + Math.PI / 2f).GetCardinalDir().ToAngle();
         if (DraggingGhost != null)
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 92596f9dc0..77b8531888 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -225,7 +225,7 @@ namespace Content.Client.Verbs
                 // is this a client exclusive (gui) verb?
                 ExecuteVerb(verb, user, GetEntity(target));
             else
-                EntityManager.RaisePredictiveEvent(new ExecuteVerbEvent(target, verb));
+                RaisePredictiveEvent(new ExecuteVerbEvent(target, verb));
         }
 
         private void HandleVerbResponse(VerbsResponseEvent msg)
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
index 2ab62198dc..c4b1f29209 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
@@ -297,13 +297,11 @@ namespace Content.Client.Voting.UI
     }
 
     [UsedImplicitly, AnyCommand]
-    public sealed class VoteMenuCommand : IConsoleCommand
+    public sealed class VoteMenuCommand : LocalizedCommands
     {
-        public string Command => "votemenu";
-        public string Description => Loc.GetString("ui-vote-menu-command-description");
-        public string Help => Loc.GetString("ui-vote-menu-command-help-text");
+        public override string Command => "votemenu";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             new VoteCallMenu().OpenCentered();
         }
diff --git a/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs b/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs
index 861d7d75c6..42456d232b 100644
--- a/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs
+++ b/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs
@@ -1,18 +1,18 @@
 using Content.Client.Weapons.Ranged.Systems;
 using Robust.Shared.Console;
 
-namespace Content.Client.Weapons.Ranged;
+namespace Content.Client.Weapons.Ranged.Commands;
 
-public sealed class ShowSpreadCommand : IConsoleCommand
+public sealed class ShowSpreadCommand : LocalizedEntityCommands
 {
-    public string Command => "showgunspread";
-    public string Description => $"Shows gun spread overlay for debugging";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<GunSystem>();
-        system.SpreadOverlay ^= true;
+    [Dependency] private readonly GunSystem _gunSystem = default!;
 
-        shell.WriteLine($"Set spread overlay to {system.SpreadOverlay}");
+    public override string Command => "showgunspread";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        _gunSystem.SpreadOverlay ^= true;
+
+        shell.WriteLine(Loc.GetString($"cmd-showgunspread-status", ("status", _gunSystem.SpreadOverlay)));
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 497e3dd7d4..ebc024bd2f 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -386,7 +386,7 @@ public sealed partial class GunSystem : SharedGunSystem
         if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.BurstActivated)
         {
             if (gun.ShotCounter != 0)
-                EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
+                RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
             return;
         }
 
@@ -398,7 +398,7 @@ public sealed partial class GunSystem : SharedGunSystem
         if (mousePos.MapId == MapId.Nullspace)
         {
             if (gun.ShotCounter != 0)
-                EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
+                RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
 
             return;
         }
@@ -422,7 +422,7 @@ public sealed partial class GunSystem : SharedGunSystem
 
         Log.Debug($"Sending shoot request tick {Timing.CurTick} / {Timing.CurTime}");
 
-        EntityManager.RaisePredictiveEvent(new RequestShootEvent
+        RaisePredictiveEvent(new RequestShootEvent
         {
             Targets = targets, // Sunrise-Edit
             Coordinates = GetNetCoordinates(coordinates),
diff --git a/Content.IntegrationTests/ExternalTestContext.cs b/Content.IntegrationTests/ExternalTestContext.cs
new file mode 100644
index 0000000000..e23b2ee636
--- /dev/null
+++ b/Content.IntegrationTests/ExternalTestContext.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace Content.IntegrationTests;
+
+/// <summary>
+/// Generic implementation of <see cref="ITestContextLike"/> for usage outside of actual tests.
+/// </summary>
+public sealed class ExternalTestContext(string name, TextWriter writer) : ITestContextLike
+{
+    public string FullName => name;
+    public TextWriter Out => writer;
+}
diff --git a/Content.IntegrationTests/ITestContextLike.cs b/Content.IntegrationTests/ITestContextLike.cs
new file mode 100644
index 0000000000..47b6e08529
--- /dev/null
+++ b/Content.IntegrationTests/ITestContextLike.cs
@@ -0,0 +1,13 @@
+using System.IO;
+
+namespace Content.IntegrationTests;
+
+/// <summary>
+/// Something that looks like a <see cref="TestContext"/>, for passing to integration tests.
+/// </summary>
+public interface ITestContextLike
+{
+    string FullName { get; }
+    TextWriter Out { get; }
+}
+
diff --git a/Content.IntegrationTests/NUnitTestContextWrap.cs b/Content.IntegrationTests/NUnitTestContextWrap.cs
new file mode 100644
index 0000000000..849c1b0910
--- /dev/null
+++ b/Content.IntegrationTests/NUnitTestContextWrap.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace Content.IntegrationTests;
+
+/// <summary>
+/// Canonical implementation of <see cref="ITestContextLike"/> for usage in actual NUnit tests.
+/// </summary>
+public sealed class NUnitTestContextWrap(TestContext context, TextWriter writer) : ITestContextLike
+{
+    public string FullName => context.Test.FullName;
+    public TextWriter Out => writer;
+}
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 89a9eb6463..694d6cfa64 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -13,6 +13,7 @@ using Robust.Server.Player;
 using Robust.Shared.Exceptions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
+using Robust.Shared.Utility;
 
 namespace Content.IntegrationTests.Pair;
 
@@ -84,6 +85,7 @@ public sealed partial class TestPair : IAsyncDisposable
 
         var returnTime = Watch.Elapsed;
         await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: PoolManager took {returnTime.TotalMilliseconds} ms to put pair {Id} back into the pool");
+        State = PairState.Ready;
     }
 
     private async Task ResetModifiedPreferences()
@@ -104,7 +106,7 @@ public sealed partial class TestPair : IAsyncDisposable
         await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: Return of pair {Id} started");
         State = PairState.CleanDisposed;
         await OnCleanDispose();
-        State = PairState.Ready;
+        DebugTools.Assert(State is PairState.Dead or PairState.Ready);
         PoolManager.NoCheckReturn(this);
         ClearContext();
     }
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index c7b8dcaee9..64aac16751 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -182,24 +182,29 @@ public static partial class PoolManager
     /// </summary>
     /// <param name="poolSettings">See <see cref="PoolSettings"/></param>
     /// <returns></returns>
-    public static async Task<TestPair> GetServerClient(PoolSettings? poolSettings = null)
+    public static async Task<TestPair> GetServerClient(
+        PoolSettings? poolSettings = null,
+        ITestContextLike? testContext = null)
     {
-        return await GetServerClientPair(poolSettings ?? new PoolSettings());
+        return await GetServerClientPair(
+            poolSettings ?? new PoolSettings(),
+            testContext ?? new NUnitTestContextWrap(TestContext.CurrentContext, TestContext.Out));
     }
 
-    private static string GetDefaultTestName(TestContext testContext)
+    private static string GetDefaultTestName(ITestContextLike testContext)
     {
-        return testContext.Test.FullName.Replace("Content.IntegrationTests.Tests.", "");
+        return testContext.FullName.Replace("Content.IntegrationTests.Tests.", "");
     }
 
-    private static async Task<TestPair> GetServerClientPair(PoolSettings poolSettings)
+    private static async Task<TestPair> GetServerClientPair(
+        PoolSettings poolSettings,
+        ITestContextLike testContext)
     {
         if (!_initialized)
             throw new InvalidOperationException($"Pool manager has not been initialized");
 
         // Trust issues with the AsyncLocal that backs this.
-        var testContext = TestContext.CurrentContext;
-        var testOut = TestContext.Out;
+        var testOut = testContext.Out;
 
         DieIfPoolFailure();
         var currentTestName = poolSettings.TestName ?? GetDefaultTestName(testContext);
diff --git a/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs b/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs
new file mode 100644
index 0000000000..26f14d7323
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Actions/RetractableItemActionTest.cs
@@ -0,0 +1,65 @@
+#nullable enable
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Actions;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.RetractableItemAction;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Actions;
+
+public sealed class RetractableItemActionTest : InteractionTest
+{
+    private static readonly EntProtoId ArmBladeActionProtoId = "ActionRetractableItemArmBlade";
+
+    /// <summary>
+    /// Gives the player the arm blade action, then activates it and makes sure they are given the blade.
+    /// Afterwards, uses the action again to retract the blade and makes sure their hand is empty.
+    /// </summary>
+    [Test]
+    public async Task ArmBladeActivateDeactivateTest()
+    {
+        var actionsSystem = Server.System<SharedActionsSystem>();
+        var handsSystem = Server.System<SharedHandsSystem>();
+        var playerUid = SEntMan.GetEntity(Player);
+
+        await Server.WaitAssertion(() =>
+        {
+            // Make sure the player's hand starts empty
+            var heldItem = handsSystem.GetActiveItem((playerUid, Hands));
+            Assert.That(heldItem, Is.Null, $"Player is holding an item ({SEntMan.ToPrettyString(heldItem)}) at start of test.");
+
+            // Inspect the action prototype to find the item it spawns
+            var armBladeActionProto = ProtoMan.Index(ArmBladeActionProtoId);
+
+            // Find the component
+            Assert.That(armBladeActionProto.TryGetComponent<RetractableItemActionComponent>(out var actionComp, SEntMan.ComponentFactory));
+            // Get the item protoId from the component
+            var spawnedProtoId = actionComp!.SpawnedPrototype;
+
+            // Add the action to the player
+            var actionUid = actionsSystem.AddAction(playerUid, ArmBladeActionProtoId);
+            // Make sure the player has the action now
+            Assert.That(actionUid, Is.Not.Null, "Failed to add action to player.");
+            var actionEnt = actionsSystem.GetAction(actionUid);
+
+            // Make sure the player's hand is still empty
+            heldItem = handsSystem.GetActiveItem((playerUid, Hands));
+            Assert.That(heldItem, Is.Null, $"Player is holding an item ({SEntMan.ToPrettyString(heldItem)}) after adding action.");
+
+            // Activate the arm blade
+            actionsSystem.PerformAction(ToServer(Player), actionEnt!.Value);
+
+            // Make sure the player is now holding the expected item
+            heldItem = handsSystem.GetActiveItem((playerUid, Hands));
+            Assert.That(heldItem, Is.Not.Null, $"Expected player to be holding {spawnedProtoId} but was holding nothing.");
+            AssertPrototype(spawnedProtoId, SEntMan.GetNetEntity(heldItem));
+
+            // Use the action again to retract the arm blade
+            actionsSystem.PerformAction(ToServer(Player), actionEnt.Value);
+
+            // Make sure the player's hand is empty again
+            heldItem = handsSystem.GetActiveItem((playerUid, Hands));
+            Assert.That(heldItem, Is.Null, $"Player is still holding an item ({SEntMan.ToPrettyString(heldItem)}) after second use.");
+        });
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
index 064b4f9a2d..b74c35ba11 100644
--- a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
@@ -7,10 +7,12 @@ namespace Content.IntegrationTests.Tests.Atmos
     [TestOf(typeof(AtmosAlarmThreshold))]
     public sealed class AlarmThresholdTest
     {
+        private const string AlarmThresholdTestDummyId = "AlarmThresholdTestDummy";
+
         [TestPrototypes]
-        private const string Prototypes = @"
+        private const string Prototypes = $@"
 - type: alarmThreshold
-  id: AlarmThresholdTestDummy
+  id: {AlarmThresholdTestDummyId}
   upperBound: !type:AlarmThresholdSetting
     threshold: 5
   lowerBound: !type:AlarmThresholdSetting
@@ -30,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Atmos
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
             AtmosAlarmThreshold threshold = default!;
 
-            var proto = prototypeManager.Index<AtmosAlarmThresholdPrototype>("AlarmThresholdTestDummy");
+            var proto = prototypeManager.Index<AtmosAlarmThresholdPrototype>(AlarmThresholdTestDummyId);
             threshold = new(proto);
 
             await server.WaitAssertion(() =>
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index f167cb7b94..a8384f9e24 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -294,9 +294,9 @@ namespace Content.IntegrationTests.Tests.Buckle
                 Assert.That(buckle.Buckled);
 
                 // With items in all hands
-                foreach (var hand in hands.Hands.Values)
+                foreach (var hand in hands.Hands.Keys)
                 {
-                    Assert.That(hand.HeldEntity, Is.Not.Null);
+                    Assert.That(handsSys.GetHeldItem((human, hands), hand), Is.Not.Null);
                 }
 
                 var bodySystem = entityManager.System<BodySystem>();
@@ -317,9 +317,9 @@ namespace Content.IntegrationTests.Tests.Buckle
                 Assert.That(buckle.Buckled);
 
                 // Now with no item in any hand
-                foreach (var hand in hands.Hands.Values)
+                foreach (var hand in hands.Hands.Keys)
                 {
-                    Assert.That(hand.HeldEntity, Is.Null);
+                    Assert.That(handsSys.GetHeldItem((human, hands), hand), Is.Null);
                 }
 
                 buckleSystem.Unbuckle(human, human);
diff --git a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
index 52b7e555a9..4c5860f235 100644
--- a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
@@ -1,7 +1,6 @@
 using Content.Client.Chemistry.UI;
 using Content.IntegrationTests.Tests.Interaction;
 using Content.Shared.Chemistry;
-using Content.Server.Chemistry.Components;
 using Content.Shared.Containers.ItemSlots;
 
 namespace Content.IntegrationTests.Tests.Chemistry;
@@ -19,7 +18,7 @@ public sealed class DispenserTest : InteractionTest
 
         // Insert beaker
         await InteractUsing("Beaker");
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
 
         // Open BUI
         await Interact();
@@ -29,18 +28,18 @@ public sealed class DispenserTest : InteractionTest
         await SendBui(ReagentDispenserUiKey.Key, ev);
 
         // Beaker is back in the player's hands
-        Assert.That(Hands.ActiveHandEntity, Is.Not.Null);
-        AssertPrototype("Beaker", SEntMan.GetNetEntity(Hands.ActiveHandEntity));
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Not.Null);
+        AssertPrototype("Beaker", SEntMan.GetNetEntity(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands))));
 
         // Re-insert the beaker
         await Interact();
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
 
         // Re-eject using the button directly instead of sending a BUI event. This test is really just a test of the
         // bui/window helper methods.
         await ClickControl<ReagentDispenserWindow>(nameof(ReagentDispenserWindow.EjectButton));
         await RunTicks(5);
-        Assert.That(Hands.ActiveHandEntity, Is.Not.Null);
-        AssertPrototype("Beaker", SEntMan.GetNetEntity(Hands.ActiveHandEntity));
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Not.Null);
+        AssertPrototype("Beaker", SEntMan.GetNetEntity(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands))));
     }
 }
diff --git a/Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs b/Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs
new file mode 100644
index 0000000000..9edc115eee
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Cloning/CloningSettingsPrototypeTest.cs
@@ -0,0 +1,46 @@
+using Content.Shared.Cloning;
+
+namespace Content.IntegrationTests.Tests.Cloning;
+
+public sealed class CloningSettingsPrototypeTest
+{
+    /// <summary>
+    /// Checks that the components named in every <see cref="CloningSettingsPrototype"/> are valid components known to the server.
+    /// This is used instead of <see cref="ComponentNameSerializer"/> because we only care if the components are registered with the server,
+    /// and instead of a <see cref="ComponentRegistry"/> because we only need component names.
+    /// </summary>
+    [Test]
+    public async Task ValidatePrototypes()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        var protoMan = server.ProtoMan;
+        var compFactory = server.EntMan.ComponentFactory;
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.Multiple(() =>
+            {
+                var protos = protoMan.EnumeratePrototypes<CloningSettingsPrototype>();
+                foreach (var proto in protos)
+                {
+                    foreach (var compName in proto.Components)
+                    {
+                        Assert.That(compFactory.TryGetRegistration(compName, out _),
+                            $"Failed to find a component named {compName} for {nameof(CloningSettingsPrototype)} \"{proto.ID}\""
+                        );
+                    }
+
+                    foreach (var eventCompName in proto.EventComponents)
+                    {
+                        Assert.That(compFactory.TryGetRegistration(eventCompName, out _),
+                            $"Failed to find a component named {eventCompName} for {nameof(CloningSettingsPrototype)} \"{proto.ID}\""
+                        );
+                    }
+                }
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs b/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
new file mode 100644
index 0000000000..a77761a7d1
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
@@ -0,0 +1,72 @@
+#nullable enable
+using System.Linq;
+using Content.Server.Objectives;
+using Content.Shared.Mind;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Player;
+
+namespace Content.IntegrationTests.Tests.Commands;
+
+public sealed class ObjectiveCommandsTest
+{
+
+    private const string ObjectiveProtoId = "MindCommandsTestObjective";
+    private const string DummyUsername = "MindCommandsTestUser";
+
+    [TestPrototypes]
+    private const string Prototypes = $"""
+- type: entity
+  id: {ObjectiveProtoId}
+  components:
+  - type: Objective
+    difficulty: 1
+    issuer: objective-issuer-syndicate
+    icon:
+      sprite: error.rsi
+      state: error
+  - type: DieCondition
+""";
+
+    /// <summary>
+    /// Creates a dummy session, and assigns it a mind, then
+    /// tests using <c>addobjective</c>, <c>lsobjectives</c>,
+    /// and <c>rmobjective</c> on it.
+    /// </summary>
+    [Test]
+    public async Task AddListRemoveObjectiveTest()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        var entMan = server.EntMan;
+        var playerMan = server.ResolveDependency<ISharedPlayerManager>();
+        var mindSys = server.System<SharedMindSystem>();
+        var objectivesSystem = server.System<ObjectivesSystem>();
+
+        await server.AddDummySession(DummyUsername);
+        await server.WaitRunTicks(5);
+
+        var playerSession = playerMan.Sessions.Single();
+
+        Entity<MindComponent>? mindEnt = null;
+        await server.WaitPost(() =>
+        {
+            mindEnt = mindSys.CreateMind(playerSession.UserId);
+        });
+
+        Assert.That(mindEnt, Is.Not.Null);
+        var mindComp = mindEnt.Value.Comp;
+        Assert.That(mindComp.Objectives, Is.Empty, "Dummy player started with objectives.");
+
+        await pair.WaitCommand($"addobjective {playerSession.Name} {ObjectiveProtoId}");
+
+        Assert.That(mindComp.Objectives, Has.Count.EqualTo(1), "addobjective failed to increase Objectives count.");
+
+        await pair.WaitCommand($"lsobjectives {playerSession.Name}");
+
+        await pair.WaitCommand($"rmobjective {playerSession.Name} 0");
+
+        Assert.That(mindComp.Objectives, Is.Empty, "rmobjective failed to remove objective");
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index cfc8007306..e4ec7e907a 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -15,6 +15,8 @@ namespace Content.IntegrationTests.Tests.Commands
     [TestOf(typeof(RejuvenateSystem))]
     public sealed class RejuvenateTest
     {
+        private static readonly ProtoId<DamageGroupPrototype> TestDamageGroup = "Toxin";
+
         [TestPrototypes]
         private const string Prototypes = @"
 - type: entity
@@ -62,7 +64,7 @@ namespace Content.IntegrationTests.Tests.Commands
                 });
 
                 // Kill the entity
-                DamageSpecifier damage = new(prototypeManager.Index<DamageGroupPrototype>("Toxin"), FixedPoint2.New(10000000));
+                DamageSpecifier damage = new(prototypeManager.Index(TestDamageGroup), FixedPoint2.New(10000000));
 
                 damSystem.TryChangeDamage(human, damage, true);
 
diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
index 0003e6bd32..fcee9a8257 100644
--- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
+++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -53,6 +53,8 @@ public sealed class SuicideCommandTests
   components:
   - type: MaterialReclaimer";
     private static readonly ProtoId<TagPrototype> CannotSuicideTag = "CannotSuicide";
+    private static readonly ProtoId<DamageTypePrototype> DamageType = "Slash";
+
     /// <summary>
     /// Run the suicide command in the console
     /// Should successfully kill the player and ghost them
@@ -144,7 +146,7 @@ public sealed class SuicideCommandTests
             mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
             damageableComp = entManager.GetComponent<DamageableComponent>(player);
 
-            if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
+            if (protoMan.TryIndex(DamageType, out var slashProto))
                 damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)), useModifier: false, useVariance: false); // Sunrise-Edit
         });
 
@@ -267,7 +269,7 @@ public sealed class SuicideCommandTests
         await server.WaitPost(() =>
         {
             var item = entManager.SpawnEntity("SharpTestObject", transformSystem.GetMapCoordinates(player));
-            Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHand!));
+            Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHandId!));
             entManager.TryGetComponent<ExecutionComponent>(item, out var executionComponent);
             Assert.That(executionComponent, Is.Not.EqualTo(null));
         });
@@ -342,7 +344,7 @@ public sealed class SuicideCommandTests
         await server.WaitPost(() =>
         {
             var item = entManager.SpawnEntity("MixedDamageTestObject", transformSystem.GetMapCoordinates(player));
-            Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHand!));
+            Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHandId!));
             entManager.TryGetComponent<ExecutionComponent>(item, out var executionComponent);
             Assert.That(executionComponent, Is.Not.EqualTo(null));
         });
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs
index 292bf0c55a..b94bda3d95 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs
@@ -13,10 +13,10 @@ public sealed class WallConstruction : InteractionTest
     {
         await StartConstruction(Wall);
         await InteractUsing(Steel, 2);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
         ClientAssertPrototype(Girder, Target);
         await InteractUsing(Steel, 2);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
         AssertPrototype(WallSolid);
     }
 
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
index 6eea519af3..192604edfd 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
@@ -8,6 +8,8 @@ namespace Content.IntegrationTests.Tests.Construction.Interaction;
 
 public sealed class WindowRepair : InteractionTest
 {
+    private static readonly ProtoId<DamageTypePrototype> BluntDamageType = "Blunt";
+
     [Test]
     public async Task RepairReinforcedWindow()
     {
@@ -16,7 +18,7 @@ public sealed class WindowRepair : InteractionTest
         // Damage the entity.
         var sys = SEntMan.System<DamageableSystem>();
         var comp = Comp<DamageableComponent>();
-        var damageType = Server.ResolveDependency<IPrototypeManager>().Index<DamageTypePrototype>("Blunt");
+        var damageType = Server.ProtoMan.Index(BluntDamageType);
         var damage = new DamageSpecifier(damageType, FixedPoint2.New(10));
         Assert.That(comp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero));
         await Server.WaitPost(() => sys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true));
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 5aa25fb9ed..4b44d1711f 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -4,7 +4,6 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
@@ -16,66 +15,79 @@ namespace Content.IntegrationTests.Tests.Damageable
     [TestOf(typeof(DamageableSystem))]
     public sealed class DamageableTest
     {
+        private const string TestDamageableEntityId = "TestDamageableEntityId";
+        private const string TestGroup1 = "TestGroup1";
+        private const string TestGroup2 = "TestGroup2";
+        private const string TestGroup3 = "TestGroup3";
+        private const string TestDamage1 = "TestDamage1";
+        private const string TestDamage2a = "TestDamage2a";
+        private const string TestDamage2b = "TestDamage2b";
+
+        private const string TestDamage3a = "TestDamage3a";
+
+        private const string TestDamage3b = "TestDamage3b";
+        private const string TestDamage3c = "TestDamage3c";
+
         [TestPrototypes]
-        private const string Prototypes = @"
+        private const string Prototypes = $@"
 # Define some damage groups
 - type: damageType
-  id: TestDamage1
+  id: {TestDamage1}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage2a
+  id: {TestDamage2a}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage2b
+  id: {TestDamage2b}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage3a
+  id: {TestDamage3a}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage3b
+  id: {TestDamage3b}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestDamage3c
+  id: {TestDamage3c}
   name: damage-type-blunt
 
 # Define damage Groups with 1,2,3 damage types
 - type: damageGroup
-  id: TestGroup1
+  id: {TestGroup1}
   name: damage-group-brute
   damageTypes:
-    - TestDamage1
+    - {TestDamage1}
 
 - type: damageGroup
-  id: TestGroup2
+  id: {TestGroup2}
   name: damage-group-brute
   damageTypes:
-    - TestDamage2a
-    - TestDamage2b
+    - {TestDamage2a}
+    - {TestDamage2b}
 
 - type: damageGroup
-  id: TestGroup3
+  id: {TestGroup3}
   name: damage-group-brute
   damageTypes:
-    - TestDamage3a
-    - TestDamage3b
-    - TestDamage3c
+    - {TestDamage3a}
+    - {TestDamage3b}
+    - {TestDamage3c}
 
 # This container should not support TestDamage1 or TestDamage2b
 - type: damageContainer
   id: testDamageContainer
   supportedGroups:
-    - TestGroup3
+    - {TestGroup3}
   supportedTypes:
-    - TestDamage2a
+    - {TestDamage2a}
 
 - type: entity
-  id: TestDamageableEntityId
-  name: TestDamageableEntityId
+  id: {TestDamageableEntityId}
+  name: {TestDamageableEntityId}
   components:
   - type: Damageable
     damageContainer: testDamageContainer
@@ -116,20 +128,20 @@ namespace Content.IntegrationTests.Tests.Damageable
             {
                 var coordinates = map.MapCoords;
 
-                sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
+                sDamageableEntity = sEntityManager.SpawnEntity(TestDamageableEntityId, coordinates);
                 sDamageableComponent = sEntityManager.GetComponent<DamageableComponent>(sDamageableEntity);
                 sDamageableSystem = sEntitySystemManager.GetEntitySystem<DamageableSystem>();
 
-                group1 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup1");
-                group2 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup2");
-                group3 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup3");
+                group1 = sPrototypeManager.Index<DamageGroupPrototype>(TestGroup1);
+                group2 = sPrototypeManager.Index<DamageGroupPrototype>(TestGroup2);
+                group3 = sPrototypeManager.Index<DamageGroupPrototype>(TestGroup3);
 
-                type1 = sPrototypeManager.Index<DamageTypePrototype>("TestDamage1");
-                type2a = sPrototypeManager.Index<DamageTypePrototype>("TestDamage2a");
-                type2b = sPrototypeManager.Index<DamageTypePrototype>("TestDamage2b");
-                type3a = sPrototypeManager.Index<DamageTypePrototype>("TestDamage3a");
-                type3b = sPrototypeManager.Index<DamageTypePrototype>("TestDamage3b");
-                type3c = sPrototypeManager.Index<DamageTypePrototype>("TestDamage3c");
+                type1 = sPrototypeManager.Index<DamageTypePrototype>(TestDamage1);
+                type2a = sPrototypeManager.Index<DamageTypePrototype>(TestDamage2a);
+                type2b = sPrototypeManager.Index<DamageTypePrototype>(TestDamage2b);
+                type3a = sPrototypeManager.Index<DamageTypePrototype>(TestDamage3a);
+                type3b = sPrototypeManager.Index<DamageTypePrototype>(TestDamage3b);
+                type3c = sPrototypeManager.Index<DamageTypePrototype>(TestDamage3c);
 
                 sConfigManager.SetCVar(SunriseCCVars.DamageVariance, 0f); // Sunrise-Edit
             });
diff --git a/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs b/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs
new file mode 100644
index 0000000000..f0a594dbd4
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.IntegrationTests.Tests.Damageable;
+
+public sealed class StaminaComponentTest
+{
+    [Test]
+    public async Task ValidatePrototypes()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var protos = pair.GetPrototypesWithComponent<StaminaComponent>();
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.Multiple(() =>
+            {
+                foreach (var (proto, comp) in protos)
+                {
+                    Assert.That(comp.AnimationThreshold, Is.LessThan(comp.CritThreshold),
+                        $"Animation threshold on {proto.ID} must be less than its crit threshold.");
+                }
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
index 853ace3199..ff9d46c2ab 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
@@ -58,8 +58,8 @@ namespace Content.IntegrationTests.Tests.Destructible
 
             await server.WaitAssertion(() =>
             {
-                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>("TestBrute");
-                var burnDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>("TestBurn");
+                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>(TestBruteDamageGroupId);
+                var burnDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>(TestBurnDamageGroupId);
 
                 DamageSpecifier bruteDamage = new(bruteDamageGroup, FixedPoint2.New(5));
                 DamageSpecifier burnDamage = new(burnDamageGroup, FixedPoint2.New(5));
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
index b91c0c7849..187d96cc37 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
@@ -53,8 +53,8 @@ namespace Content.IntegrationTests.Tests.Destructible
 
             await server.WaitAssertion(() =>
             {
-                var bluntDamageType = protoManager.Index<DamageTypePrototype>("TestBlunt");
-                var slashDamageType = protoManager.Index<DamageTypePrototype>("TestSlash");
+                var bluntDamageType = protoManager.Index<DamageTypePrototype>(TestBluntDamageTypeId);
+                var slashDamageType = protoManager.Index<DamageTypePrototype>(TestSlashDamageTypeId);
 
                 var bluntDamage = new DamageSpecifier(bluntDamageType, 5);
                 var slashDamage = new DamageSpecifier(slashDamageType, 5);
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index 4cbc000e30..6fb2f2f547 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -39,7 +39,7 @@ namespace Content.IntegrationTests.Tests.Destructible
             await server.WaitAssertion(() =>
             {
                 var coordinates = sEntityManager.GetComponent<TransformComponent>(sDestructibleEntity).Coordinates;
-                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>("TestBrute");
+                var bruteDamageGroup = sPrototypeManager.Index<DamageGroupPrototype>(TestBruteDamageGroupId);
                 DamageSpecifier bruteDamage = new(bruteDamageGroup, 50);
 
 #pragma warning disable NUnit2045 // Interdependent assertions.
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
index 7ff9242398..872e414ac3 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
@@ -7,48 +7,56 @@ namespace Content.IntegrationTests.Tests.Destructible
         public const string DestructibleDestructionEntityId = "DestructibleTestsDestructibleDestructionEntity";
         public const string DestructibleDamageTypeEntityId = "DestructibleTestsDestructibleDamageTypeEntity";
         public const string DestructibleDamageGroupEntityId = "DestructibleTestsDestructibleDamageGroupEntity";
+        public const string TestBruteDamageGroupId = "TestBrute";
+        public const string TestBurnDamageGroupId = "TestBurn";
+        public const string TestBluntDamageTypeId = "TestBlunt";
+        public const string TestSlashDamageTypeId = "TestSlash";
+        public const string TestPiercingDamageTypeId = "TestPiercing";
+        public const string TestHeatDamageTypeId = "TestHeat";
+        public const string TestShockDamageTypeId = "TestShock";
+        public const string TestColdDamageTypeId = "TestCold";
 
         [TestPrototypes]
         public const string DamagePrototypes = $@"
 - type: damageType
-  id: TestBlunt
+  id: {TestBluntDamageTypeId}
   name: damage-type-blunt
 
 - type: damageType
-  id: TestSlash
+  id: {TestSlashDamageTypeId}
   name: damage-type-slash
 
 - type: damageType
-  id: TestPiercing
+  id: {TestPiercingDamageTypeId}
   name: damage-type-piercing
 
 - type: damageType
-  id: TestHeat
+  id: {TestHeatDamageTypeId}
   name: damage-type-heat
 
 - type: damageType
-  id: TestShock
+  id: {TestShockDamageTypeId}
   name: damage-type-shock
 
 - type: damageType
-  id: TestCold
+  id: {TestColdDamageTypeId}
   name: damage-type-cold
 
 - type: damageGroup
-  id: TestBrute
+  id: {TestBruteDamageGroupId}
   name: damage-group-brute
   damageTypes:
-    - TestBlunt
-    - TestSlash
-    - TestPiercing
+    - {TestBluntDamageTypeId}
+    - {TestSlashDamageTypeId}
+    - {TestPiercingDamageTypeId}
 
 - type: damageGroup
-  id: TestBurn
+  id: {TestBurnDamageGroupId}
   name: damage-group-burn
   damageTypes:
-    - TestHeat
-    - TestShock
-    - TestCold
+    - {TestHeatDamageTypeId}
+    - {TestShockDamageTypeId}
+    - {TestColdDamageTypeId}
 
 - type: entity
   id: {SpawnedEntityId}
@@ -114,10 +122,10 @@ namespace Content.IntegrationTests.Tests.Destructible
         !type:AndTrigger
         triggers:
         - !type:DamageTypeTrigger
-          damageType: TestBlunt
+          damageType: {TestBluntDamageTypeId}
           damage: 10
         - !type:DamageTypeTrigger
-          damageType: TestSlash
+          damageType: {TestSlashDamageTypeId}
           damage: 10
 
 - type: entity
@@ -131,10 +139,10 @@ namespace Content.IntegrationTests.Tests.Destructible
         !type:AndTrigger
         triggers:
         - !type:DamageGroupTrigger
-          damageGroup: TestBrute
+          damageGroup: {TestBruteDamageGroupId}
           damage: 10
         - !type:DamageGroupTrigger
-          damageGroup: TestBurn
+          damageGroup: {TestBurnDamageGroupId}
           damage: 10";
     }
 }
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index cb6684ed67..304f463c89 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Destructible
 
             await server.WaitAssertion(() =>
             {
-                var bluntDamage = new DamageSpecifier(sPrototypeManager.Index<DamageTypePrototype>("TestBlunt"), 10);
+                var bluntDamage = new DamageSpecifier(sPrototypeManager.Index<DamageTypePrototype>(TestBluntDamageTypeId), 10);
 
                 sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true, useModifier: false, useVariance: false); // Sunrise-Edit
 
diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 8cfe8fbfcd..52b669b09d 100644
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -28,7 +28,7 @@ namespace Content.IntegrationTests.Tests.Disposal
                 SubscribeLocalEvent<DoInsertDisposalUnitEvent>(ev =>
                 {
                     var (_, toInsert, unit) = ev;
-                    var insertTransform = EntityManager.GetComponent<TransformComponent>(toInsert);
+                    var insertTransform = Comp<TransformComponent>(toInsert);
                     // Not in a tube yet
                     Assert.That(insertTransform.ParentUid, Is.EqualTo(unit));
                 }, after: new[] { typeof(SharedDisposalUnitSystem) });
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index c6d64b79f8..d6a125641f 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -56,7 +56,7 @@ namespace Content.IntegrationTests.Tests
                 }
             });
 
-            await server.WaitRunTicks(15);
+            await server.WaitRunTicks(450); // 15 seconds, enough to trigger most update loops
 
             await server.WaitPost(() =>
             {
@@ -117,7 +117,7 @@ namespace Content.IntegrationTests.Tests
                     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)
@@ -275,7 +275,7 @@ namespace Content.IntegrationTests.Tests
             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/Fluids/AbsorbentTest.cs b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
index bf47768274..1afed38966 100644
--- a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
@@ -110,7 +110,7 @@ public sealed class AbsorbentTest
                 solutionContainerSystem.AddSolution(refillableSoln.Value, new Solution(NonEvaporablePrototypeId, testCase.InitialRefillableSolution.VolumeOfNonEvaporable));
 
             // Act
-            absorbentSystem.Mop(user, refillable, absorbent, component);
+            absorbentSystem.Mop((absorbent, component), user, refillable);
 
             // Assert
             var absorbentComposition = absorbentSolution.GetReagentPrototypes(prototypeManager).ToDictionary(r => r.Key.ID, r => r.Value);
@@ -167,7 +167,7 @@ public sealed class AbsorbentTest
                 solutionContainerSystem.AddSolution(refillableSoln.Value, new Solution(NonEvaporablePrototypeId, testCase.InitialRefillableSolution.VolumeOfNonEvaporable));
 
             // Act
-            absorbentSystem.Mop(user, refillable, absorbent, component);
+            absorbentSystem.Mop((absorbent, component), user, refillable);
 
             // Assert
             var absorbentComposition = absorbentSolution.GetReagentPrototypes(prototypeManager).ToDictionary(r => r.Key.ID, r => r.Value);
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index 2570e2246a..dae3203f9f 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -1,11 +1,9 @@
 #nullable enable
 using Content.Server.Cuffs;
-using Content.Shared.Body.Components;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Hands.Components;
 using Robust.Server.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
 {
@@ -22,9 +20,15 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
   components:
   - type: Cuffable
   - type: Hands
+    hands:
+      hand_right:
+        location: Right
+      hand_left:
+        location: Left
+    sortedHands:
+    - hand_right
+    - hand_left
   - type: ComplexInteraction
-  - type: Body
-    prototype: Human
 
 - type: entity
   name: HandcuffsDummy
@@ -47,7 +51,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
             HandsComponent hands = default!;
 
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var mapManager = server.ResolveDependency<IMapManager>();
             var host = server.ResolveDependency<IServerConsoleHost>();
 
             var map = await pair.CreateTestMap();
@@ -73,7 +76,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
                 {
                     Assert.That(entityManager.TryGetComponent(human, out cuffed!), $"Human has no {nameof(CuffableComponent)}");
                     Assert.That(entityManager.TryGetComponent(human, out hands!), $"Human has no {nameof(HandsComponent)}");
-                    Assert.That(entityManager.TryGetComponent(human, out BodyComponent? _), $"Human has no {nameof(BodyComponent)}");
                     Assert.That(entityManager.TryGetComponent(cuffs, out HandcuffComponent? _), $"Handcuff has no {nameof(HandcuffComponent)}");
                     Assert.That(entityManager.TryGetComponent(secondCuffs, out HandcuffComponent? _), $"Second handcuffs has no {nameof(HandcuffComponent)}");
                 });
diff --git a/Content.IntegrationTests/Tests/Hands/HandTests.cs b/Content.IntegrationTests/Tests/Hands/HandTests.cs
index b88f2dc9eb..d5cf75c463 100644
--- a/Content.IntegrationTests/Tests/Hands/HandTests.cs
+++ b/Content.IntegrationTests/Tests/Hands/HandTests.cs
@@ -53,20 +53,20 @@ public sealed class HandTests
             var xform = entMan.GetComponent<TransformComponent>(player);
             item = entMan.SpawnEntity("Crowbar", tSys.GetMapCoordinates(player, xform: xform));
             hands = entMan.GetComponent<HandsComponent>(player);
-            sys.TryPickup(player, item, hands.ActiveHand!);
+            sys.TryPickup(player, item, hands.ActiveHandId!);
         });
 
         // run ticks here is important, as errors may happen within the container system's frame update methods.
         await pair.RunTicksSync(5);
-        Assert.That(hands.ActiveHandEntity, Is.EqualTo(item));
+        Assert.That(sys.GetActiveItem((player, hands)), Is.EqualTo(item));
 
         await server.WaitPost(() =>
         {
-            sys.TryDrop(player, item, null!);
+            sys.TryDrop(player, item);
         });
 
         await pair.RunTicksSync(5);
-        Assert.That(hands.ActiveHandEntity, Is.Null);
+        Assert.That(sys.GetActiveItem((player, hands)), Is.Null);
 
         await server.WaitPost(() => mapSystem.DeleteMap(data.MapId));
         await pair.CleanReturnAsync();
@@ -105,10 +105,10 @@ public sealed class HandTests
             player = playerMan.Sessions.First().AttachedEntity!.Value;
             tSys.PlaceNextTo(player, item);
             hands = entMan.GetComponent<HandsComponent>(player);
-            sys.TryPickup(player, item, hands.ActiveHand!);
+            sys.TryPickup(player, item, hands.ActiveHandId!);
         });
         await pair.RunTicksSync(5);
-        Assert.That(hands.ActiveHandEntity, Is.EqualTo(item));
+        Assert.That(sys.GetActiveItem((player, hands)), Is.EqualTo(item));
 
         // Open then close the box to place the player, who is holding the crowbar, inside of it
         var storage = server.System<EntityStorageSystem>();
@@ -125,12 +125,12 @@ public sealed class HandTests
         // with the item not being in the player's hands
         await server.WaitPost(() =>
         {
-            sys.TryDrop(player, item, null!);
+            sys.TryDrop(player, item);
         });
         await pair.RunTicksSync(5);
         var xform = entMan.GetComponent<TransformComponent>(player);
         var itemXform = entMan.GetComponent<TransformComponent>(item);
-        Assert.That(hands.ActiveHandEntity, Is.Not.EqualTo(item));
+        Assert.That(sys.GetActiveItem((player, hands)), Is.Not.EqualTo(item));
         Assert.That(containerSystem.IsInSameOrNoContainer((player, xform), (item, itemXform)));
 
         await server.WaitPost(() => mapSystem.DeleteMap(map.MapId));
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index 0f9e9b5ebe..3302b1bafc 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -120,18 +120,18 @@ public abstract partial class InteractionTest
     /// </summary>
     protected async Task DeleteHeldEntity()
     {
-        if (Hands.ActiveHandEntity is { } held)
+        if (HandSys.GetActiveItem((ToServer(Player), Hands)) is { } held)
         {
             await Server.WaitPost(() =>
             {
-                Assert.That(HandSys.TryDrop(SEntMan.GetEntity(Player), null, false, true, Hands));
+                Assert.That(HandSys.TryDrop((SEntMan.GetEntity(Player), Hands), null, false, true));
                 SEntMan.DeleteEntity(held);
                 SLogger.Debug($"Deleting held entity");
             });
         }
 
         await RunTicks(1);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((ToServer(Player), Hands)), Is.Null);
     }
 
     /// <summary>
@@ -152,7 +152,7 @@ public abstract partial class InteractionTest
     /// <param name="enableToggleable">Whether or not to automatically enable any toggleable items</param>
     protected async Task<NetEntity> PlaceInHands(EntitySpecifier entity, bool enableToggleable = true)
     {
-        if (Hands.ActiveHand == null)
+        if (Hands.ActiveHandId == null)
         {
             Assert.Fail("No active hand");
             return default;
@@ -169,7 +169,7 @@ public abstract partial class InteractionTest
         {
             var playerEnt = SEntMan.GetEntity(Player);
 
-            Assert.That(HandSys.TryPickup(playerEnt, item, Hands.ActiveHand, false, false, Hands));
+            Assert.That(HandSys.TryPickup(playerEnt, item, Hands.ActiveHandId, false, false, false, Hands));
 
             // turn on welders
             if (enableToggleable && SEntMan.TryGetComponent(item, out itemToggle) && !itemToggle.Activated)
@@ -179,7 +179,7 @@ public abstract partial class InteractionTest
         });
 
         await RunTicks(1);
-        Assert.That(Hands.ActiveHandEntity, Is.EqualTo(item));
+        Assert.That(HandSys.GetActiveItem((ToServer(Player), Hands)), Is.EqualTo(item));
         if (enableToggleable && itemToggle != null)
             Assert.That(itemToggle.Activated);
 
@@ -193,7 +193,7 @@ public abstract partial class InteractionTest
     {
         entity ??= Target;
 
-        if (Hands.ActiveHand == null)
+        if (Hands.ActiveHandId == null)
         {
             Assert.Fail("No active hand");
             return;
@@ -212,11 +212,11 @@ public abstract partial class InteractionTest
 
         await Server.WaitPost(() =>
         {
-            Assert.That(HandSys.TryPickup(SEntMan.GetEntity(Player), uid.Value, Hands.ActiveHand, false, false, Hands, item));
+            Assert.That(HandSys.TryPickup(ToServer(Player), uid.Value, Hands.ActiveHandId, false, false, false, Hands, item));
         });
 
         await RunTicks(1);
-        Assert.That(Hands.ActiveHandEntity, Is.EqualTo(uid));
+        Assert.That(HandSys.GetActiveItem((ToServer(Player), Hands)), Is.EqualTo(uid));
     }
 
     /// <summary>
@@ -224,7 +224,7 @@ public abstract partial class InteractionTest
     /// </summary>
     protected async Task Drop()
     {
-        if (Hands.ActiveHandEntity == null)
+        if (HandSys.GetActiveItem((ToServer(Player), Hands)) == null)
         {
             Assert.Fail("Not holding any entity to drop");
             return;
@@ -232,11 +232,11 @@ public abstract partial class InteractionTest
 
         await Server.WaitPost(() =>
         {
-            Assert.That(HandSys.TryDrop(SEntMan.GetEntity(Player), handsComp: Hands));
+            Assert.That(HandSys.TryDrop((ToServer(Player), Hands)));
         });
 
         await RunTicks(1);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((ToServer(Player), Hands)), Is.Null);
     }
 
     #region Interact
@@ -246,7 +246,7 @@ public abstract partial class InteractionTest
     /// </summary>
     protected async Task UseInHand()
     {
-        if (Hands.ActiveHandEntity is not { } target)
+        if (HandSys.GetActiveItem((ToServer(Player), Hands)) is not { } target)
         {
             Assert.Fail("Not holding any entity");
             return;
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 47a1f748eb..79756ea5b4 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -1,15 +1,12 @@
 #nullable enable
-using System.Linq;
 using System.Numerics;
 using Content.Client.Construction;
 using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.IntegrationTests.Pair;
-using Content.Server.Body.Systems;
 using Content.Server.Hands.Systems;
 using Content.Server.Stack;
 using Content.Server.Tools;
-using Content.Shared.Body.Part;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
@@ -135,10 +132,13 @@ public abstract partial class InteractionTest
 - type: entity
   id: InteractionTestMob
   components:
-  - type: Body
-    prototype: Aghost
   - type: DoAfter
   - type: Hands
+    hands:
+      hand_right: # only one hand, so that they do not accidentally pick up deconstruction products
+        location: Right
+    sortedHands:
+    - hand_right
   - type: ComplexInteraction
   - type: MindContainer
   - type: Stripping
@@ -230,20 +230,6 @@ public abstract partial class InteractionTest
                 SEntMan.DeleteEntity(old.Value);
         });
 
-        // Ensure that the player only has one hand, so that they do not accidentally pick up deconstruction products
-        await Server.WaitPost(() =>
-        {
-            // I lost an hour of my life trying to track down how the hell interaction tests were breaking
-            // so greatz to this. Just make your own body prototype!
-            var bodySystem = SEntMan.System<BodySystem>();
-            var hands = bodySystem.GetBodyChildrenOfType(SEntMan.GetEntity(Player), BodyPartType.Hand).ToArray();
-
-            for (var i = 1; i < hands.Length; i++)
-            {
-                SEntMan.DeleteEntity(hands[i].Id);
-            }
-        });
-
         // Change UI state to in-game.
         var state = Client.ResolveDependency<IStateManager>();
         await Client.WaitPost(() => state.RequestStateChange<GameplayState>());
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
index 4a07177f77..39761ad089 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 @@ namespace Content.IntegrationTests.Tests
   components:
   - type: Inventory
   - type: ContainerContainer
-  - type: StatusEffects
-    allowed:
-    - Stun
+  - type: MobState
 
 - type: entity
   name: InventoryJumpsuitJanitorDummy
@@ -70,7 +68,7 @@ namespace Content.IntegrationTests.Tests
                 });
 #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/Linter/StaticFieldValidationTest.cs b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
index 90bf82e8f1..b75b81ab3c 100644
--- a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
+++ b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
@@ -4,7 +4,6 @@ using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
-using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.IntegrationTests.Tests.Linter;
 
@@ -66,25 +65,25 @@ public sealed class StaticFieldValidationTest
     [Reflect(false)]
     private sealed class StringValid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string Tag = "StaticFieldTestTag";
+        public static readonly ProtoId<TagPrototype> Tag = "StaticFieldTestTag";
     }
 
     [Reflect(false)]
     private sealed class StringInvalid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string Tag = string.Empty;
+        public static readonly ProtoId<TagPrototype> Tag = string.Empty;
     }
 
     [Reflect(false)]
     private sealed class StringArrayValid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
+        public static readonly ProtoId<TagPrototype>[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
     [Reflect(false)]
     private sealed class StringArrayInvalid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
+        public static readonly ProtoId<TagPrototype>[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
     }
 
     [Reflect(false)]
diff --git a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
index 150bc951f8..32fcf9c1ad 100644
--- a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
@@ -1,38 +1,48 @@
 #nullable enable
 using System.Linq;
-using Content.IntegrationTests.Pair;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
-using Content.Server.Players;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.Minds;
 
 [TestFixture]
 public sealed class GhostRoleTests
 {
+    private const string GhostRoleProtoId = "GhostRoleTestEntity";
+    private const string TestMobProtoId = "GhostRoleTestMob";
+
     [TestPrototypes]
-    private const string Prototypes = @"
-- type: entity
-  id: GhostRoleTestEntity
-  components:
-  - type: MindContainer
-  - type: GhostRole
-  - type: GhostTakeoverAvailable
-";
+    private const string Prototypes = $"""
+        - type: entity
+          id: {GhostRoleProtoId}
+          components:
+          - type: MindContainer
+          - type: GhostRole
+          - type: GhostTakeoverAvailable
+          - type: MobState
+
+        - type: entity
+          id: {TestMobProtoId}
+          components:
+          - type: MobState # MobState is required for correct determination of if the player can return to body or not
+        """;
 
     /// <summary>
     /// This is a simple test that just checks if a player can take a ghost role and then regain control of their
     /// original entity without encountering errors.
     /// </summary>
-    [Test]
-    public async Task TakeRoleAndReturn()
+    [TestCase(true)]
+    [TestCase(false)]
+    public async Task TakeRoleAndReturn(bool adminGhost)
     {
+        var ghostCommand = adminGhost ? "aghost" : "ghost";
+
         await using var pair = await PoolManager.GetServerClient(new PoolSettings
         {
             Dirty = true,
@@ -49,36 +59,67 @@ public sealed class GhostRoleTests
         var conHost = client.ResolveDependency<IConsoleHost>();
         var mindSystem = entMan.System<SharedMindSystem>();
         var session = sPlayerMan.Sessions.Single();
-        var originalMindId = session.ContentData()!.Mind!.Value;
+        var originalPlayerMindId = session.ContentData()!.Mind!.Value;
+
+        // Check that there are no ghosts
+        Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
 
         // Spawn player entity & attach
-        EntityUid originalMob = default;
+        EntityUid originalPlayerMob = default;
         await server.WaitPost(() =>
         {
-            originalMob = entMan.SpawnEntity(null, mapData.GridCoords);
-            mindSystem.TransferTo(originalMindId, originalMob, true);
+            originalPlayerMob = entMan.SpawnEntity(TestMobProtoId, mapData.GridCoords);
+            mindSystem.TransferTo(originalPlayerMindId, originalPlayerMob, true);
         });
 
-        // Check player got attached.
         await pair.RunTicksSync(10);
-        Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
-        var originalMind = entMan.GetComponent<MindComponent>(originalMindId);
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.VisitingEntity, Is.Null);
+        var originalPlayerMind = entMan.GetComponent<MindComponent>(originalPlayerMindId);
+        Assert.Multiple(() =>
+        {
+            // Check player got attached.
+            Assert.That(session.AttachedEntity, Is.EqualTo(originalPlayerMob));
+            Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+            Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there are still no ghosts
+            Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
+        });
 
         // Use the ghost command
-        conHost.ExecuteCommand("ghost");
+        conHost.ExecuteCommand(ghostCommand);
         await pair.RunTicksSync(10);
-        var ghost = session.AttachedEntity;
-        Assert.That(entMan.HasComponent<GhostComponent>(ghost));
-        Assert.That(ghost, Is.Not.EqualTo(originalMob));
-        Assert.That(session.ContentData()?.Mind, Is.EqualTo(originalMindId));
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob), $"Original mob: {originalMob}, Ghost: {ghost}");
-        Assert.That(originalMind.VisitingEntity, Is.EqualTo(ghost));
+        var ghostOne = session.AttachedEntity;
+        Assert.Multiple(() =>
+        {
+            // Assert that the ghost is a new entity with a new mind
+            Assert.That(entMan.HasComponent<GhostComponent>(ghostOne));
+            Assert.That(ghostOne, Is.Not.EqualTo(originalPlayerMob));
+            Assert.That(session.ContentData()?.Mind, Is.EqualTo(originalPlayerMindId));
+            if (adminGhost)
+            {
+                // aghost, so the player mob should still own the mind, but the mind is visiting the ghost.
+                Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+                Assert.That(originalPlayerMind.VisitingEntity, Is.EqualTo(ghostOne));
+                Assert.That(originalPlayerMind.UserId, Is.EqualTo(session.UserId));
+            }
+            else
+            {
+                // player ghost, can't return. The mind is owned by the ghost, and is not visiting.
+                Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(ghostOne));
+                Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            }
+
+            // Check that we're tracking the original owner for round end screen
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there is only one ghost
+            Assert.That(entMan.Count<GhostComponent>(), Is.EqualTo(1));
+        });
 
         // Spawn ghost takeover entity.
         EntityUid ghostRole = default;
-        await server.WaitPost(() => ghostRole = entMan.SpawnEntity("GhostRoleTestEntity", mapData.GridCoords));
+        await server.WaitPost(() => ghostRole = entMan.SpawnEntity(GhostRoleProtoId, mapData.GridCoords));
 
         // Take the ghost role
         await server.WaitPost(() =>
@@ -89,40 +130,118 @@ public sealed class GhostRoleTests
 
         // Check player got attached to ghost role.
         await pair.RunTicksSync(10);
-        var newMindId = session.ContentData()!.Mind!.Value;
-        var newMind = entMan.GetComponent<MindComponent>(newMindId);
-        Assert.That(newMindId, Is.Not.EqualTo(originalMindId));
-        Assert.That(session.AttachedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.VisitingEntity, Is.Null);
+        var ghostRoleMindId = session.ContentData()!.Mind!.Value;
+        var ghostRoleMind = entMan.GetComponent<MindComponent>(ghostRoleMindId);
+        Assert.Multiple(() =>
+        {
+            // Check that the ghost role mind is new
+            Assert.That(ghostRoleMindId, Is.Not.EqualTo(originalPlayerMindId));
 
-        // Original mind should be unaffected, but the ghost will have deleted itself.
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.VisitingEntity, Is.Null);
-        Assert.That(entMan.Deleted(ghost));
+            // Check that the session and mind are properly attached to the ghost role
+            Assert.That(session.AttachedEntity, Is.EqualTo(ghostRole));
+            Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostRole));
+            Assert.That(ghostRoleMind.VisitingEntity, Is.Null);
+
+            // Original mind should be unaffected, but the ghost will have deleted itself.
+            if (adminGhost)
+            {
+                // aghost case, the original player mob should still own the mind, and that mind is not visiting.
+                Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+            }
+            else
+            {
+                // player ghost case, the original mind is disconnected and not owned by an entity.
+                // This mind cannot be returned to
+                Assert.That(originalPlayerMind.OwnedEntity, Is.Null);
+            }
+
+            // In either case the original player mind is not visiting anything, not connected to any user.
+            Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            Assert.That(originalPlayerMind.UserId, Is.Null);
+
+            // Now the original owner of both minds should permanently be set to this session.
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+            Assert.That(ghostRoleMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Make sure that the ghost was deleted
+            Assert.That(entMan.Deleted(ghostOne));
+
+            // Check that there is are no lingereing ghosts
+            Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
+        });
 
         // Ghost again.
-        conHost.ExecuteCommand("ghost");
+        conHost.ExecuteCommand(ghostCommand);
         await pair.RunTicksSync(10);
-        var otherGhost = session.AttachedEntity;
-        Assert.That(entMan.HasComponent<GhostComponent>(otherGhost));
-        Assert.That(otherGhost, Is.Not.EqualTo(originalMob));
-        Assert.That(otherGhost, Is.Not.EqualTo(ghostRole));
-        Assert.That(session.ContentData()?.Mind, Is.EqualTo(newMindId));
-        Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.VisitingEntity, Is.EqualTo(session.AttachedEntity));
+        var ghostTwo = session.AttachedEntity;
+        Assert.Multiple(() =>
+        {
+            // Check that the new ghost is a new entity
+            Assert.That(entMan.HasComponent<GhostComponent>(ghostTwo));
+            Assert.That(ghostTwo, Is.Not.EqualTo(originalPlayerMob));
+            Assert.That(ghostTwo, Is.Not.EqualTo(ghostRole));
+            Assert.That(session.ContentData()?.Mind, Is.EqualTo(ghostRoleMindId));
+
+            if(adminGhost)
+            {
+                // aghost case, the ghost role mind should be owned by the ghost role entity,
+                // the ghost role mind is visiting the new ghost
+                Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostRole));
+                Assert.That(ghostRoleMind.VisitingEntity, Is.EqualTo(ghostTwo));
+            }
+            else
+            {
+                // player ghost, can't return. The mind is owned by the ghost, and is not visiting.
+                Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostTwo));
+                Assert.That(ghostRoleMind.VisitingEntity, Is.Null);
+            }
+
+            // Check that the original mind is still not attached to a user
+            Assert.That(originalPlayerMind.UserId, Is.Null);
+
+            // Check that original owners of other minds are still tracked
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+            Assert.That(ghostRoleMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there is exactly one ghost
+            Assert.That(entMan.Count<GhostComponent>(), Is.EqualTo(1));
+        });
+
+        if (!adminGhost)
+        {
+            // End of the normal player ghost role test
+            await pair.CleanReturnAsync();
+            return;
+        }
 
         // Next, control the original entity again:
-        await server.WaitPost(() => mindSystem.SetUserId(originalMindId, session.UserId));
+        await server.WaitPost(() => mindSystem.SetUserId(originalPlayerMindId, session.UserId));
         await pair.RunTicksSync(10);
-        Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
-        Assert.That(originalMind.VisitingEntity, Is.Null);
 
-        // the ghost-role mind is unaffected, though the ghost will have deleted itself
-        Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
-        Assert.That(newMind.VisitingEntity, Is.Null);
-        Assert.That(entMan.Deleted(otherGhost));
+        Assert.Multiple(() =>
+        {
+            // Check that we are attached
+            Assert.That(session.AttachedEntity, Is.EqualTo(originalPlayerMob));
+
+            // Check the ownership of the original mind
+            Assert.That(originalPlayerMind.OwnedEntity, Is.EqualTo(originalPlayerMob));
+            Assert.That(originalPlayerMind.VisitingEntity, Is.Null);
+            Assert.That(originalPlayerMind.UserId, Is.EqualTo(session.UserId));
+
+            // Check that the ghost-role mind is unaffected
+            Assert.That(ghostRoleMind.OwnedEntity, Is.EqualTo(ghostRole));
+            Assert.That(ghostRoleMind.VisitingEntity, Is.Null);
+
+            // Check that the second ghost is deleted
+            Assert.That(entMan.Deleted(ghostTwo));
+
+            // Check that the original owners of the previous minds are still tracked
+            Assert.That(originalPlayerMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+            Assert.That(ghostRoleMind.OriginalOwnerUserId, Is.EqualTo(session.UserId));
+
+            // Check that there is are no lingereing ghosts
+            Assert.That(entMan.Count<GhostComponent>(), Is.Zero);
+        });
 
         await pair.CleanReturnAsync();
     }
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index d4d551f4e0..48e11e4648 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;
@@ -24,6 +24,8 @@ namespace Content.IntegrationTests.Tests.Minds;
 [TestFixture]
 public sealed partial class MindTests
 {
+    private static readonly ProtoId<DamageTypePrototype> BluntDamageType = "Blunt";
+
     [TestPrototypes]
     private const string Prototypes = @"
 - type: entity
@@ -144,7 +146,7 @@ public sealed partial class MindTests
         await server.WaitAssertion(() =>
         {
             var damageable = entMan.GetComponent<DamageableComponent>(entity);
-            if (!protoMan.TryIndex<DamageTypePrototype>("Blunt", out var prototype))
+            if (!protoMan.TryIndex(BluntDamageType, out var prototype))
             {
                 return;
             }
@@ -337,7 +339,7 @@ public sealed partial class MindTests
         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!;
@@ -377,7 +379,7 @@ public sealed partial class MindTests
 
             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/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
index 29f2573c2d..3e49499845 100644
--- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
+++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
@@ -410,7 +410,7 @@ namespace Content.IntegrationTests.Tests.Networking
             {
                 var uid = GetEntity(message.Uid);
 
-                var component = EntityManager.GetComponent<PredictionTestComponent>(uid);
+                var component = Comp<PredictionTestComponent>(uid);
                 var old = component.Foo;
                 if (Allow)
                 {
diff --git a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
index 4db79373d3..f5a15295fd 100644
--- a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
+++ b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
@@ -1,6 +1,6 @@
 using Content.IntegrationTests.Tests.Interaction;
-using Content.Server.Explosion.Components;
-using Content.Shared.Explosion.Components;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
@@ -25,19 +25,19 @@ public sealed class ModularGrenadeTests : InteractionTest
         await InteractUsing(Cable);
 
         // Insert & remove trigger
-        AssertComp<OnUseTimerTriggerComponent>(false);
+        AssertComp<TimerTriggerComponent>(false);
         await InteractUsing(Trigger);
-        AssertComp<OnUseTimerTriggerComponent>();
+        AssertComp<TimerTriggerComponent>();
         await FindEntity(Trigger, LookupFlags.Uncontained, shouldSucceed: false);
         await InteractUsing(Pry);
-        AssertComp<OnUseTimerTriggerComponent>(false);
+        AssertComp<TimerTriggerComponent>(false);
 
         // Trigger was dropped to floor, not deleted.
         await FindEntity(Trigger, LookupFlags.Uncontained);
 
         // Re-insert
         await InteractUsing(Trigger);
-        AssertComp<OnUseTimerTriggerComponent>();
+        AssertComp<TimerTriggerComponent>();
 
         // Insert & remove payload.
         await InteractUsing(Payload);
@@ -56,13 +56,14 @@ public sealed class ModularGrenadeTests : InteractionTest
         await Pickup();
         AssertComp<ActiveTimerTriggerComponent>(false);
         await UseInHand();
+        AssertComp<ActiveTimerTriggerComponent>(true);
 
         // So uhhh grenades in hands don't destroy themselves when exploding. Maybe that will be fixed eventually.
         await Drop();
 
         // Wait until grenade explodes
-        var timer = Comp<ActiveTimerTriggerComponent>();
-        while (timer.TimeRemaining >= 0)
+        var triggerSys = SEntMan.System<TriggerSystem>();
+        while (Target != null && triggerSys.GetRemainingTime(SEntMan.GetEntity(Target.Value))?.TotalSeconds >= 0.0)
         {
             await RunTicks(10);
         }
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 099f24aeb9..bd5d489f05 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -77,6 +77,8 @@ namespace Content.IntegrationTests.Tests
             "Exo",
         };
 
+        private static readonly ProtoId<EntityCategoryPrototype> DoNotMapCategory = "DoNotMap";
+
         // Sunrise-Start
         private static readonly string[] SunriseNoSpawnMaps =
         {
@@ -285,7 +287,7 @@ namespace Content.IntegrationTests.Tests
                 return;
 
             var yamlEntities = node["entities"];
-            if (!protoManager.TryIndex<EntityCategoryPrototype>("DoNotMap", out var dnmCategory))
+            if (!protoManager.TryIndex(DoNotMapCategory, out var dnmCategory))
                 return;
 
             Assert.Multiple(() =>
diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs
index 6978085640..5de6de381d 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 @@ namespace Content.IntegrationTests.Tests
 
             private void OnRoundEnd(RoundEndSystemChangedEvent ev)
             {
-                Interlocked.Increment(ref RoundCount);
+                RoundCount += 1;
             }
         }
 
@@ -127,13 +126,17 @@ namespace Content.IntegrationTests.Tests
 
             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 0000000000..aa2ebef606
--- /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.IntegrationTests/Tests/Station/EvacShuttleTest.cs b/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
index 2203dbe4f6..9e524c624a 100644
--- a/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
+++ b/Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
@@ -3,9 +3,9 @@ using Content.Server._Sunrise.TransitHub;
 using Content.Server.GameTicking;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
-using Content.Server.Station.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Shuttles.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map.Components;
 
diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index d68fdafb76..3fee4a146c 100644
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -17,8 +17,10 @@ namespace Content.IntegrationTests.Tests.Station;
 [TestOf(typeof(StationJobsSystem))]
 public sealed class StationJobsTest
 {
+    private const string StationMapId = "FooStation";
+
     [TestPrototypes]
-    private const string Prototypes = @"
+    private const string Prototypes = $@"
 - type: playTimeTracker
   id: PlayTimeDummyAssistant
 
@@ -35,13 +37,13 @@ public sealed class StationJobsTest
   id: PlayTimeDummyChaplain
 
 - type: gameMap
-  id: FooStation
+  id: {StationMapId}
   minPlayers: 0
-  mapName: FooStation
+  mapName: {StationMapId}
   mapPath: /Maps/Test/empty.yml
   stations:
     Station:
-      mapNameTemplate: FooStation
+      mapNameTemplate: {StationMapId}
       stationProto: StandardNanotrasenStation
       components:
         - type: StationJobs
@@ -87,7 +89,7 @@ public sealed class StationJobsTest
         var server = pair.Server;
 
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-        var fooStationProto = prototypeManager.Index<GameMapPrototype>("FooStation");
+        var fooStationProto = prototypeManager.Index<GameMapPrototype>(StationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
         var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
         var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
@@ -161,7 +163,7 @@ public sealed class StationJobsTest
         var server = pair.Server;
 
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-        var fooStationProto = prototypeManager.Index<GameMapPrototype>("FooStation");
+        var fooStationProto = prototypeManager.Index<GameMapPrototype>(StationMapId);
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
         var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
         var stationSystem = entSysMan.GetEntitySystem<StationSystem>();
diff --git a/Content.IntegrationTests/Tests/StoreTests.cs b/Content.IntegrationTests/Tests/StoreTests.cs
index e6aed78755..39df0fc8cc 100644
--- a/Content.IntegrationTests/Tests/StoreTests.cs
+++ b/Content.IntegrationTests/Tests/StoreTests.cs
@@ -128,7 +128,7 @@ public sealed class StoreTests
 
 
                     var buyMsg = new StoreBuyListingMessage(discountedListingItem.ID){Actor = human};
-                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, buyMsg);
+                    server.EntMan.EventBus.RaiseLocalEvent(pda, buyMsg);
 
                     var newBalance = storeComponent.Balance[UplinkSystem.TelecrystalCurrencyPrototype];
                     Assert.That(newBalance.Value, Is.EqualTo((originalBalance - plainDiscountedCost).Value), "Expected to have balance reduced by discounted cost");
@@ -141,7 +141,7 @@ public sealed class StoreTests
                     Assert.That(costAfterBuy.Value, Is.EqualTo(prototypeCost.Value), "Expected cost after discount refund to be equal to prototype cost.");
 
                     var refundMsg = new StoreRequestRefundMessage { Actor = human };
-                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, refundMsg);
+                    server.EntMan.EventBus.RaiseLocalEvent(pda, refundMsg);
 
                     // get refreshed item after refund re-generated items
                     discountedListingItem = storeComponent.FullListingsCatalog.First(x => x.ID == itemId);
diff --git a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
index eef420df20..0827e11b70 100644
--- a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
+++ b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
@@ -17,7 +17,7 @@ public sealed class TileConstructionTests : InteractionTest
         await SetTile(null);
         await InteractUsing(Rod);
         await AssertTile(Lattice);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
         await InteractUsing(Cut);
         await AssertTile(null);
         await AssertEntityLookup((Rod, 1));
@@ -49,7 +49,7 @@ public sealed class TileConstructionTests : InteractionTest
         AssertGridCount(1);
 
         // Cut lattice
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
         await InteractUsing(Cut);
         await AssertTile(null);
         AssertGridCount(0);
@@ -83,13 +83,13 @@ public sealed class TileConstructionTests : InteractionTest
 
         // Lattice -> Plating
         await InteractUsing(FloorItem);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
         await AssertTile(Plating);
         AssertGridCount(1);
 
         // Plating -> Tile
         await InteractUsing(FloorItem);
-        Assert.That(Hands.ActiveHandEntity, Is.Null);
+        Assert.That(HandSys.GetActiveItem((SEntMan.GetEntity(Player), Hands)), Is.Null);
         await AssertTile(Floor);
         AssertGridCount(1);
 
diff --git a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
index bcaf4343b6..3645667737 100644
--- a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs
@@ -5,6 +5,7 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.VendingMachines;
+using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.Vending;
 
@@ -17,6 +18,7 @@ public sealed class VendingInteractionTest : InteractionTest
     private const string RestockBoxProtoId = "InteractionTestRestockBox";
 
     private const string RestockBoxOtherProtoId = "InteractionTestRestockBoxOther";
+    private static readonly ProtoId<DamageTypePrototype> TestDamageType = "Blunt";
 
     [TestPrototypes]
     private const string TestPrototypes = $@"
@@ -196,7 +198,7 @@ public sealed class VendingInteractionTest : InteractionTest
         Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero), $"{VendingMachineProtoId} started with unexpected damage.");
 
         // Damage the vending machine to the point that it breaks
-        var damageType = ProtoMan.Index<DamageTypePrototype>("Blunt");
+        var damageType = ProtoMan.Index(TestDamageType);
         var damage = new DamageSpecifier(damageType, FixedPoint2.New(100));
         await Server.WaitPost(() => damageableSys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true));
         await RunTicks(5);
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 4644768901..f30eed0651 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -20,6 +20,8 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(VendingMachineSystem))]
     public sealed class VendingMachineRestockTest : EntitySystem
     {
+        private static readonly ProtoId<DamageTypePrototype> TestDamageType = "Blunt";
+
         [TestPrototypes]
         private const string Prototypes = @"
 - type: entity
@@ -293,7 +295,7 @@ namespace Content.IntegrationTests.Tests
                     "Did not start with zero ramen.");
 
                 restock = entityManager.SpawnEntity("TestRestockExplode", coordinates);
-                var damageSpec = new DamageSpecifier(prototypeManager.Index<DamageTypePrototype>("Blunt"), 100);
+                var damageSpec = new DamageSpecifier(prototypeManager.Index(TestDamageType), 100);
                 var damageResult = damageableSystem.TryChangeDamage(restock, damageSpec);
 
 #pragma warning disable NUnit2045
diff --git a/Content.MapRenderer/CommandLineArguments.cs b/Content.MapRenderer/CommandLineArguments.cs
index f75b671dcb..a4f3c83bf2 100644
--- a/Content.MapRenderer/CommandLineArguments.cs
+++ b/Content.MapRenderer/CommandLineArguments.cs
@@ -13,6 +13,7 @@ public sealed class CommandLineArguments
     public string OutputPath { get; set; } = DirectoryExtensions.MapImages().FullName;
     public bool ArgumentsAreFileNames { get; set; } = false;
     public bool ShowMarkers { get; set; } = false;
+    public bool OutputParallax { get; set; } = false;
 
     public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out CommandLineArguments? parsed)
     {
@@ -70,7 +71,17 @@ public sealed class CommandLineArguments
                     PrintHelp();
                     return false;
 
+                case "--parallax":
+                    parsed.OutputParallax = true;
+                    break;
+
                 default:
+                    if (argument.StartsWith('-'))
+                    {
+                        Console.WriteLine($"Unknown argument: {argument}");
+                        return false;
+                    }
+
                     parsed.Maps.Add(argument);
                     break;
             }
@@ -95,7 +106,6 @@ Options:
         Defaults to: png
     --viewer
         Causes the map renderer to create the map.json files required for use with the map viewer.
-        Also puts the maps in the required directory structure.
     -o / --output <output path>
         Changes the path the rendered maps will get saved to.
         Defaults to Resources/MapImages
@@ -104,6 +114,8 @@ Options:
         Example: Content.MapRenderer -f /Maps/box.yml /Maps/bagel.yml
     -m / --markers
         Show hidden markers on map render. Defaults to false.
+    --parallax
+        Output images and data used for map viewer parallax.
     -h / --help
         Displays this help text");
     }
diff --git a/Content.MapRenderer/MapViewerData.cs b/Content.MapRenderer/MapViewerData.cs
index b7b720e004..b58d0c664b 100644
--- a/Content.MapRenderer/MapViewerData.cs
+++ b/Content.MapRenderer/MapViewerData.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Numerics;
-using Robust.Shared.Maths;
+using System.Text.Json.Serialization;
+using Robust.Shared.ContentPack;
+using Robust.Shared.Utility;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace Content.MapRenderer;
@@ -43,31 +45,31 @@ public sealed class LayerGroup
     public GroupSource Source { get; set; } = new();
     public List<Layer> Layers { get; set; } = new();
 
-    public static LayerGroup DefaultParallax()
+    public static LayerGroup DefaultParallax(IResourceManager resourceManager, ParallaxOutput output)
     {
         return new LayerGroup
         {
             Scale = new Position(0.1f, 0.1f),
             Source = new GroupSource
             {
-                Url = "https://i.imgur.com/3YO8KRd.png",
-                Extent = new Extent(6000, 4000)
+                Url = output.ReferenceResourceFile(resourceManager, new ResPath("/Textures/Parallaxes/layer1.png")),
+                Extent = new Extent(6000, 4000),
             },
             Layers = new List<Layer>
             {
                 new()
                 {
-                    Url = "https://i.imgur.com/IannmmK.png"
+                    Url = output.ReferenceResourceFile(resourceManager, new ResPath("/Textures/Parallaxes/layer1.png")),
                 },
                 new()
                 {
-                    Url = "https://i.imgur.com/T3W6JsE.png",
+                    Url = output.ReferenceResourceFile(resourceManager, new ResPath("/Textures/Parallaxes/layer2.png")),
                     Composition = "lighter",
                     ParallaxScale = new Position(0.2f, 0.2f)
                 },
                 new()
                 {
-                    Url = "https://i.imgur.com/T3W6JsE.png",
+                    Url = output.ReferenceResourceFile(resourceManager, new ResPath("/Textures/Parallaxes/layer3.png")),
                     Composition = "lighter",
                     ParallaxScale = new Position(0.3f, 0.3f)
                 }
@@ -91,9 +93,13 @@ public sealed class Layer
 
 public readonly struct Extent
 {
+    [JsonInclude]
     public readonly float X1;
+    [JsonInclude]
     public readonly float Y1;
+    [JsonInclude]
     public readonly float X2;
+    [JsonInclude]
     public readonly float Y2;
 
     public Extent()
@@ -123,7 +129,9 @@ public readonly struct Extent
 
 public readonly struct Position
 {
+    [JsonInclude]
     public readonly float X;
+    [JsonInclude]
     public readonly float Y;
 
     public Position(float x, float y)
diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs
index e861227bcc..991fa74fe1 100644
--- a/Content.MapRenderer/Painters/MapPainter.cs
+++ b/Content.MapRenderer/Painters/MapPainter.cs
@@ -1,149 +1,158 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.IO;
 using System.Threading.Tasks;
+using Content.Client.Markers;
 using Content.IntegrationTests;
+using Content.IntegrationTests.Pair;
 using Content.Server.GameTicking;
 using Robust.Client.GameObjects;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.ContentPack;
 using Robust.Shared.EntitySerialization;
 using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Map.Events;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
 namespace Content.MapRenderer.Painters
 {
-    public sealed class MapPainter
+    public sealed class MapPainter : IAsyncDisposable
     {
-        public static async IAsyncEnumerable<RenderedGridImage<Rgba32>> Paint(string map,
-            bool mapIsFilename = false,
-            bool showMarkers = false)
-        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+        private readonly RenderMap _map;
+        private readonly ITestContextLike _testContextLike;
 
-            await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        private TestPair? _pair;
+        private Entity<MapGridComponent>[] _grids = [];
+
+        public MapPainter(RenderMap map, ITestContextLike testContextLike)
+        {
+            _map = map;
+            _testContextLike = testContextLike;
+        }
+
+        public async Task Initialize()
+        {
+            var stopwatch = RStopwatch.StartNew();
+
+            var poolSettings = new PoolSettings
             {
                 DummyTicker = false,
                 Connected = true,
+                Destructive = true,
                 Fresh = true,
                 // Seriously whoever made MapPainter use GameMapPrototype I wish you step on a lego one time.
-                Map = mapIsFilename ? "Empty" : map,
-            });
-
-            var server = pair.Server;
-            var client = pair.Client;
+                Map = _map is RenderMapPrototype prototype ? prototype.Prototype : PoolManager.TestMap,
+            };
+            _pair = await PoolManager.GetServerClient(poolSettings, _testContextLike);
 
             Console.WriteLine($"Loaded client and server in {(int)stopwatch.Elapsed.TotalMilliseconds} ms");
 
-            stopwatch.Restart();
-
-            var cEntityManager = client.ResolveDependency<IClientEntityManager>();
-            var cPlayerManager = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
-
-            await client.WaitPost(() =>
+            if (_map is RenderMapFile mapFile)
             {
-                if (cEntityManager.TryGetComponent(cPlayerManager.LocalEntity, out SpriteComponent? sprite))
+                using var stream = File.OpenRead(mapFile.FileName);
+
+                await _pair.Server.WaitPost(() =>
                 {
-                    cEntityManager.System<SpriteSystem>().SetVisible((cPlayerManager.LocalEntity.Value, sprite), false);
+                    var loadOptions = new MapLoadOptions
+                    {
+                        // Accept loading both maps and grids without caring about what the input file truly is.
+                        DeserializationOptions =
+                        {
+                            LogOrphanedGrids = false,
+                        },
+                    };
+
+                    if (!_pair.Server.System<MapLoaderSystem>().TryLoadGeneric(stream, mapFile.FileName, out var loadResult, loadOptions))
+                        throw new IOException($"File {mapFile.FileName} could not be read");
+
+                    _grids = loadResult.Grids.ToArray();
+                });
+            }
+        }
+
+        public async Task SetupView(bool showMarkers)
+        {
+            if (_pair == null)
+                throw new InvalidOperationException("Instance not initialized!");
+
+            await _pair.Client.WaitPost(() =>
+            {
+                if (_pair.Client.EntMan.TryGetComponent(_pair.Client.PlayerMan.LocalEntity, out SpriteComponent? sprite))
+                {
+                    _pair.Client.System<SpriteSystem>()
+                        .SetVisible((_pair.Client.PlayerMan.LocalEntity.Value, sprite), false);
                 }
             });
 
             if (showMarkers)
-                await pair.WaitClientCommand("showmarkers");
+            {
+                await _pair.Client.WaitPost(() =>
+                {
+                    _pair.Client.System<MarkerSystem>().MarkersVisible = true;
+                });
+            }
+        }
+
+        public async Task<MapViewerData> GenerateMapViewerData(ParallaxOutput? parallaxOutput)
+        {
+            if (_pair == null)
+                throw new InvalidOperationException("Instance not initialized!");
+
+            var mapShort = _map.ShortName;
+
+            string fullName;
+            if (_map is RenderMapPrototype prototype)
+            {
+                fullName = _pair.Server.ProtoMan.Index(prototype.Prototype).MapName;
+            }
+            else
+            {
+                fullName = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(mapShort);
+            }
+
+            var mapViewerData = new MapViewerData
+            {
+                Id = mapShort,
+                Name = fullName,
+            };
+
+            if (parallaxOutput != null)
+            {
+                await _pair.Client.WaitPost(() =>
+                {
+                    var res = _pair.Client.InstanceDependencyCollection.Resolve<IResourceManager>();
+                    mapViewerData.ParallaxLayers.Add(LayerGroup.DefaultParallax(res, parallaxOutput));
+                });
+            }
+
+            return mapViewerData;
+        }
+
+        public async IAsyncEnumerable<RenderedGridImage<Rgba32>> Paint()
+        {
+            if (_pair == null)
+                throw new InvalidOperationException("Instance not initialized!");
+
+            var client = _pair.Client;
+            var server = _pair.Server;
 
             var sEntityManager = server.ResolveDependency<IServerEntityManager>();
             var sPlayerManager = server.ResolveDependency<IPlayerManager>();
 
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var mapLoader = entityManager.System<MapLoaderSystem>();
             var mapSys = entityManager.System<SharedMapSystem>();
-            var deps = server.ResolveDependency<IEntitySystemManager>().DependencyCollection;
 
-            Entity<MapGridComponent>[] grids = [];
-
-            if (mapIsFilename)
-            {
-                var resPath = new ResPath(map);
-
-                if (!mapLoader.TryReadFile(resPath, out var data))
-                    throw new IOException($"File {map} could not be read");
-
-                var ev = new BeforeEntityReadEvent();
-                server.EntMan.EventBus.RaiseEvent(EventSource.Local, ev);
-
-                var deserializer = new EntityDeserializer(deps,
-                    data,
-                    DeserializationOptions.Default,
-                    ev.RenamedPrototypes,
-                    ev.DeletedPrototypes);
-
-                if (!deserializer.TryProcessData())
-                {
-                    throw new IOException($"Failed to process entity data in {map}");
-                }
-
-                if (deserializer.Result.Category == FileCategory.Unknown && deserializer.Result.Version < 7)
-                {
-                    var mapCount = 0;
-                    var gridCount = 0;
-                    foreach (var (entId, ent) in deserializer.YamlEntities)
-                    {
-                        if (ent.Components != null && ent.Components.ContainsKey("MapGrid"))
-                        {
-                            gridCount++;
-                        }
-                        if (ent.Components != null && ent.Components.ContainsKey("Map"))
-                        {
-                            mapCount++;
-                        }
-                    }
-                    if (mapCount == 1)
-                        deserializer.Result.Category = FileCategory.Map;
-                    else if (mapCount == 0 && gridCount == 1)
-                        deserializer.Result.Category = FileCategory.Grid;
-                }
-
-                switch (deserializer.Result.Category)
-                {
-                    case FileCategory.Map:
-                        await server.WaitPost(() =>
-                        {
-                            if (mapLoader.TryLoadMap(resPath, out _, out var loadedGrids))
-                            {
-                                grids = loadedGrids.ToArray();
-                            }
-                        });
-                        break;
-
-                    case FileCategory.Grid:
-                        await server.WaitPost(() =>
-                        {
-                            if (mapLoader.TryLoadGrid(resPath, out _, out var loadedGrids))
-                            {
-                                grids = [(Entity<MapGridComponent>)loadedGrids];
-                            }
-                        });
-                        break;
-
-                    default:
-                        throw new IOException($"Unknown category {deserializer.Result.Category}");
-
-                }
-            }
-
-            await pair.RunTicksSync(10);
+            await _pair.RunTicksSync(10);
             await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
 
             var sMapManager = server.ResolveDependency<IMapManager>();
@@ -162,23 +171,23 @@ namespace Content.MapRenderer.Painters
                     sEntityManager.DeleteEntity(playerEntity.Value);
                 }
 
-                if (!mapIsFilename)
+                if (_map is RenderMapPrototype)
                 {
                     var mapId = sEntityManager.System<GameTicker>().DefaultMap;
-                    grids = sMapManager.GetAllGrids(mapId).ToArray();
+                    _grids = sMapManager.GetAllGrids(mapId).ToArray();
                 }
 
-                foreach (var (uid, _) in grids)
+                foreach (var (uid, _) in _grids)
                 {
                     var gridXform = xformQuery.GetComponent(uid);
                     xformSystem.SetWorldRotation(gridXform, Angle.Zero);
                 }
             });
 
-            await pair.RunTicksSync(10);
+            await _pair.RunTicksSync(10);
             await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
 
-            foreach (var (uid, grid) in grids)
+            foreach (var (uid, grid) in _grids)
             {
                 var tiles = mapSys.GetAllTiles(uid, grid).ToList();
                 if (tiles.Count == 0)
@@ -219,16 +228,20 @@ namespace Content.MapRenderer.Painters
 
                 yield return renderedImage;
             }
+        }
 
-            // We don't care if it fails as we have already saved the images.
-            try
-            {
-                await pair.CleanReturnAsync();
-            }
-            catch
-            {
-                // ignored
-            }
+        public async Task CleanReturnAsync()
+        {
+            if (_pair == null)
+                throw new InvalidOperationException("Instance not initialized!");
+
+            await _pair.CleanReturnAsync();
+        }
+
+        public async ValueTask DisposeAsync()
+        {
+            if (_pair != null)
+                await _pair.DisposeAsync();
         }
     }
 }
diff --git a/Content.MapRenderer/ParallaxOutput.cs b/Content.MapRenderer/ParallaxOutput.cs
new file mode 100644
index 0000000000..bedbb1dc53
--- /dev/null
+++ b/Content.MapRenderer/ParallaxOutput.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.IO;
+using Robust.Shared.ContentPack;
+using Robust.Shared.Utility;
+
+namespace Content.MapRenderer;
+
+/// <summary>
+/// Helper class for collecting the files used for parallax output
+/// </summary>
+public sealed class ParallaxOutput
+{
+    public const string OutputDirectory = "_parallax";
+
+    public readonly HashSet<ResPath> FilesToCopy = [];
+
+    private readonly string _outputPath;
+
+    /// <summary>
+    /// Helper class for collecting the files used for parallax output
+    /// </summary>
+    public ParallaxOutput(string outputPath)
+    {
+        _outputPath = outputPath;
+        Directory.CreateDirectory(Path.Combine(_outputPath, OutputDirectory));
+    }
+
+    public string ReferenceResourceFile(IResourceManager resourceManager, ResPath path)
+    {
+        var fileName = Path.Combine(OutputDirectory, path.Filename);
+        if (FilesToCopy.Add(path))
+        {
+            using var file = resourceManager.ContentFileRead(path);
+            using var target = File.Create(Path.Combine(_outputPath, fileName));
+
+            file.CopyTo(target);
+        }
+
+        return fileName;
+    }
+}
diff --git a/Content.MapRenderer/Program.cs b/Content.MapRenderer/Program.cs
index 115d83e65e..9d7843bcd0 100644
--- a/Content.MapRenderer/Program.cs
+++ b/Content.MapRenderer/Program.cs
@@ -3,12 +3,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Content.IntegrationTests;
 using Content.MapRenderer.Painters;
 using Content.Server.Maps;
-using Newtonsoft.Json;
 using Robust.Shared.Prototypes;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Webp;
@@ -21,20 +20,19 @@ namespace Content.MapRenderer
         private static readonly Func<string, string> ChosenMapIdNotIntMessage = id => $"The chosen id is not a valid integer: {id}";
         private static readonly Func<int, string> NoMapFoundWithIdMessage = id => $"No map found with chosen id: {id}";
 
-        private static readonly MapPainter MapPainter = new();
-
         internal static async Task Main(string[] args)
         {
-
             if (!CommandLineArguments.TryParse(args, out var arguments))
                 return;
 
+            var testContext = new ExternalTestContext("Content.MapRenderer", Console.Out);
+
             PoolManager.Startup();
             if (arguments.Maps.Count == 0)
             {
                 Console.WriteLine("Didn't specify any maps to paint! Loading the map list...");
 
-                await using var pair = await PoolManager.GetServerClient();
+                await using var pair = await PoolManager.GetServerClient(testContext: testContext);
                 var mapIds = pair.Server
                     .ResolveDependency<IPrototypeManager>()
                     .EnumeratePrototypes<GameMapPrototype>()
@@ -104,45 +102,118 @@ namespace Content.MapRenderer
                 Console.WriteLine($"Selected maps: {string.Join(", ", selectedMapPrototypes)}");
             }
 
+            var maps = new List<RenderMap>();
+
             if (arguments.ArgumentsAreFileNames)
             {
                 Console.WriteLine("Retrieving maps by file names...");
+
+                //
+                // Handle legacy command line processing:
+                // Ideally, people pass file names that are relative to the process working directory.
+                // i.e. regular command-line behavior.
+                //
+                // However, the map renderer was originally written to only handle gameMap prototypes,
+                // so it would actually go through the list of prototypes and match file name arguments
+                // via a *very* coarse check.
+                //
+                // So if we have any input filenames that don't exist... we run the old behavior.
+                // Yes by the way this means a typo means spinning up an entire integration pool pair
+                // before the map renderer can report a proper failure.
+                //
+                // Note that this legacy processing is very important! The map server currently relies on it,
+                // because it wants to work with file names, but we *need* to resolve the input to a prototype
+                // to properly export viewer JSON data.
+                //
+
+                var lookupPrototypeFiles = new List<string>();
+
+                foreach (var map in arguments.Maps)
+                {
+                    if (File.Exists(map))
+                    {
+                        maps.Add(new RenderMapFile { FileName = map });
+                    }
+                    else
+                    {
+                        lookupPrototypeFiles.Add(map);
+                    }
+                }
+
+                if (lookupPrototypeFiles.Count > 0)
+                {
+                    Console.Write($"Following map files did not exist on disk directly, searching through prototypes: {string.Join(", ", lookupPrototypeFiles)}");
+
+                    await using var pair = await PoolManager.GetServerClient();
+                    var mapPrototypes = pair.Server
+                        .ResolveDependency<IPrototypeManager>()
+                        .EnumeratePrototypes<GameMapPrototype>()
+                        .ToArray();
+
+                    foreach (var toFind in lookupPrototypeFiles)
+                    {
+                        foreach (var mapPrototype in mapPrototypes)
+                        {
+                            if (mapPrototype.MapPath.Filename == toFind)
+                            {
+                                maps.Add(new RenderMapPrototype { Prototype = mapPrototype, });
+                                Console.WriteLine($"Found matching map prototype: {mapPrototype.MapName}");
+                                goto found;
+                            }
+                        }
+
+                        await Console.Error.WriteLineAsync($"Found no map prototype for file '{toFind}'!");
+
+                        found: ;
+                    }
+                }
+            }
+            else
+            {
+                foreach (var map in arguments.Maps)
+                {
+                    maps.Add(new RenderMapPrototype { Prototype = map });
+                }
             }
 
-            await Run(arguments);
+            await Run(arguments, maps, testContext);
             PoolManager.Shutdown();
         }
 
-        private static async Task Run(CommandLineArguments arguments)
+        private static async Task Run(
+            CommandLineArguments arguments,
+            List<RenderMap> toRender,
+            ExternalTestContext testContext)
         {
-            Console.WriteLine($"Creating images for {arguments.Maps.Count} maps");
+            Console.WriteLine($"Creating images for {toRender.Count} maps");
+
+            var parallaxOutput = arguments.OutputParallax ? new ParallaxOutput(arguments.OutputPath) : null;
 
             var mapNames = new List<string>();
-            foreach (var map in arguments.Maps)
+            foreach (var map in toRender)
             {
                 Console.WriteLine($"Painting map {map}");
 
-                var mapViewerData = new MapViewerData
-                {
-                    Id = map,
-                    Name = Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(map)
-                };
+                await using var painter = new MapPainter(map, testContext);
+                await painter.Initialize();
+                await painter.SetupView(showMarkers: arguments.ShowMarkers);
 
-                mapViewerData.ParallaxLayers.Add(LayerGroup.DefaultParallax());
-                var directory = Path.Combine(arguments.OutputPath, Path.GetFileNameWithoutExtension(map));
+                var mapViewerData = await painter.GenerateMapViewerData(parallaxOutput);
+
+                var mapShort = map.ShortName;
+                var directory = Path.Combine(arguments.OutputPath, mapShort);
+
+                mapNames.Add(mapShort);
 
                 var i = 0;
                 try
                 {
-                    await foreach (var renderedGrid in MapPainter.Paint(map,
-                                       arguments.ArgumentsAreFileNames,
-                                       arguments.ShowMarkers))
+                    await foreach (var renderedGrid in painter.Paint())
                     {
                         var grid = renderedGrid.Image;
                         Directory.CreateDirectory(directory);
 
-                        var fileName = Path.GetFileNameWithoutExtension(map);
-                        var savePath = $"{directory}{Path.DirectorySeparatorChar}{fileName}-{i}.{arguments.Format}";
+                        var savePath = $"{directory}{Path.DirectorySeparatorChar}{mapShort}-{i}.{arguments.Format}";
 
                         Console.WriteLine($"Writing grid of size {grid.Width}x{grid.Height} to {savePath}");
 
@@ -167,9 +238,7 @@ namespace Content.MapRenderer
 
                         grid.Dispose();
 
-                        mapViewerData.Grids.Add(new GridLayer(renderedGrid, Path.Combine(map, Path.GetFileName(savePath))));
-
-                        mapNames.Add(fileName);
+                        mapViewerData.Grids.Add(new GridLayer(renderedGrid, Path.Combine(mapShort, Path.GetFileName(savePath))));
                         i++;
                     }
                 }
@@ -182,8 +251,17 @@ namespace Content.MapRenderer
 
                 if (arguments.ExportViewerJson)
                 {
-                    var json = JsonConvert.SerializeObject(mapViewerData);
-                    await File.WriteAllTextAsync(Path.Combine(arguments.OutputPath, map, "map.json"), json);
+                    var json = JsonSerializer.Serialize(mapViewerData);
+                    await File.WriteAllTextAsync(Path.Combine(directory, "map.json"), json);
+                }
+
+                try
+                {
+                    await painter.CleanReturnAsync();
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine($"Exception while shutting down painter: {e}");
                 }
             }
 
diff --git a/Content.MapRenderer/RenderMap.cs b/Content.MapRenderer/RenderMap.cs
new file mode 100644
index 0000000000..4ebf4ee5d4
--- /dev/null
+++ b/Content.MapRenderer/RenderMap.cs
@@ -0,0 +1,55 @@
+using System.IO;
+using Content.Server.Maps;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.MapRenderer;
+
+/// <summary>
+/// A single target map that the map renderer should render.
+/// </summary>
+/// <seealso cref="RenderMapPrototype"/>
+/// <seealso cref="RenderMapFile"/>
+public abstract class RenderMap
+{
+    /// <summary>
+    /// Short identifier of the map that should be unique-ish. Used in file names and other important stuff.
+    /// </summary>
+    public abstract string ShortName { get; }
+}
+
+/// <summary>
+/// Specifies a map prototype that the map renderer should render.
+/// </summary>
+public sealed class RenderMapPrototype : RenderMap
+{
+    /// <summary>
+    /// The ID of the prototype to render.
+    /// </summary>
+    public required ProtoId<GameMapPrototype> Prototype;
+
+    public override string ShortName => Prototype;
+
+    public override string ToString()
+    {
+        return $"{nameof(RenderMapPrototype)}({Prototype})";
+    }
+}
+
+/// <summary>
+/// Specifies a map file on disk that the map renderer should render.
+/// </summary>
+public sealed class RenderMapFile : RenderMap
+{
+    /// <summary>
+    /// The path to the file that should be rendered. This is an OS disk path, *not* a <see cref="ResPath"/>.
+    /// </summary>
+    public required string FileName;
+
+    public override string ShortName => Path.GetFileNameWithoutExtension(FileName);
+
+    public override string ToString()
+    {
+        return $"{nameof(RenderMapFile)}({FileName})";
+    }
+}
diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index eae400c07c..e375a7096d 100644
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -51,7 +51,7 @@ public static class ServerPackaging
         // Python script had Npgsql. though we want Npgsql.dll as well soooo
         "Npgsql",
         "Microsoft",
-        "Discord",
+        "NetCord",
     };
 
     private static readonly List<string> ServerNotExtraAssemblies = new()
diff --git a/Content.Replay/Content.Replay.csproj b/Content.Replay/Content.Replay.csproj
index 9785870143..28cfc7f666 100644
--- a/Content.Replay/Content.Replay.csproj
+++ b/Content.Replay/Content.Replay.csproj
@@ -6,7 +6,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Replay\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
deleted file mode 100644
index 24ffe5d023..0000000000
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Content.Shared.Alert;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Abilities.Mime
-{
-    /// <summary>
-    /// Lets its owner entity use mime powers, like placing invisible walls.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class MimePowersComponent : Component
-    {
-        /// <summary>
-        /// Whether this component is active or not.
-        /// </summarY>
-        [DataField("enabled")]
-        public bool Enabled = true;
-
-        /// <summary>
-        /// The wall prototype to use.
-        /// </summary>
-        [DataField("wallPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string WallPrototype = "WallInvisible";
-
-        [DataField("invisibleWallAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? InvisibleWallAction = "ActionMimeInvisibleWall";
-
-        [DataField("invisibleWallActionEntity")] public EntityUid? InvisibleWallActionEntity;
-
-        // The vow zone lies below
-        public bool VowBroken = false;
-
-        /// <summary>
-        /// Whether this mime is ready to take the vow again.
-        /// Note that if they already have the vow, this is also false.
-        /// </summary>
-        public bool ReadyToRepent = false;
-
-        /// <summary>
-        /// Time when the mime can repent their vow
-        /// </summary>
-        [DataField("vowRepentTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan VowRepentTime = TimeSpan.Zero;
-
-        /// <summary>
-        /// How long it takes the mime to get their powers back
-        /// </summary>
-        [DataField("vowCooldown")]
-        public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
-
-        [DataField]
-        public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
-
-        [DataField]
-        public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
-
-        /// <summary>
-        /// Does this component prevent the mime from writing on paper while their vow is active?
-        /// </summary>
-        [DataField]
-        public bool PreventWriting = false;
-
-        /// <summary>
-        /// What message is displayed when the mime fails to write?
-        /// </summary>
-        [DataField]
-        public LocId FailWriteMessage = "paper-component-illiterate-mime";
-    }
-}
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
deleted file mode 100644
index 3de356f608..0000000000
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using Content.Server.Popups;
-using Content.Shared.Abilities.Mime;
-using Content.Shared.Actions;
-using Content.Shared.Actions.Events;
-using Content.Shared.Alert;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Maps;
-using Content.Shared.Paper;
-using Content.Shared.Physics;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-using Content.Shared.Speech.Muting;
-
-namespace Content.Server.Abilities.Mime
-{
-    public sealed class MimePowersSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-        [Dependency] private readonly TurfSystem _turf = default!;
-        [Dependency] private readonly IMapManager _mapMan = default!;
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
-
-            SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
-            SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            // Queue to track whether mimes can retake vows yet
-
-            var query = EntityQueryEnumerator<MimePowersComponent>();
-            while (query.MoveNext(out var uid, out var mime))
-            {
-                if (!mime.VowBroken || mime.ReadyToRepent)
-                    continue;
-
-                if (_timing.CurTime < mime.VowRepentTime)
-                    continue;
-
-                mime.ReadyToRepent = true;
-                _popupSystem.PopupEntity(Loc.GetString("mime-ready-to-repent"), uid, uid);
-            }
-        }
-
-        private void OnComponentInit(EntityUid uid, MimePowersComponent component, ComponentInit args)
-        {
-            EnsureComp<MutedComponent>(uid);
-            if (component.PreventWriting)
-            {
-                EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
-                illiterateComponent.FailWriteMessage = component.FailWriteMessage;
-                Dirty(uid, illiterateComponent);
-            }
-
-            _alertsSystem.ShowAlert(uid, component.VowAlert);
-            _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
-        }
-
-        /// <summary>
-        /// Creates an invisible wall in a free space after some checks.
-        /// </summary>
-        private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, InvisibleWallActionEvent args)
-        {
-            if (!component.Enabled)
-                return;
-
-            if (_container.IsEntityOrParentInContainer(uid))
-                return;
-
-            var xform = Transform(uid);
-            // Get the tile in front of the mime
-            var offsetValue = xform.LocalRotation.ToWorldVec();
-            var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
-            var tile = coords.GetTileRef(EntityManager, _mapMan);
-            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/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 51d35c50a4..68bdd6b9a9 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -113,7 +113,7 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
 
         if (component.TargetAccessReaderId is { Valid: true } accessReader)
         {
-            targetLabel = Loc.GetString("access-overrider-window-target-label") + " " + EntityManager.GetComponent<MetaDataComponent>(component.TargetAccessReaderId).EntityName;
+            targetLabel = Loc.GetString("access-overrider-window-target-label") + " " + Comp<MetaDataComponent>(component.TargetAccessReaderId).EntityName;
             targetLabelColor = Color.White;
 
             if (!_accessReader.GetMainAccessReader(accessReader, out var accessReaderEnt))
@@ -125,7 +125,7 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
 
         if (component.PrivilegedIdSlot.Item is { Valid: true } idCard)
         {
-            privilegedIdName = EntityManager.GetComponent<MetaDataComponent>(idCard).EntityName;
+            privilegedIdName = Comp<MetaDataComponent>(idCard).EntityName;
 
             if (component.TargetAccessReaderId is { Valid: true })
             {
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index 793a15ffda..f5ca018406 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -73,7 +73,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         List<ProtoId<AccessLevelPrototype>>? possibleAccess = null;
         if (component.PrivilegedIdSlot.Item is { Valid: true } item)
         {
-            privilegedIdName = EntityManager.GetComponent<MetaDataComponent>(item).EntityName;
+            privilegedIdName = Comp<MetaDataComponent>(item).EntityName;
             possibleAccess = _accessReader.FindAccessTags(item).ToList();
         }
 
@@ -95,8 +95,8 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         }
         else
         {
-            var targetIdComponent = EntityManager.GetComponent<IdCardComponent>(targetId);
-            var targetAccessComponent = EntityManager.GetComponent<AccessComponent>(targetId);
+            var targetIdComponent = Comp<IdCardComponent>(targetId);
+            var targetAccessComponent = Comp<AccessComponent>(targetId);
 
             var jobProto = targetIdComponent.JobPrototype ?? new ProtoId<AccessLevelPrototype>(string.Empty);
             if (TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index 05ee45b463..0fef62d970 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -47,12 +47,12 @@ public sealed class IdCardSystem : SharedIdCardSystem
                 {
                     _popupSystem.PopupCoordinates(Loc.GetString("id-card-component-microwave-burnt", ("id", uid)),
                      transformComponent.Coordinates, PopupType.Medium);
-                    EntityManager.SpawnEntity("FoodBadRecipe",
+                    Spawn("FoodBadRecipe",
                         transformComponent.Coordinates);
                 }
                 _adminLogger.Add(LogType.Action, LogImpact.Medium,
                     $"{ToPrettyString(args.Microwave)} burnt {ToPrettyString(uid):entity}");
-                EntityManager.QueueDeleteEntity(uid);
+                QueueDel(uid);
                 return;
             }
 
diff --git a/Content.Server/Actions/Commands/AddActionCommand.cs b/Content.Server/Actions/Commands/AddActionCommand.cs
new file mode 100644
index 0000000000..5b80c92aa9
--- /dev/null
+++ b/Content.Server/Actions/Commands/AddActionCommand.cs
@@ -0,0 +1,74 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Components;
+using Content.Shared.Administration;
+using Content.Shared.Prototypes;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Actions.Commands;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class AddActionCommand : LocalizedEntityCommands
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override string Command => "addaction";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString(Loc.GetString("cmd-addaction-invalid-args")));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var targetUidNet) || !EntityManager.TryGetEntity(targetUidNet, out var targetEntity))
+        {
+            shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number"));
+            return;
+        }
+
+        if (!EntityManager.HasComponent<ActionsComponent>(targetEntity))
+        {
+            shell.WriteError(Loc.GetString("cmd-addaction-actions-not-found"));
+            return;
+        }
+
+        if (!_prototypeManager.TryIndex<EntityPrototype>(args[1], out var proto) ||
+            !proto.HasComponent<ActionComponent>())
+        {
+            shell.WriteError(Loc.GetString("cmd-addaction-action-not-found", ("action", args[1])));
+            return;
+        }
+
+        if (_actions.AddAction(targetEntity.Value, args[1]) == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-addaction-adding-failed"));
+        }
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                CompletionHelper.Components<ActionsComponent>(args[0]),
+                Loc.GetString("cmd-addaction-player-completion"));
+        }
+
+        if (args.Length != 2)
+            return CompletionResult.Empty;
+
+        var actionPrototypes = _prototypeManager.EnumeratePrototypes<EntityPrototype>()
+            .Where(p => p.HasComponent<ActionComponent>())
+            .Select(p => p.ID)
+            .Order();
+
+        return CompletionResult.FromHintOptions(
+            actionPrototypes,
+            Loc.GetString("cmd-addaction-action-completion"));
+    }
+}
diff --git a/Content.Server/Actions/Commands/RemoveActionCommand.cs b/Content.Server/Actions/Commands/RemoveActionCommand.cs
new file mode 100644
index 0000000000..541f8f88f9
--- /dev/null
+++ b/Content.Server/Actions/Commands/RemoveActionCommand.cs
@@ -0,0 +1,84 @@
+using Content.Server.Administration;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Components;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server.Actions.Commands;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class RemoveActionCommand : LocalizedEntityCommands
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+
+    public override string Command => "rmaction";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString(Loc.GetString("cmd-rmaction-invalid-args")));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var targetUidNet) || !EntityManager.TryGetEntity(targetUidNet, out var targetEntity))
+        {
+            shell.WriteLine(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[0])));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[1], out var targetActionUidNet) || !EntityManager.TryGetEntity(targetActionUidNet, out var targetActionEntity))
+        {
+            shell.WriteLine(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[1])));
+            return;
+        }
+
+        if (!EntityManager.HasComponent<ActionsComponent>(targetEntity))
+        {
+            shell.WriteError(Loc.GetString("cmd-rmaction-actions-not-found"));
+            return;
+        }
+
+        if (_actions.GetAction(targetActionEntity) is not { } ent)
+        {
+            shell.WriteError(Loc.GetString("cmd-rmaction-not-an-action"));
+            return;
+        }
+
+        _actions.SetTemporary(ent.Owner, true);
+
+        _actions.RemoveAction(ent.Owner);
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                CompletionHelper.Components<ActionsComponent>(args[0]),
+                Loc.GetString("cmd-rmaction-player-completion"));
+        }
+
+        if (args.Length == 2)
+        {
+            if (!NetEntity.TryParse(args[0], out var targetUidNet) || !EntityManager.TryGetEntity(targetUidNet, out var targetEntity))
+                return CompletionResult.Empty;
+
+            if (!EntityManager.HasComponent<ActionsComponent>(targetEntity))
+                return CompletionResult.Empty;
+
+            var actions = _actions.GetActions(targetEntity.Value);
+
+            var options = new List<CompletionOption>();
+            foreach (var action in actions)
+            {
+                var hint = Loc.GetString("cmd-rmaction-action-info", ("action", action));
+                options.Add(new CompletionOption(action.Owner.ToString(), hint));
+            }
+
+            return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-rmaction-action-completion"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/Commands/AddBodyPartCommand.cs b/Content.Server/Administration/Commands/AddBodyPartCommand.cs
index 892a88d41a..a28fa93ad0 100644
--- a/Content.Server/Administration/Commands/AddBodyPartCommand.cs
+++ b/Content.Server/Administration/Commands/AddBodyPartCommand.cs
@@ -3,52 +3,41 @@ using Content.Shared.Administration;
 using Content.Shared.Body.Part;
 using Robust.Shared.Console;
 
-namespace Content.Server.Administration.Commands
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AddBodyPartCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class AddBodyPartCommand : IConsoleCommand
+    [Dependency] private readonly BodySystem _bodySystem = default!;
+
+    public override string Command => "addbodypart";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-
-        public string Command => "addbodypart";
-        public string Description => "Adds a given entity to a containing body.";
-        public string Help => "Usage: addbodypart <entity uid> <body uid> <part slot> <part type>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        if (args.Length != 4)
         {
-            if (args.Length != 3)
-            {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[0], out var childNetId))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[1], out var parentNetId))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            var childId = _entManager.GetEntity(childNetId);
-            var parentId = _entManager.GetEntity(parentNetId);
-            var bodySystem = _entManager.System<BodySystem>();
-
-
-
-            if (Enum.TryParse<BodyPartType>(args[3], out var partType) &&
-                bodySystem.TryCreatePartSlotAndAttach(parentId, args[2], childId, partType))
-            {
-                shell.WriteLine($@"Added {childId} to {parentId}.");
-            }
-            else
-            {
-                shell.WriteError($@"Could not add {childId} to {parentId}.");
-            }
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
         }
+
+        if (!NetEntity.TryParse(args[0], out var childNetId) || !EntityManager.TryGetEntity(childNetId, out var childId))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-uid", ("uid", args[0])));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[1], out var parentNetId) || !EntityManager.TryGetEntity(parentNetId, out var parentId))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-uid", ("uid", args[1])));
+            return;
+        }
+
+        if (Enum.TryParse<BodyPartType>(args[3], out var partType) &&
+            _bodySystem.TryCreatePartSlotAndAttach(parentId.Value, args[2], childId.Value, partType))
+        {
+            shell.WriteLine($@"Added {childId} to {parentId}.");
+        }
+        else
+            shell.WriteError($@"Could not add {childId} to {parentId}.");
     }
 }
diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs
index 51e9823cc4..0866aed78a 100644
--- a/Content.Server/Administration/Commands/AdminWhoCommand.cs
+++ b/Content.Server/Administration/Commands/AdminWhoCommand.cs
@@ -7,33 +7,31 @@ using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Commands;
 
-[AnyCommand] // Sunrise-Edit
-public sealed class AdminWhoCommand : IConsoleCommand
+[AdminCommand(AdminFlags.AdminWho)]
+public sealed class AdminWhoCommand : LocalizedCommands
 {
-    public string Command => "adminwho";
-    public string Description => "Returns a list of all admins on the server";
-    public string Help => "Usage: adminwho";
+    [Dependency] private readonly IAfkManager _afkManager = default!;
+    [Dependency] private readonly IAdminManager _adminManager = default!;
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "adminwho";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var adminMgr = IoCManager.Resolve<IAdminManager>();
-        var afk = IoCManager.Resolve<IAfkManager>();
-
         var seeStealth = true;
 
         // If null it (hopefully) means it is being called from the console.
         if (shell.Player != null)
         {
-            var playerData = adminMgr.GetAdminData(shell.Player);
+            var playerData = _adminManager.GetAdminData(shell.Player);
 
             seeStealth = playerData != null && playerData.CanStealth();
         }
 
         var sb = new StringBuilder();
         var first = true;
-        foreach (var admin in adminMgr.ActiveAdmins)
+        foreach (var admin in _adminManager.ActiveAdmins)
         {
-            var adminData = adminMgr.GetAdminData(admin)!;
+            var adminData = _adminManager.GetAdminData(admin)!;
             DebugTools.AssertNotNull(adminData);
 
             if (adminData.Stealth && !seeStealth)
@@ -50,9 +48,9 @@ public sealed class AdminWhoCommand : IConsoleCommand
             if (adminData.Stealth)
                 sb.Append(" (S)");
 
-            if (shell.Player is { } player && adminMgr.HasAdminFlag(player, AdminFlags.Admin))
+            if (shell.Player is { } player && _adminManager.HasAdminFlag(player, AdminFlags.Admin))
             {
-                if (afk.IsAfk(admin))
+                if (_afkManager.IsAfk(admin))
                     sb.Append(" [AFK]");
             }
         }
diff --git a/Content.Server/Administration/Commands/AnnounceUiCommand.cs b/Content.Server/Administration/Commands/AnnounceUiCommand.cs
index abb9235a3a..55a913b80e 100644
--- a/Content.Server/Administration/Commands/AnnounceUiCommand.cs
+++ b/Content.Server/Administration/Commands/AnnounceUiCommand.cs
@@ -6,26 +6,23 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Moderator)]
-    public sealed class AnnounceUiCommand : IConsoleCommand
+    public sealed class AnnounceUiCommand : LocalizedEntityCommands
     {
-        public string Command => "announceui";
+        [Dependency] private readonly EuiManager _euiManager = default!;
 
-        public string Description => "Opens the announcement UI";
+        public override string Command => "announceui";
 
-        public string Help => $"{Command}";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
             if (player == null)
             {
-                shell.WriteLine("This does not work from the server console.");
+                shell.WriteLine(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
-            var eui = IoCManager.Resolve<EuiManager>();
             var ui = new AdminAnnounceEui();
-            eui.OpenEui(ui, player);
+            _euiManager.OpenEui(ui, player);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/BanListCommand.cs b/Content.Server/Administration/Commands/BanListCommand.cs
index 2f7093ae1d..ea68788deb 100644
--- a/Content.Server/Administration/Commands/BanListCommand.cs
+++ b/Content.Server/Administration/Commands/BanListCommand.cs
@@ -14,9 +14,10 @@ namespace Content.Server.Administration.Commands;
 [AdminCommand(AdminFlags.Ban)]
 public sealed class BanListCommand : LocalizedCommands
 {
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IServerDbManager _dbManager = default!;
     [Dependency] private readonly EuiManager _eui = default!;
-    [Dependency] private readonly IPlayerLocator _locator = default!;
 
     public override string Command => "banlist";
 
@@ -66,8 +67,7 @@ public sealed class BanListCommand : LocalizedCommands
         if (args.Length != 1)
             return CompletionResult.Empty;
 
-        var playerMgr = IoCManager.Resolve<IPlayerManager>();
-        var options = playerMgr.Sessions.Select(c => c.Name).OrderBy(c => c).ToArray();
+        var options = _playerManager.Sessions.Select(c => c.Name).OrderBy(c => c).ToArray();
         return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-banlist-hint"));
     }
 }
diff --git a/Content.Server/Administration/Commands/CameraCommand.cs b/Content.Server/Administration/Commands/CameraCommand.cs
new file mode 100644
index 0000000000..25837ac709
--- /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/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs
index 8e7f0f4bf0..f5e0b32793 100644
--- a/Content.Server/Administration/Commands/DSay.cs
+++ b/Content.Server/Administration/Commands/DSay.cs
@@ -2,39 +2,36 @@ using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
-namespace Content.Server.Administration.Commands
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Moderator)]
+public sealed class DsayCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Moderator)]
-    sealed class DSay : IConsoleCommand
+    [Dependency] private readonly ChatSystem _chatSystem = default!;
+
+    public override string Command => "dsay";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        [Dependency] private readonly IEntityManager _e = default!;
-
-        public string Command => "dsay";
-
-        public string Description => Loc.GetString("dsay-command-description");
-
-        public string Help => Loc.GetString("dsay-command-help-text", ("command", Command));
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        if (shell.Player is not { } player)
         {
-            if (shell.Player is not { } player)
-            {
-                shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
-                return;
-            }
-
-            if (player.AttachedEntity is not { Valid: true } entity)
-                return;
-
-            if (args.Length < 1)
-                return;
-
-            var message = string.Join(" ", args).Trim();
-            if (string.IsNullOrEmpty(message))
-                return;
-
-            var chat = _e.System<ChatSystem>();
-            chat.TrySendInGameOOCMessage(entity, message, InGameOOCChatType.Dead, false, shell, player);
+            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
         }
+
+        if (player.AttachedEntity is not { Valid: true } entity)
+        {
+            shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity"));
+            return;
+        }
+
+        if (args.Length < 1)
+            return;
+
+        var message = string.Join(" ", args).Trim();
+        if (string.IsNullOrEmpty(message))
+            return;
+
+        _chatSystem.TrySendInGameOOCMessage(entity, message, InGameOOCChatType.Dead, false, shell, player);
     }
 }
diff --git a/Content.Server/Administration/Commands/DeAdminCommand.cs b/Content.Server/Administration/Commands/DeAdminCommand.cs
index cf65941200..3979c93bd7 100644
--- a/Content.Server/Administration/Commands/DeAdminCommand.cs
+++ b/Content.Server/Administration/Commands/DeAdminCommand.cs
@@ -7,23 +7,22 @@ namespace Content.Server.Administration.Commands
 {
     [UsedImplicitly]
     [AdminCommand(AdminFlags.None)]
-    public sealed class DeAdminCommand : IConsoleCommand
+    public sealed class DeAdminCommand : LocalizedCommands
     {
-        public string Command => "deadmin";
-        public string Description => "Temporarily de-admins you so you can experience the round as a normal player.";
-        public string Help => "Usage: deadmin\nUse readmin to re-admin after using this.";
+        [Dependency] private readonly IAdminManager _admin = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "deadmin";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
             if (player == null)
             {
-                shell.WriteLine("You cannot use this command from the server console.");
+                shell.WriteLine(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
-            var mgr = IoCManager.Resolve<IAdminManager>();
-            mgr.DeAdmin(player);
+            _admin.DeAdmin(player);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/DeleteComponent.cs b/Content.Server/Administration/Commands/DeleteComponent.cs
index f4b2a00760..c569a8375f 100644
--- a/Content.Server/Administration/Commands/DeleteComponent.cs
+++ b/Content.Server/Administration/Commands/DeleteComponent.cs
@@ -4,42 +4,40 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Spawn)]
-    public sealed class DeleteComponent : IConsoleCommand
+    public sealed class DeleteComponent : LocalizedEntityCommands
     {
-        public string Command => "deletecomponent";
-        public string Description => "Deletes all instances of the specified component.";
-        public string Help => $"Usage: {Command} <name>";
+        [Dependency] private readonly IComponentFactory _compFactory = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "deletecomponent";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             switch (args.Length)
             {
                 case 0:
-                    shell.WriteLine($"Not enough arguments.\n{Help}");
+                    shell.WriteLine(Loc.GetString($"shell-need-exactly-one-argument"));
                     break;
                 default:
                     var name = string.Join(" ", args);
-                    var componentFactory = IoCManager.Resolve<IComponentFactory>();
-                    var entityManager = IoCManager.Resolve<IEntityManager>();
 
-                    if (!componentFactory.TryGetRegistration(name, out var registration))
+                    if (!_compFactory.TryGetRegistration(name, out var registration))
                     {
-                        shell.WriteLine($"No component exists with name {name}.");
+                        shell.WriteLine(Loc.GetString($"cmd-deletecomponent-no-component-exists", ("name", name)));
                         break;
                     }
 
                     var componentType = registration.Type;
-                    var components = entityManager.GetAllComponents(componentType, true);
+                    var components = EntityManager.GetAllComponents(componentType, true);
 
                     var i = 0;
 
                     foreach (var (uid, component) in components)
                     {
-                        entityManager.RemoveComponent(uid, component);
+                        EntityManager.RemoveComponent(uid, component);
                         i++;
                     }
 
-                    shell.WriteLine($"Removed {i} components with name {name}.");
+                    shell.WriteLine(Loc.GetString($"cmd-deletecomponent-success", ("count", i), ("name", name)));
 
                     break;
             }
diff --git a/Content.Server/Administration/Commands/DirtyCommand.cs b/Content.Server/Administration/Commands/DirtyCommand.cs
index cc0b0fcec6..dd0b79291c 100644
--- a/Content.Server/Administration/Commands/DirtyCommand.cs
+++ b/Content.Server/Administration/Commands/DirtyCommand.cs
@@ -4,22 +4,18 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Debug)]
-public sealed class DirtyCommand : IConsoleCommand
+public sealed class DirtyCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _entManager = default!;
+    public override string Command => "dirty";
 
-    public string Command => "dirty";
-    public string Description => "Marks all components on an entity as dirty, if not specified, dirties everything";
-    public string Help => $"Usage: {Command} [entityUid]";
-
-    public async void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         switch (args.Length)
         {
             case 0:
-                foreach (var entity in _entManager.GetEntities())
+                foreach (var entity in EntityManager.GetEntities())
                 {
-                    DirtyAll(_entManager, entity);
+                    DirtyAll(entity);
                 }
                 break;
             case 1:
@@ -28,7 +24,7 @@ public sealed class DirtyCommand : IConsoleCommand
                     shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
                     return;
                 }
-                DirtyAll(_entManager, _entManager.GetEntity(parsedTarget));
+                DirtyAll(EntityManager.GetEntity(parsedTarget));
                 break;
             default:
                 shell.WriteLine(Loc.GetString("shell-wrong-arguments-number"));
@@ -36,11 +32,11 @@ public sealed class DirtyCommand : IConsoleCommand
         }
     }
 
-    private static void DirtyAll(IEntityManager manager, EntityUid entityUid)
+    private void DirtyAll(EntityUid entityUid)
     {
-        foreach (var component in manager.GetNetComponents(entityUid))
+        foreach (var component in EntityManager.GetNetComponents(entityUid))
         {
-            manager.Dirty(entityUid, component.component);
+            EntityManager.Dirty(entityUid, component.component);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs
index c916a7cb5f..787886f164 100644
--- a/Content.Server/Administration/Commands/ExplosionCommand.cs
+++ b/Content.Server/Administration/Commands/ExplosionCommand.cs
@@ -13,72 +13,73 @@ using Robust.Server.GameObjects;
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Fun)]
-public sealed class OpenExplosionEui : IConsoleCommand
+public sealed class OpenExplosionEui : LocalizedEntityCommands
 {
-    public string Command => "explosionui";
-    public string Description => "Opens a window for easy access to station destruction";
-    public string Help => $"Usage: {Command}";
+    [Dependency] private readonly EuiManager _euiManager = default!;
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "explosionui";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var player = shell.Player;
         if (player == null)
         {
-            shell.WriteError("This does not work from the server console.");
+            shell.WriteError(Loc.GetString($"shell-cannot-run-command-from-server"));
             return;
         }
 
-        var eui = IoCManager.Resolve<EuiManager>();
         var ui = new SpawnExplosionEui();
-        eui.OpenEui(ui, player);
+        _euiManager.OpenEui(ui, player);
     }
 }
 
 [AdminCommand(AdminFlags.Fun)] // for the admin. Not so much for anyone else.
-public sealed class ExplosionCommand : IConsoleCommand
+public sealed class ExplosionCommand : LocalizedEntityCommands
 {
-    public string Command => "explosion";
-    public string Description => "Train go boom";
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ExplosionSystem _explosion = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+
+    public override string Command => "explosion";
 
     // Note that if you change the arguments, you should also update the client-side SpawnExplosionWindow, as that just
     // uses this command.
-    public string Help => "Usage: explosion [intensity] [slope] [maxIntensity] [x y] [mapId] [prototypeId]";
-
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length == 0 || args.Length == 4 || args.Length > 7)
         {
-            shell.WriteError("Wrong number of arguments.");
+            shell.WriteError(Loc.GetString($"shell-wrong-arguments-number"));
             return;
         }
 
         if (!float.TryParse(args[0], out var intensity))
         {
-            shell.WriteError($"Failed to parse intensity: {args[0]}");
+            shell.WriteError(Loc.GetString($"cmd-explosion-failed-to-parse-intensity", ("value", args[0])));
             return;
         }
 
         float slope = 5;
         if (args.Length > 1 && !float.TryParse(args[1], out slope))
         {
-            shell.WriteError($"Failed to parse float: {args[1]}");
+            shell.WriteError(Loc.GetString($"cmd-explosion-failed-to-parse-float", ("value", args[1])));
             return;
         }
 
         float maxIntensity = 100;
         if (args.Length > 2 && !float.TryParse(args[2], out maxIntensity))
         {
-            shell.WriteError($"Failed to parse float: {args[2]}");
+            shell.WriteError(Loc.GetString($"cmd-explosion-failed-to-parse-float", ("value", args[2])));
             return;
         }
 
         float x = 0, y = 0;
         if (args.Length > 4)
         {
-            if (!float.TryParse(args[3], out x) ||
-                !float.TryParse(args[4], out y))
+            if (!float.TryParse(args[3], out x) || !float.TryParse(args[4], out y))
             {
-                shell.WriteError($"Failed to parse coordinates: {(args[3], args[4])}");
+                shell.WriteError(Loc.GetString($"cmd-explosion-failed-to-parse-coords",
+                    ("value1", args[3]),
+                    ("value2", args[4])));
                 return;
             }
         }
@@ -88,7 +89,7 @@ public sealed class ExplosionCommand : IConsoleCommand
         {
             if (!int.TryParse(args[5], out var parsed))
             {
-                shell.WriteError($"Failed to parse map ID: {args[5]}");
+                shell.WriteError(Loc.GetString($"cmd-explosion-failed-to-parse-map-id", ("value", args[5])));
                 return;
             }
             coords = new MapCoordinates(new Vector2(x, y), new(parsed));
@@ -96,42 +97,39 @@ public sealed class ExplosionCommand : IConsoleCommand
         else
         {
             // attempt to find the player's current position
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (!entMan.TryGetComponent(shell.Player?.AttachedEntity, out TransformComponent? xform))
+            if (!EntityManager.TryGetComponent(shell.Player?.AttachedEntity, out TransformComponent? xform))
             {
-                shell.WriteError($"Failed get default coordinates/map via player's transform. Need to specify explicitly.");
+                shell.WriteError(Loc.GetString($"cmd-explosion-need-coords-explicit"));
                 return;
             }
 
             if (args.Length > 4)
                 coords = new MapCoordinates(new Vector2(x, y), xform.MapID);
             else
-                coords = entMan.System<TransformSystem>().GetMapCoordinates(shell.Player.AttachedEntity.Value, xform: xform);
+                coords = _transform.GetMapCoordinates(shell.Player.AttachedEntity.Value, xform: xform);
         }
 
         ExplosionPrototype? type;
-        var protoMan = IoCManager.Resolve<IPrototypeManager>();
         if (args.Length > 6)
         {
-            if (!protoMan.TryIndex(args[6], out type))
+            if (!_prototypeManager.TryIndex(args[6], out type))
             {
-                shell.WriteError($"Unknown explosion prototype: {args[6]}");
+                shell.WriteError(Loc.GetString($"cmd-explosion-unknown-prototype", ("value", args[6])));
                 return;
             }
         }
-        else if (!protoMan.TryIndex(ExplosionSystem.DefaultExplosionPrototypeId, out type))
+        else if (!_prototypeManager.TryIndex(ExplosionSystem.DefaultExplosionPrototypeId, out type))
         {
             // no prototype was specified, so lets default to whichever one was defined first
-            type = protoMan.EnumeratePrototypes<ExplosionPrototype>().FirstOrDefault();
+            type = _prototypeManager.EnumeratePrototypes<ExplosionPrototype>().FirstOrDefault();
 
             if (type == null)
             {
-                shell.WriteError($"Prototype manager has no explosion prototypes?");
+                shell.WriteError(Loc.GetString($"cmd-explosion-no-prototypes"));
                 return;
             }
         }
 
-        var sysMan = IoCManager.Resolve<IEntitySystemManager>();
-        sysMan.GetEntitySystem<ExplosionSystem>().QueueExplosion(coords, type.ID, intensity, slope, maxIntensity, null);
+        _explosion.QueueExplosion(coords, type.ID, intensity, slope, maxIntensity, null);
     }
 }
diff --git a/Content.Server/Administration/Commands/FaxUiCommand.cs b/Content.Server/Administration/Commands/FaxUiCommand.cs
index c1103f47d8..4b788375bd 100644
--- a/Content.Server/Administration/Commands/FaxUiCommand.cs
+++ b/Content.Server/Administration/Commands/FaxUiCommand.cs
@@ -6,14 +6,13 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Fun)]
-public sealed class FaxUiCommand : IConsoleCommand
+public sealed class FaxUiCommand : LocalizedEntityCommands
 {
-    public string Command => "faxui";
+    [Dependency] private readonly EuiManager _euiManager = default!;
 
-    public string Description => Loc.GetString("cmd-faxui-desc");
-    public string Help => Loc.GetString("cmd-faxui-help");
+    public override string Command => "faxui";
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (shell.Player is not { } player)
         {
@@ -21,8 +20,7 @@ public sealed class FaxUiCommand : IConsoleCommand
             return;
         }
 
-        var eui = IoCManager.Resolve<EuiManager>();
         var ui = new AdminFaxEui();
-        eui.OpenEui(ui, player);
+        _euiManager.OpenEui(ui, player);
     }
 }
diff --git a/Content.Server/Administration/Commands/FollowCommand.cs b/Content.Server/Administration/Commands/FollowCommand.cs
index b59a99b8b4..27ecbb99cf 100644
--- a/Content.Server/Administration/Commands/FollowCommand.cs
+++ b/Content.Server/Administration/Commands/FollowCommand.cs
@@ -6,15 +6,13 @@ using Robust.Shared.Enums;
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Admin)]
-public sealed class FollowCommand : IConsoleCommand
+public sealed class FollowCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly FollowerSystem _followerSystem = default!;
 
-    public string Command => "follow";
-    public string Description => Loc.GetString("follow-command-description");
-    public string Help => Loc.GetString("follow-command-help");
+    public override string Command => "follow";
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (shell.Player is not { } player)
         {
@@ -34,10 +32,7 @@ public sealed class FollowCommand : IConsoleCommand
             return;
         }
 
-        var entity = args[0];
-        if (NetEntity.TryParse(entity, out var uidNet) && _entManager.TryGetEntity(uidNet, out var uid))
-        {
-            _entManager.System<FollowerSystem>().StartFollowingEntity(playerEntity, uid.Value);
-        }
+        if (NetEntity.TryParse(args[0], out var uidNet) && EntityManager.TryGetEntity(uidNet, out var uid))
+            _followerSystem.StartFollowingEntity(playerEntity, uid.Value);
     }
 }
diff --git a/Content.Server/Administration/Commands/LoadGameMapCommand.cs b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
index 034b50a9c5..dfe18ea5bc 100644
--- a/Content.Server/Administration/Commands/LoadGameMapCommand.cs
+++ b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
@@ -3,42 +3,36 @@ using Content.Server.GameTicking;
 using Content.Server.Maps;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
-using Robust.Shared.EntitySerialization;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Round | AdminFlags.Spawn)]
-    public sealed class LoadGameMapCommand : IConsoleCommand
+    public sealed class LoadGameMapCommand : LocalizedEntityCommands
     {
-        public string Command => "loadgamemap";
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly GameTicker _gameTicker = default!;
+        [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
-        public string Description => "Loads the given game map at the given coordinates.";
+        public override string Command => "loadgamemap";
 
-        public string Help => "loadgamemap <mapid> <gamemap> [<x> <y> [<name>]] ";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var gameTicker = entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
-            var mapSys = entityManager.EntitySysManager.GetEntitySystem<SharedMapSystem>();
-
             if (args.Length is not (2 or 4 or 5))
             {
                 shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
                 return;
             }
 
-            if (!prototypeManager.TryIndex<GameMapPrototype>(args[1], out var gameMap))
+            if (!_prototypeManager.TryIndex<GameMapPrototype>(args[1], out var gameMap))
             {
                 shell.WriteError($"The given map prototype {args[0]} is invalid.");
                 return;
             }
 
             if (!int.TryParse(args[0], out var mapId))
-                    return;
+                return;
 
             var stationName = args.Length == 5 ? args[4] : null;
 
@@ -48,14 +42,14 @@ namespace Content.Server.Administration.Commands
 
             var id = new MapId(mapId);
 
-            var grids = mapSys.MapExists(id)
-                ? gameTicker.MergeGameMap(gameMap, id, stationName: stationName, offset: offset)
-                : gameTicker.LoadGameMapWithId(gameMap, id, stationName: stationName, offset: offset);
+            var grids = _mapSystem.MapExists(id)
+                ? _gameTicker.MergeGameMap(gameMap, id, stationName: stationName, offset: offset)
+                : _gameTicker.LoadGameMapWithId(gameMap, id, stationName: stationName, offset: offset);
 
             shell.WriteLine($"Loaded {grids.Count} grids.");
         }
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             switch (args.Length)
             {
@@ -79,26 +73,20 @@ namespace Content.Server.Administration.Commands
     }
 
     [AdminCommand(AdminFlags.Round | AdminFlags.Spawn)]
-    public sealed class ListGameMaps : IConsoleCommand
+    public sealed class ListGameMaps : LocalizedCommands
     {
-        public string Command => "listgamemaps";
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        public string Description => "Lists the game maps that can be used by loadgamemap";
+        public override string Command => "listgamemaps";
 
-        public string Help => "listgamemaps";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var gameTicker = entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
-
             if (args.Length != 0)
             {
                 shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
                 return;
             }
-            foreach (var prototype in prototypeManager.EnumeratePrototypes<GameMapPrototype>())
+            foreach (var prototype in _prototypeManager.EnumeratePrototypes<GameMapPrototype>())
             {
                 shell.WriteLine($"{prototype.ID} - {prototype.MapName}");
             }
diff --git a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
index 5572fa542b..1beaaa928e 100644
--- a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
+++ b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
@@ -6,13 +6,13 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Logs)]
-public sealed class OpenAdminLogsCommand : IConsoleCommand
+public sealed class OpenAdminLogsCommand : LocalizedEntityCommands
 {
-    public string Command => "adminlogs";
-    public string Description => "Opens the admin logs panel.";
-    public string Help => $"Usage: {Command}";
+    [Dependency] private readonly EuiManager _euiManager = default!;
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "adminlogs";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (shell.Player is not { } player)
         {
@@ -20,8 +20,7 @@ public sealed class OpenAdminLogsCommand : IConsoleCommand
             return;
         }
 
-        var eui = IoCManager.Resolve<EuiManager>();
         var ui = new AdminLogsEui();
-        eui.OpenEui(ui, player);
+        _euiManager.OpenEui(ui, player);
     }
 }
diff --git a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs
index cbe1e89e19..5577e13437 100644
--- a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs
+++ b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs
@@ -9,6 +9,9 @@ namespace Content.Server.Administration.Commands;
 [AdminCommand(AdminFlags.ViewNotes)]
 public sealed class OpenAdminNotesCommand : LocalizedCommands
 {
+    [Dependency] private readonly IAdminNotesManager _adminNotes = default!;
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+
     public const string CommandName = "adminnotes";
 
     public override string Command => CommandName;
@@ -28,8 +31,7 @@ public sealed class OpenAdminNotesCommand : LocalizedCommands
             case 1 when Guid.TryParse(args[0], out notedPlayer):
                 break;
             case 1:
-                var locator = IoCManager.Resolve<IPlayerLocator>();
-                var dbGuid = await locator.LookupIdByNameAsync(args[0]);
+                var dbGuid = await _locator.LookupIdByNameAsync(args[0]);
 
                 if (dbGuid == null)
                 {
@@ -44,7 +46,7 @@ public sealed class OpenAdminNotesCommand : LocalizedCommands
                 return;
         }
 
-        await IoCManager.Resolve<IAdminNotesManager>().OpenEui(player, notedPlayer);
+        await _adminNotes.OpenEui(player, notedPlayer);
     }
 
     public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
diff --git a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
index fd3227d4aa..14167931e8 100644
--- a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
+++ b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
@@ -6,24 +6,23 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Permissions)]
-    public sealed class OpenPermissionsCommand : IConsoleCommand
+    public sealed class OpenPermissionsCommand : LocalizedEntityCommands
     {
-        public string Command => "permissions";
-        public string Description => "Opens the admin permissions panel.";
-        public string Help => "Usage: permissions";
+        [Dependency] private readonly EuiManager _euiManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "permissions";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
             if (player == null)
             {
-                shell.WriteLine("This does not work from the server console.");
+                shell.WriteLine(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
-            var eui = IoCManager.Resolve<EuiManager>();
             var ui = new PermissionsEui();
-            eui.OpenEui(ui, player);
+            _euiManager.OpenEui(ui, player);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
index 1536bf0e9b..dd0aed59b6 100644
--- a/Content.Server/Administration/Commands/PanicBunkerCommand.cs
+++ b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
@@ -14,18 +14,18 @@ public sealed class PanicBunkerCommand : LocalizedCommands
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var toggle = Toggle(CCVars.PanicBunkerEnabled, shell, args, _cfg);
+        var toggle = Toggle(CCVars.PanicBunkerEnabled, shell, args, _cfg, LocalizationManager);
         if (toggle == null)
             return;
 
         shell.WriteLine(Loc.GetString(toggle.Value ? "panicbunker-command-enabled" : "panicbunker-command-disabled"));
     }
 
-    public static bool? Toggle(CVarDef<bool> cvar, IConsoleShell shell, string[] args, IConfigurationManager config)
+    public static bool? Toggle(CVarDef<bool> cvar, IConsoleShell shell, string[] args, IConfigurationManager config, ILocalizationManager loc)
     {
         if (args.Length > 1)
         {
-            shell.WriteError(Loc.GetString("shell-need-between-arguments",("lower", 0), ("upper", 1)));
+            shell.WriteError(loc.GetString("shell-need-between-arguments",("lower", 0), ("upper", 1)));
             return null;
         }
 
@@ -38,7 +38,7 @@ public sealed class PanicBunkerCommand : LocalizedCommands
 
         if (args.Length == 1 && !bool.TryParse(args[0], out enabled))
         {
-            shell.WriteError(Loc.GetString("shell-argument-must-be-boolean"));
+            shell.WriteError(loc.GetString("shell-argument-must-be-boolean"));
             return null;
         }
 
@@ -56,7 +56,7 @@ public sealed class PanicBunkerDisableWithAdminsCommand : LocalizedCommands
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerDisableWithAdmins, shell, args, _cfg);
+        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerDisableWithAdmins, shell, args, _cfg, LocalizationManager);
         if (toggle == null)
             return;
 
@@ -76,7 +76,7 @@ public sealed class PanicBunkerEnableWithoutAdminsCommand : LocalizedCommands
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerEnableWithoutAdmins, shell, args, _cfg);
+        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerEnableWithoutAdmins, shell, args, _cfg, LocalizationManager);
         if (toggle == null)
             return;
 
@@ -96,7 +96,7 @@ public sealed class PanicBunkerCountDeadminnedCommand : LocalizedCommands
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerCountDeadminnedAdmins, shell, args, _cfg);
+        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerCountDeadminnedAdmins, shell, args, _cfg, LocalizationManager);
         if (toggle == null)
             return;
 
@@ -116,7 +116,7 @@ public sealed class PanicBunkerShowReasonCommand : LocalizedCommands
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerShowReason, shell, args, _cfg);
+        var toggle = PanicBunkerCommand.Toggle(CCVars.PanicBunkerShowReason, shell, args, _cfg, LocalizationManager);
         if (toggle == null)
             return;
 
diff --git a/Content.Server/Administration/Commands/PardonCommand.cs b/Content.Server/Administration/Commands/PardonCommand.cs
index f47ba9c99b..13b8673a19 100644
--- a/Content.Server/Administration/Commands/PardonCommand.cs
+++ b/Content.Server/Administration/Commands/PardonCommand.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using Content.Server.Administration.Managers;
 using Content.Server.Database;
 using Content.Shared.Administration;
@@ -7,16 +7,14 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Ban)]
-    public sealed class PardonCommand : IConsoleCommand
+    public sealed class PardonCommand : LocalizedCommands
     {
-        public string Command => "pardon";
-        public string Description => "Pardons somebody's ban";
-        public string Help => $"Usage: {Command} <ban id>";
+        [Dependency] private readonly IServerDbManager _dbManager = default!;
 
-        public async void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "pardon";
+
+        public override async void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var player = shell.Player;
-            var dbMan = IoCManager.Resolve<IServerDbManager>();
             var banMan = IoCManager.Resolve<IBanManager>();
 
             if (args.Length != 1)
@@ -27,11 +25,11 @@ namespace Content.Server.Administration.Commands
 
             if (!int.TryParse(args[0], out var banId))
             {
-                shell.WriteLine($"Unable to parse {args[0]} as a ban id integer.\n{Help}");
+                shell.WriteLine(Loc.GetString($"cmd-pardon-unable-to-parse", ("id", args[0]), ("help", Help)));
                 return;
             }
 
-            var ban = await dbMan.GetServerBanAsync(banId);
+            var ban = await _dbManager.GetServerBanAsync(banId);
 
             if (ban == null)
             {
@@ -41,22 +39,22 @@ namespace Content.Server.Administration.Commands
 
             if (ban.Unban != null)
             {
-                var response = new StringBuilder("This ban has already been pardoned");
-
                 if (ban.Unban.UnbanningAdmin != null)
                 {
-                    response.Append($" by {ban.Unban.UnbanningAdmin.Value}");
+                    shell.WriteLine(Loc.GetString($"cmd-pardon-already-pardoned-specific",
+                        ("admin", ban.Unban.UnbanningAdmin.Value),
+                        ("time", ban.Unban.UnbanTime)));
                 }
 
-                response.Append($" in {ban.Unban.UnbanTime}.");
+                else
+                    shell.WriteLine(Loc.GetString($"cmd-pardon-already-pardoned"));
 
-                shell.WriteLine(response.ToString());
                 return;
             }
 
             await banMan.PardonBan(shell.Player, banId, ban); // Sunrise-Edit
 
-            shell.WriteLine($"Pardoned ban with id {banId}");
+            shell.WriteLine(Loc.GetString($"cmd-pardon-success", ("id", banId)));
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs
index b9ae639d4a..8eebe018be 100644
--- a/Content.Server/Administration/Commands/PromoteHostCommand.cs
+++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs
@@ -6,29 +6,28 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [UsedImplicitly]
-    public sealed class PromoteHostCommand : IConsoleCommand
+    public sealed class PromoteHostCommand : LocalizedCommands
     {
-        public string Command => "promotehost";
-        public string Description => "Grants client temporary full host admin privileges. Use this to bootstrap admins.";
-        public string Help => "Usage promotehost <player>";
+        [Dependency] private readonly IAdminManager _adminManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "promotehost";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 1)
             {
-                shell.WriteLine("Expected exactly one argument.");
+                shell.WriteLine(Loc.GetString($"shell-need-exactly-one-argument"));
                 return;
             }
 
-            var plyMgr = IoCManager.Resolve<IPlayerManager>();
-            if (!plyMgr.TryGetSessionByUsername(args[0], out var targetPlayer))
+            if (!_playerManager.TryGetSessionByUsername(args[0], out var targetPlayer))
             {
-                shell.WriteLine("Unable to find a player by that name.");
+                shell.WriteLine(Loc.GetString($"shell-target-player-does-not-exist"));
                 return;
             }
 
-            var adminMgr = IoCManager.Resolve<IAdminManager>();
-            adminMgr.PromoteHost(targetPlayer);
+            _adminManager.PromoteHost(targetPlayer);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/ReAdminCommand.cs b/Content.Server/Administration/Commands/ReAdminCommand.cs
index a3f5993766..7d6c40cf3b 100644
--- a/Content.Server/Administration/Commands/ReAdminCommand.cs
+++ b/Content.Server/Administration/Commands/ReAdminCommand.cs
@@ -5,30 +5,28 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AnyCommand]
-    public sealed class ReAdminCommand : IConsoleCommand
+    public sealed class ReAdminCommand : LocalizedCommands
     {
-        public string Command => "readmin";
-        public string Description => "Re-admins you if you previously de-adminned.";
-        public string Help => "Usage: readmin";
+        [Dependency] private readonly IAdminManager _adminManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "readmin";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
             if (player == null)
             {
-                shell.WriteLine("You cannot use this command from the server console.");
+                shell.WriteLine(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
-            var mgr = IoCManager.Resolve<IAdminManager>();
-
-            if (mgr.GetAdminData(player, includeDeAdmin: true) == null)
+            if (_adminManager.GetAdminData(player, includeDeAdmin: true) == null)
             {
-                shell.WriteLine("You're not an admin.");
+                shell.WriteLine(Loc.GetString($"cmd-readmin-not-an-admin"));
                 return;
             }
 
-            mgr.ReAdmin(player);
+            _adminManager.ReAdmin(player);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/RemoveExtraComponents.cs b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
index c630f55488..d0dda84eff 100644
--- a/Content.Server/Administration/Commands/RemoveExtraComponents.cs
+++ b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
@@ -5,46 +5,43 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Mapping)]
-    public sealed class RemoveExtraComponents : IConsoleCommand
+    public sealed class RemoveExtraComponents : LocalizedEntityCommands
     {
-        public string Command => "removeextracomponents";
-        public string Description => "Removes all components from all entities of the specified id if that component is not in its prototype.\nIf no id is specified, it matches all entities.";
-        public string Help => $"{Command} <entityId> / {Command}";
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        [Dependency] private readonly IComponentFactory _compFactory = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+        public override string Command => "removeextracomponents";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var id = args.Length == 0 ? null : string.Join(" ", args);
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var fac = IoCManager.Resolve<IComponentFactory>();
 
             EntityPrototype? prototype = null;
             var checkPrototype = !string.IsNullOrEmpty(id);
 
-            if (checkPrototype && !prototypeManager.TryIndex(id!, out prototype))
+            if (checkPrototype && !_prototypeManager.TryIndex(id!, out prototype))
             {
-                shell.WriteError($"Can't find entity prototype with id \"{id}\"!");
+                shell.WriteError(Loc.GetString($"cmd-removeextracomponents-invalid-prototype-id", ("id", $"{id}")));
                 return;
             }
 
             var entities = 0;
             var components = 0;
 
-            foreach (var entity in entityManager.GetEntities())
+            foreach (var entity in EntityManager.GetEntities())
             {
-                var metaData = entityManager.GetComponent<MetaDataComponent>(entity);
+                var metaData = EntityManager.GetComponent<MetaDataComponent>(entity);
                 if (checkPrototype && metaData.EntityPrototype != prototype || metaData.EntityPrototype == null)
-                {
                     continue;
-                }
 
                 var modified = false;
 
-                foreach (var component in entityManager.GetComponents(entity))
+                foreach (var component in EntityManager.GetComponents(entity))
                 {
-                    if (metaData.EntityPrototype.Components.ContainsKey(fac.GetComponentName(component.GetType())))
+                    if (metaData.EntityPrototype.Components.ContainsKey(_compFactory.GetComponentName(component.GetType())))
                         continue;
 
-                    entityManager.RemoveComponent(entity, component);
+                    EntityManager.RemoveComponent(entity, component);
                     components++;
 
                     modified = true;
@@ -54,7 +51,18 @@ namespace Content.Server.Administration.Commands
                     entities++;
             }
 
-            shell.WriteLine($"Removed {components} components from {entities} entities{(id == null ? "." : $" with id {id}")}");
+            if (id != null)
+            {
+                shell.WriteLine(Loc.GetString($"cmd-removeextracomponents-success-with-id",
+                    ("count", components),
+                    ("entities", entities),
+                    ("id", id)));
+                return;
+            }
+
+            shell.WriteLine(Loc.GetString($"cmd-removeextracomponents-success",
+                ("count", components),
+                ("entities", entities)));
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/RoleUnbanCommand.cs b/Content.Server/Administration/Commands/RoleUnbanCommand.cs
index 39bebe8fc0..f237730bd0 100644
--- a/Content.Server/Administration/Commands/RoleUnbanCommand.cs
+++ b/Content.Server/Administration/Commands/RoleUnbanCommand.cs
@@ -5,13 +5,13 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Ban)]
-public sealed class RoleUnbanCommand : IConsoleCommand
+public sealed class RoleUnbanCommand : LocalizedCommands
 {
-    public string Command => "roleunban";
-    public string Description => Loc.GetString("cmd-roleunban-desc");
-    public string Help => Loc.GetString("cmd-roleunban-help");
+    [Dependency] private readonly IBanManager _banManager = default!;
 
-    public async void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "roleunban";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1)
         {
@@ -21,16 +21,15 @@ public sealed class RoleUnbanCommand : IConsoleCommand
 
         if (!int.TryParse(args[0], out var banId))
         {
-            shell.WriteLine($"Unable to parse {args[0]} as a ban id integer.\n{Help}");
+            shell.WriteLine(Loc.GetString($"cmd-roleunban-unable-to-parse-id", ("id", args[0]), ("help", Help)));
             return;
         }
 
-        var banManager = IoCManager.Resolve<IBanManager>();
-        var response = await banManager.PardonRoleBan(banId, shell.Player?.UserId, DateTimeOffset.UtcNow);
+        var response = await _banManager.PardonRoleBan(banId, shell.Player?.UserId, DateTimeOffset.UtcNow); // Sunrise-Edit
         shell.WriteLine(response);
     }
 
-    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         // Can't think of good way to do hint options for this
         return args.Length switch
diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs
index b3e17c9622..27c635feeb 100644
--- a/Content.Server/Administration/Commands/SetAdminOOC.cs
+++ b/Content.Server/Administration/Commands/SetAdminOOC.cs
@@ -6,13 +6,14 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.NameColor)]
-    internal sealed class SetAdminOOC : IConsoleCommand
+    internal sealed class SetAdminOOC : LocalizedCommands
     {
-        public string Command => "setadminooc";
-        public string Description => Loc.GetString("set-admin-ooc-command-description", ("command", Command));
-        public string Help => Loc.GetString("set-admin-ooc-command-help-text", ("command", Command));
+        [Dependency] private readonly IServerDbManager _dbManager = default!;
+        [Dependency] private readonly IServerPreferencesManager _preferenceManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "setadminooc";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player == null)
             {
@@ -36,11 +37,9 @@ namespace Content.Server.Administration.Commands
 
             var userId = shell.Player.UserId;
             // Save the DB
-            var dbMan = IoCManager.Resolve<IServerDbManager>();
-            dbMan.SaveAdminOOCColorAsync(userId, color.Value);
+            _dbManager.SaveAdminOOCColorAsync(userId, color.Value);
             // Update the cached preference
-            var prefManager = IoCManager.Resolve<IServerPreferencesManager>();
-            var prefs = prefManager.GetPreferences(userId);
+            var prefs = _preferenceManager.GetPreferences(userId);
             prefs.AdminOOCColor = color.Value;
         }
     }
diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs
index 423c30ae37..9407040e5d 100644
--- a/Content.Server/Administration/Commands/SetMindCommand.cs
+++ b/Content.Server/Administration/Commands/SetMindCommand.cs
@@ -1,4 +1,3 @@
-using Content.Server.Players;
 using Content.Shared.Administration;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
@@ -9,17 +8,16 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
-    sealed class SetMindCommand : IConsoleCommand
+    public sealed class SetMindCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
-        public string Command => "setmind";
+        public override string Command => "setmind";
 
-        public string Description => Loc.GetString("set-mind-command-description", ("requiredComponent", nameof(MindContainerComponent)));
+        public override string Description => Loc.GetString("cmd-setmind-desc", ("requiredComponent", nameof(MindContainerComponent)));
 
-        public string Help => Loc.GetString("set-mind-command-help-text", ("command", Command));
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length < 2)
             {
@@ -33,7 +31,7 @@ namespace Content.Server.Administration.Commands
                 return;
             }
 
-            bool ghostOverride = true;
+            var ghostOverride = true;
             if (args.Length > 2)
             {
                 ghostOverride = bool.Parse(args[2]);
@@ -41,19 +39,19 @@ namespace Content.Server.Administration.Commands
 
             var nent = new NetEntity(entInt);
 
-            if (!_entManager.TryGetEntity(nent, out var eUid))
+            if (!EntityManager.TryGetEntity(nent, out var eUid))
             {
                 shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
                 return;
             }
 
-            if (!_entManager.HasComponent<MindContainerComponent>(eUid))
+            if (!EntityManager.HasComponent<MindContainerComponent>(eUid))
             {
-                shell.WriteLine(Loc.GetString("set-mind-command-target-has-no-mind-message"));
+                shell.WriteLine(Loc.GetString("cmd-setmind-target-has-no-mind-message"));
                 return;
             }
 
-            if (!IoCManager.Resolve<IPlayerManager>().TryGetSessionByUsername(args[1], out var session))
+            if (!_playerManager.TryGetSessionByUsername(args[1], out var session))
             {
                 shell.WriteLine(Loc.GetString("shell-target-player-does-not-exist"));
                 return;
@@ -63,24 +61,21 @@ namespace Content.Server.Administration.Commands
             var playerCData = session.ContentData();
             if (playerCData == null)
             {
-                shell.WriteLine(Loc.GetString("set-mind-command-target-has-no-content-data-message"));
+                shell.WriteLine(Loc.GetString("cmd-setmind-target-has-no-content-data-message"));
                 return;
             }
 
-            var mindSystem = _entManager.System<SharedMindSystem>();
-            var metadata = _entManager.GetComponent<MetaDataComponent>(eUid.Value);
+            var metadata = EntityManager.GetComponent<MetaDataComponent>(eUid.Value);
 
-            var mind = playerCData.Mind ?? mindSystem.CreateMind(session.UserId, metadata.EntityName);
+            var mind = playerCData.Mind ?? _mindSystem.CreateMind(session.UserId, metadata.EntityName);
 
-            mindSystem.TransferTo(mind, eUid, ghostOverride);
+            _mindSystem.TransferTo(mind, eUid, ghostOverride);
         }
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             if (args.Length == 2)
-            {
-                return CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("cmd-mind-command-hint"));
-            }
+                return CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Help);
 
             return CompletionResult.Empty;
         }
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index 447c7481b5..b951ea5f27 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -1,12 +1,7 @@
 using Content.Server.Administration.UI;
+using Content.Server.Clothing.Systems;
 using Content.Server.EUI;
-using Content.Server.Hands.Systems;
-using Content.Server.Preferences.Managers;
-using Content.Shared.Access.Components;
 using Content.Shared.Administration;
-using Content.Shared.Clothing;
-using Content.Shared.Hands.Components;
-using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
@@ -15,23 +10,19 @@ using Content.Shared.Roles;
 using Content.Shared.Station;
 using Content.Sunrise.Interfaces.Shared;
 using Robust.Shared.Console;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class SetOutfitCommand : IConsoleCommand
+    public sealed class SetOutfitCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entities = default!;
+        [Dependency] private readonly EuiManager _euiManager = default!;
+        [Dependency] private readonly OutfitSystem _outfitSystem = default!;
 
-        public string Command => "setoutfit";
+        public override string Command => "setoutfit";
+        public override string Description => Loc.GetString("cmd-setoutfit-desc", ("requiredComponent", nameof(InventoryComponent)));
 
-        public string Description => Loc.GetString("set-outfit-command-description", ("requiredComponent", nameof(InventoryComponent)));
-
-        public string Help => Loc.GetString("set-outfit-command-help-text", ("command", Command));
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length < 1)
             {
@@ -47,13 +38,13 @@ namespace Content.Server.Administration.Commands
 
             var nent = new NetEntity(entInt);
 
-            if (!_entities.TryGetEntity(nent, out var target))
+            if (!EntityManager.TryGetEntity(nent, out var target))
             {
                 shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
                 return;
             }
 
-            if (!_entities.HasComponent<InventoryComponent>(target))
+            if (!EntityManager.HasComponent<InventoryComponent>(target))
             {
                 shell.WriteLine(Loc.GetString("shell-target-entity-does-not-have-message", ("missing", "inventory")));
                 return;
@@ -63,120 +54,17 @@ namespace Content.Server.Administration.Commands
             {
                 if (shell.Player is not { } player)
                 {
-                    shell.WriteError(Loc.GetString("set-outfit-command-is-not-player-error"));
+                    shell.WriteError(Loc.GetString("cmd-setoutfit-is-not-player-error"));
                     return;
                 }
 
-                var eui = IoCManager.Resolve<EuiManager>();
                 var ui = new SetOutfitEui(nent);
-                eui.OpenEui(ui, player);
+                _euiManager.OpenEui(ui, player);
                 return;
             }
 
-            if (!SetOutfit(target.Value, args[1], _entities))
-                shell.WriteLine(Loc.GetString("set-outfit-command-invalid-outfit-id-error"));
-        }
-
-        public static bool SetOutfit(EntityUid target, string gear, IEntityManager entityManager, Action<EntityUid, EntityUid>? onEquipped = null)
-        {
-            if (!entityManager.TryGetComponent(target, out InventoryComponent? inventoryComponent))
-                return false;
-
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            if (!prototypeManager.TryIndex<StartingGearPrototype>(gear, out var startingGear))
-                return false;
-
-            HumanoidCharacterProfile? profile = null;
-            ICommonSession? session = null;
-            // Check if we are setting the outfit of a player to respect the preferences
-            if (entityManager.TryGetComponent(target, out ActorComponent? actorComponent))
-            {
-                session = actorComponent.PlayerSession;
-                var userId = actorComponent.PlayerSession.UserId;
-                var preferencesManager = IoCManager.Resolve<IServerPreferencesManager>();
-                var prefs = preferencesManager.GetPreferences(userId);
-                profile = prefs.SelectedCharacter as HumanoidCharacterProfile;
-            }
-
-            var invSystem = entityManager.System<InventorySystem>();
-            if (invSystem.TryGetSlots(target, out var slots))
-            {
-                foreach (var slot in slots)
-                {
-                    invSystem.TryUnequip(target, slot.Name, true, true, false, inventoryComponent);
-                    var gearStr = ((IEquipmentLoadout) startingGear).GetGear(slot.Name);
-                    if (gearStr == string.Empty)
-                    {
-                        continue;
-                    }
-
-                    var equipmentEntity = entityManager.SpawnEntity(gearStr, entityManager.GetComponent<TransformComponent>(target).Coordinates);
-                    if (slot.Name == "id" &&
-                        entityManager.TryGetComponent(equipmentEntity, out PdaComponent? pdaComponent) &&
-                        entityManager.TryGetComponent<IdCardComponent>(pdaComponent.ContainedId, out var id))
-                    {
-                        id.FullName = entityManager.GetComponent<MetaDataComponent>(target).EntityName;
-                    }
-
-                    invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent);
-
-                    onEquipped?.Invoke(target, equipmentEntity);
-                }
-            }
-
-            if (entityManager.TryGetComponent(target, out HandsComponent? handsComponent))
-            {
-                var handsSystem = entityManager.System<HandsSystem>();
-                var coords = entityManager.GetComponent<TransformComponent>(target).Coordinates;
-                foreach (var prototype in startingGear.Inhand)
-                {
-                    var inhandEntity = entityManager.SpawnEntity(prototype, coords);
-                    handsSystem.TryPickup(target, inhandEntity, checkActionBlocker: false, handsComp: handsComponent);
-                }
-            }
-
-            // See if this starting gear is associated with a job
-            var jobs = prototypeManager.EnumeratePrototypes<JobPrototype>();
-            foreach (var job in jobs)
-            {
-                if (job.StartingGear != gear)
-                    continue;
-
-                var jobProtoId = LoadoutSystem.GetJobPrototype(job.ID);
-                if (!prototypeManager.TryIndex<RoleLoadoutPrototype>(jobProtoId, out var jobProto))
-                    break;
-
-                // Don't require a player, so this works on Urists
-                profile ??= entityManager.TryGetComponent<HumanoidAppearanceComponent>(target, out var comp)
-                    ? HumanoidCharacterProfile.DefaultWithSpecies(comp.Species)
-                    : new HumanoidCharacterProfile();
-                // Try to get the user's existing loadout for the role
-                profile.Loadouts.TryGetValue(jobProtoId, out var roleLoadout);
-
-                if (roleLoadout == null)
-                {
-                    // Sunrise-Start
-                    string [] sponsorsPrototypes = [];
-                    if (session != null && IoCManager.Instance != null && IoCManager.Instance.TryResolveType<ISharedSponsorsManager>(out var sponsorsManager))
-                    {
-                        if (sponsorsManager.TryGetPrototypes(session.UserId, out var prototypes))
-                        {
-                            sponsorsPrototypes = prototypes.ToArray();
-                        }
-                    }
-                    // Sunrise-End
-
-                    // If they don't have a loadout for the role, make a default one
-                    roleLoadout = new RoleLoadout(jobProtoId);
-                    roleLoadout.SetDefault(profile, session, prototypeManager, sponsorsPrototypes);
-                }
-
-                // Equip the target with the job loadout
-                var stationSpawning = entityManager.System<SharedStationSpawningSystem>();
-                stationSpawning.EquipRoleLoadout(target, roleLoadout, jobProto);
-            }
-
-            return true;
+            if (!_outfitSystem.SetOutfit(target.Value, args[1]))
+                shell.WriteLine(Loc.GetString("cmd-setoutfit-invalid-outfit-id-error"));
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/ShuttleCommands.cs b/Content.Server/Administration/Commands/ShuttleCommands.cs
index ea0f891360..677c38ac4e 100644
--- a/Content.Server/Administration/Commands/ShuttleCommands.cs
+++ b/Content.Server/Administration/Commands/ShuttleCommands.cs
@@ -6,46 +6,36 @@ using Robust.Shared.Console;
 namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Round)]
-    public sealed class CallShuttleCommand : IConsoleCommand
+    public sealed class CallShuttleCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
 
-        public string Command => "callshuttle";
-        public string Description => Loc.GetString("call-shuttle-command-description");
-        public string Help => Loc.GetString("call-shuttle-command-help-text", ("command",Command));
+        public override string Command => "callshuttle";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var loc = IoCManager.Resolve<ILocalizationManager>();
-
             // ReSharper disable once ConvertIfStatementToSwitchStatement
-            if (args.Length == 1 && TimeSpan.TryParseExact(args[0], ContentLocalizationManager.TimeSpanMinutesFormats, loc.DefaultCulture, out var timeSpan))
-            {
-                _e.System<RoundEndSystem>().RequestRoundEnd(timeSpan, shell.Player?.AttachedEntity, false);
-            }
+            if (args.Length == 1 && TimeSpan.TryParseExact(args[0], ContentLocalizationManager.TimeSpanMinutesFormats, LocalizationManager.DefaultCulture, out var timeSpan))
+                _roundEndSystem.RequestRoundEnd(timeSpan, shell.Player?.AttachedEntity, false);
+
             else if (args.Length == 1)
-            {
                 shell.WriteLine(Loc.GetString("shell-timespan-minutes-must-be-correct"));
-            }
+
             else
-            {
-                _e.System<RoundEndSystem>().RequestRoundEnd(shell.Player?.AttachedEntity, false);
-            }
+                _roundEndSystem.RequestRoundEnd(shell.Player?.AttachedEntity, false);
         }
     }
 
     [AdminCommand(AdminFlags.Round)]
-    public sealed class RecallShuttleCommand : IConsoleCommand
+    public sealed class RecallShuttleCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
 
-        public string Command => "recallshuttle";
-        public string Description => Loc.GetString("recall-shuttle-command-description");
-        public string Help => Loc.GetString("recall-shuttle-command-help-text", ("command",Command));
+        public override string Command => "recallshuttle";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _e.System<RoundEndSystem>().CancelRoundEndCountdown(shell.Player?.AttachedEntity, false);
+            _roundEndSystem.CancelRoundEndCountdown(shell.Player?.AttachedEntity, false);
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/StealthminCommand.cs b/Content.Server/Administration/Commands/StealthminCommand.cs
index 49d8363481..f28fd23f7e 100644
--- a/Content.Server/Administration/Commands/StealthminCommand.cs
+++ b/Content.Server/Administration/Commands/StealthminCommand.cs
@@ -1,39 +1,33 @@
 using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
-using JetBrains.Annotations;
 using Robust.Shared.Console;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Commands;
 
-[UsedImplicitly]
 [AdminCommand(AdminFlags.Stealth)]
 public sealed class StealthminCommand : LocalizedCommands
 {
+    [Dependency] private readonly IAdminManager _adminManager = default!;
+
     public override string Command => "stealthmin";
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-            var player = shell.Player;
-            if (player == null)
-            {
-                shell.WriteLine(Loc.GetString("cmd-stealthmin-no-console"));
-                return;
-            }
+        var player = shell.Player;
+        if (player == null)
+        {
+            shell.WriteLine(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
+        }
 
-            var mgr = IoCManager.Resolve<IAdminManager>();
+        var adminData = _adminManager.GetAdminData(player);
 
-            var adminData = mgr.GetAdminData(player);
+        DebugTools.AssertNotNull(adminData);
 
-            DebugTools.AssertNotNull(adminData);
-
-            if (!adminData!.Stealth)
-            {
-                mgr.Stealth(player);
-            }
-            else
-            {
-                mgr.UnStealth(player);
-            }
+        if (!adminData!.Stealth)
+            _adminManager.Stealth(player);
+        else
+            _adminManager.UnStealth(player);
     }
 }
diff --git a/Content.Server/Administration/Commands/StripAllCommand.cs b/Content.Server/Administration/Commands/StripAllCommand.cs
index ee3e595595..90fcde136d 100644
--- a/Content.Server/Administration/Commands/StripAllCommand.cs
+++ b/Content.Server/Administration/Commands/StripAllCommand.cs
@@ -42,13 +42,12 @@ public sealed class StripAllCommand : LocalizedEntityCommands
 
         if (EntityManager.TryGetComponent<HandsComponent>(targetEntity, out var hands))
         {
-            foreach (var hand in _handsSystem.EnumerateHands(targetEntity.Value, hands))
+            foreach (var hand in _handsSystem.EnumerateHands((targetEntity.Value, hands)))
             {
-                _handsSystem.TryDrop(targetEntity.Value,
+                _handsSystem.TryDrop((targetEntity.Value, hands),
                     hand,
                     checkActionBlocker: false,
-                    doDropInteraction: false,
-                    handsComp: hands);
+                    doDropInteraction: false);
             }
         }
     }
diff --git a/Content.Server/Administration/Commands/VariantizeCommand.cs b/Content.Server/Administration/Commands/VariantizeCommand.cs
index 3f9b7efd07..428207bde6 100644
--- a/Content.Server/Administration/Commands/VariantizeCommand.cs
+++ b/Content.Server/Administration/Commands/VariantizeCommand.cs
@@ -10,7 +10,6 @@ namespace Content.Server.Administration.Commands;
 public sealed class VariantizeCommand : IConsoleCommand
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
 
     public string Command => "variantize";
 
@@ -40,11 +39,12 @@ public sealed class VariantizeCommand : IConsoleCommand
 
         var mapsSystem = _entManager.System<SharedMapSystem>();
         var tileSystem = _entManager.System<TileSystem>();
+        var turfSystem = _entManager.System<TurfSystem>();
 
         foreach (var tile in mapsSystem.GetAllTiles(euid.Value, gridComp))
         {
-            var def = tile.GetContentTileDefinition(_tileDefManager);
-            var newTile = new Tile(tile.Tile.TypeId, tile.Tile.Flags, tileSystem.PickVariant(def));
+            var def = turfSystem.GetContentTileDefinition(tile);
+            var newTile = new Tile(tile.Tile.TypeId, tile.Tile.Flags, tileSystem.PickVariant(def), tile.Tile.RotationMirroring);
             mapsSystem.SetTile(euid.Value, gridComp, tile.GridIndices, newTile);
         }
     }
diff --git a/Content.Server/Administration/Commands/WarpCommand.cs b/Content.Server/Administration/Commands/WarpCommand.cs
index 06d771ec2f..aa1218f0bf 100644
--- a/Content.Server/Administration/Commands/WarpCommand.cs
+++ b/Content.Server/Administration/Commands/WarpCommand.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server.Warps;
 using Content.Shared.Administration;
 using Content.Shared.Follower;
 using Content.Shared.Ghost;
diff --git a/Content.Server/Administration/Components/HeadstandComponent.cs b/Content.Server/Administration/Components/HeadstandComponent.cs
deleted file mode 100644
index 2ab097fad4..0000000000
--- a/Content.Server/Administration/Components/HeadstandComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class HeadstandComponent : SharedHeadstandComponent
-{
-
-}
diff --git a/Content.Server/Administration/Logs/AdminLogManager.cs b/Content.Server/Administration/Logs/AdminLogManager.cs
index 1d6ff13a5a..600311a651 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.cs
@@ -9,12 +9,14 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Mind;
 using Content.Shared.Players.PlayTimeTracking;
 using Prometheus;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
 using Robust.Shared.Timing;
 
@@ -33,6 +35,7 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly ISharedPlaytimeManager _playtime = default!;
     [Dependency] private readonly ISharedChatManager _chat = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
 
     public const string SawmillId = "admin.logs";
 
@@ -299,6 +302,13 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
             return;
         }
 
+        // PostgreSQL does not support storing null chars in text values.
+        if (message.Contains('\0'))
+        {
+            _sawmill.Error($"Null character detected in admin log message '{message}'! LogType: {type}, LogImpact: {impact}");
+            message = message.Replace("\0", "");
+        }
+
         var log = new AdminLog
         {
             Id = NextLogId,
@@ -330,7 +340,8 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
                 var cachedInfo = adminSys.GetCachedPlayerInfo(new NetUserId(id));
                 if (cachedInfo != null && cachedInfo.Antag)
                 {
-                    var subtype = Loc.GetString(cachedInfo.Subtype ?? cachedInfo.RoleProto.Name);
+                    var proto = cachedInfo.RoleProto == null ? null : _proto.Index(cachedInfo.RoleProto.Value);
+                    var subtype = Loc.GetString(cachedInfo.Subtype ?? proto?.Name ?? RoleTypePrototype.FallbackName);
                     logMessage = Loc.GetString(
                         "admin-alert-antag-label",
                         ("message", logMessage),
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 609a51f113..e60a6790b6 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -229,14 +229,14 @@ public sealed class AdminSystem : EntitySystem
         // Visible (identity) name can be different from real name
         if (session?.AttachedEntity != null)
         {
-            entityName = EntityManager.GetComponent<MetaDataComponent>(session.AttachedEntity.Value).EntityName;
+            entityName = Comp<MetaDataComponent>(session.AttachedEntity.Value).EntityName;
             identityName = Identity.Name(session.AttachedEntity.Value, EntityManager);
         }
 
         var antag = false;
 
         // Starting role, antagonist status and role type
-        RoleTypePrototype roleType = new();
+        RoleTypePrototype? roleType = null;
         var startingRole = string.Empty;
         LocId? subtype = null;
         if (_minds.TryGetMind(session, out var mindId, out var mindComp) && mindComp is not null)
@@ -249,7 +249,7 @@ public sealed class AdminSystem : EntitySystem
                 subtype = mindComp.Subtype;
             }
             else
-                Log.Error($"{ToPrettyString(mindId)} has invalid Role Type '{mindComp.RoleType}'. Displaying '{Loc.GetString(roleType.Name)}' instead");
+                Log.Error($"{ToPrettyString(mindId)} has invalid Role Type '{mindComp.RoleType}'. Displaying '{Loc.GetString(RoleTypePrototype.FallbackName)}' instead");
 
             antag = _role.MindIsAntagonist(mindId);
             startingRole = _jobs.MindTryGetJobName(mindId);
@@ -285,7 +285,7 @@ public sealed class AdminSystem : EntitySystem
             identityName,
             startingRole,
             antag,
-            roleType,
+            roleType?.ID,
             subtype,
             sortWeight,
             GetNetEntity(session?.AttachedEntity),
@@ -400,8 +400,13 @@ public sealed class AdminSystem : EntitySystem
         {
             _chat.DeleteMessagesBy(uid);
 
+            var eraseEvent = new EraseEvent(uid);
+
             if (!_minds.TryGetMind(uid, out var mindId, out var mind) || mind.OwnedEntity == null || TerminatingOrDeleted(mind.OwnedEntity.Value))
+            {
+                RaiseLocalEvent(ref eraseEvent);
                 return;
+            }
 
             var entity = mind.OwnedEntity.Value;
 
@@ -450,9 +455,9 @@ public sealed class AdminSystem : EntitySystem
 
             if (TryComp(entity, out HandsComponent? hands))
             {
-                foreach (var hand in _hands.EnumerateHands(entity, hands))
+                foreach (var hand in _hands.EnumerateHands((entity, hands)))
                 {
-                    _hands.TryDrop(entity, hand, checkActionBlocker: false, doDropInteraction: false, handsComp: hands);
+                    _hands.TryDrop((entity, hands), hand, checkActionBlocker: false, doDropInteraction: false);
                 }
             }
 
@@ -461,6 +466,8 @@ public sealed class AdminSystem : EntitySystem
 
             if (_playerManager.TryGetSessionById(uid, out var session))
                 _gameTicker.SpawnObserver(session);
+
+            RaiseLocalEvent(ref eraseEvent);
         }
 
     private void OnSessionPlayTimeUpdated(ICommonSession session)
@@ -468,3 +475,10 @@ public sealed class AdminSystem : EntitySystem
         UpdatePlayerList(session);
     }
 }
+
+/// <summary>
+/// Event fired after a player is erased by an admin
+/// </summary>
+/// <param name="PlayerNetUserId">NetUserId of the player that was the target of the Erase</param>
+[ByRefEvent]
+public record struct EraseEvent(NetUserId PlayerNetUserId);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 34859e80ae..86658b20cb 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -7,6 +7,7 @@ using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Zombies;
 using Content.Shared.Administration;
+using Content.Server.Clothing.Systems;
 using Content.Shared.Database;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind.Components;
@@ -23,38 +24,19 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly ZombieSystem _zombie = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly OutfitSystem _outfit = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultTraitorRule = "Traitor";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultInitialInfectedRule = "Zombie";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultNukeOpRule = "LoneOpsSpawn";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultRevsRule = "Revolutionary";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultThiefRule = "Thief";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultVampireRule = "Vampire";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultChangelingRule = "Changeling";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultFleshCultRule = "FleshCult";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultAssaultOpsRule = "AssaultOps";
-
-    [ValidatePrototypeId<StartingGearPrototype>]
-    private const string PirateGearId = "PirateGear";
-
-    private readonly EntProtoId _paradoxCloneRuleId = "ParadoxCloneSpawn";
+    private static readonly EntProtoId DefaultTraitorRule = "Traitor";
+    private static readonly EntProtoId DefaultInitialInfectedRule = "Zombie";
+    private static readonly EntProtoId DefaultNukeOpRule = "LoneOpsSpawn";
+    private static readonly EntProtoId DefaultRevsRule = "Revolutionary";
+    private static readonly EntProtoId DefaultThiefRule = "Thief";
+    private static readonly EntProtoId DefaultChangelingRule = "Changeling";
+    private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
+    private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
+    private static readonly EntProtoId DefaultAssaultOpsRule = "AssaultOps";
+    private static readonly EntProtoId DefaultFleshCultRule = "FleshCult";
+    private static readonly EntProtoId DefaultVampireRule = "Vampire";
 
     // All antag verbs have names so invokeverb works.
     private void AddAntagVerbs(GetVerbsEvent<Verb> args)
@@ -83,7 +65,7 @@ public sealed partial class AdminVerbSystem
                 _antag.ForceMakeAntag<TraitorRuleComponent>(targetPlayer, DefaultTraitorRule);
             },
             Impact = LogImpact.High,
-            Message = string.Join(": ", traitorName,  Loc.GetString("admin-verb-make-traitor")),
+            Message = string.Join(": ", traitorName, Loc.GetString("admin-verb-make-traitor")),
         };
         args.Verbs.Add(traitor);
 
@@ -141,7 +123,7 @@ public sealed partial class AdminVerbSystem
             Act = () =>
             {
                 // pirates just get an outfit because they don't really have logic associated with them
-                SetOutfitCommand.SetOutfit(args.Target, PirateGearId, EntityManager);
+                _outfit.SetOutfit(args.Target, PirateGearId);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", pirateName, Loc.GetString("admin-verb-make-pirate")),
@@ -178,6 +160,21 @@ public sealed partial class AdminVerbSystem
         };
         args.Verbs.Add(thief);
 
+        var changelingName = Loc.GetString("admin-verb-text-make-changeling");
+        Verb changeling = new()
+        {
+            Text = changelingName,
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Weapons/Melee/armblade.rsi"), "icon"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<ChangelingRuleComponent>(targetPlayer, DefaultChangelingRule);
+            },
+            Impact = LogImpact.High,
+            Message = string.Join(": ", changelingName, Loc.GetString("admin-verb-make-changeling")),
+        };
+        args.Verbs.Add(changeling);
+
         var paradoxCloneName = Loc.GetString("admin-verb-text-make-paradox-clone");
         Verb paradox = new()
         {
@@ -186,7 +183,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "ParadoxClone"),
             Act = () =>
             {
-                var ruleEnt = _gameTicker.AddGameRule(_paradoxCloneRuleId);
+                var ruleEnt = _gameTicker.AddGameRule(ParadoxCloneRuleId);
 
                 if (!TryComp<ParadoxCloneRuleComponent>(ruleEnt, out var paradoxCloneRuleComp))
                     return;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 5d79b05108..818464e2d8 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -1,12 +1,12 @@
 using System.Numerics;
 using System.Threading;
-using Content.Server.Administration.Commands;
 using Content.Server.Administration.Components;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Server.Clothing.Systems;
 using Content.Server.Electrocution;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.GhostKick;
@@ -46,16 +46,17 @@ using Content.Shared.Movement.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Content.Shared.Slippery;
+using Content.Shared.Stunnable;
 using Content.Shared.Tabletop.Components;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Verbs;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Timer = Robust.Shared.Timing.Timer;
 
@@ -96,7 +97,7 @@ public sealed partial class AdminVerbSystem
     // All smite verbs have names so invokeverb works.
     private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
     {
-        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+        if (!TryComp(args.User, out ActorComponent? actor))
             return;
 
         var player = actor.PlayerSession;
@@ -304,7 +305,7 @@ public sealed partial class AdminVerbSystem
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/tomato_splat.rsi"), "puddle-1"),
                 Act = () =>
                 {
-                    _bloodstreamSystem.SpillAllSolutions(args.Target, bloodstream);
+                    _bloodstreamSystem.SpillAllSolutions((args.Target, bloodstream));
                     var xform = Transform(args.Target);
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-blood-self"),
                         args.Target,
@@ -653,15 +654,12 @@ public sealed partial class AdminVerbSystem
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi"), "icon"),
                 Act = () =>
                 {
-                    SetOutfitCommand.SetOutfit(args.Target,
-                        "JanitorMaidGear",
-                        EntityManager,
-                        (_, clothing) =>
-                        {
-                            if (HasComp<ClothingComponent>(clothing))
-                                EnsureComp<UnremoveableComponent>(clothing);
-                            EnsureComp<ClumsyComponent>(args.Target);
-                        });
+                    _outfit.SetOutfit(args.Target, "JanitorMaidGear", (_, clothing) =>
+                    {
+                        if (HasComp<ClothingComponent>(clothing))
+                            EnsureComp<UnremoveableComponent>(clothing);
+                        EnsureComp<ClumsyComponent>(args.Target);
+                    });
                 },
                 Impact = LogImpact.Extreme,
                 Message = string.Join(": ", maidenName, Loc.GetString("admin-smite-maid-description"))
@@ -692,7 +690,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Materials/materials.rsi"), "ash"),
             Act = () =>
             {
-                EntityManager.QueueDeleteEntity(args.Target);
+                QueueDel(args.Target);
                 Spawn("Ash", Transform(args.Target).Coordinates);
                 _popupSystem.PopupEntity(Loc.GetString("admin-smite-turned-ash-other", ("name", args.Target)),
                     args.Target,
@@ -955,7 +953,7 @@ public sealed partial class AdminVerbSystem
                 if (!hadSlipComponent)
                 {
                     slipComponent.SlipData.SuperSlippery = true;
-                    slipComponent.SlipData.ParalyzeTime = TimeSpan.FromSeconds(5);
+                    slipComponent.SlipData.StunTime = TimeSpan.FromSeconds(5);
                     slipComponent.SlipData.LaunchForwardsMultiplier = 20;
                 }
 
@@ -1001,6 +999,21 @@ public sealed partial class AdminVerbSystem
         };
         args.Verbs.Add(omniaccent);
 
+        var crawlerName = Loc.GetString("admin-smite-crawler-name").ToLowerInvariant();
+        Verb crawler = new()
+        {
+            Text = crawlerName,
+            Category = VerbCategory.Smite,
+            Icon = new SpriteSpecifier.Rsi(new("Mobs/Animals/snake.rsi"), "icon"),
+            Act = () =>
+            {
+                EnsureComp<WormComponent>(args.Target);
+            },
+            Impact = LogImpact.Extreme,
+            Message = string.Join(": ", crawlerName, Loc.GetString("admin-smite-crawler-description"))
+        };
+        args.Verbs.Add(crawler);
+
         Verb terminate = new()
         {
             Text = "admin-smite-terminate-name",
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 8508064cab..46412c1200 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -3,15 +3,12 @@ using System.Linq;
 using System.Numerics;
 using Content.Server._Sunrise.ScaleSprite;
 using Content.Server.Administration.Components;
-using Content.Server.Atmos;
-using Content.Server.Atmos.Components;
 using Content.Server.Cargo.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Hands.Systems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared._Sunrise.ScaleSprite;
@@ -30,6 +27,7 @@ using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Stacks;
+using Content.Shared.Station.Components;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Server.Physics;
@@ -62,7 +60,7 @@ public sealed partial class AdminVerbSystem
 
     private void AddTricksVerbs(GetVerbsEvent<Verb> args)
     {
-        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+        if (!TryComp(args.User, out ActorComponent? actor))
             return;
 
         var player = actor.PlayerSession;
@@ -865,7 +863,7 @@ public sealed partial class AdminVerbSystem
         }
         else if (TryComp<HandsComponent>(target, out var hands))
         {
-            foreach (var held in _handsSystem.EnumerateHeld(target, hands))
+            foreach (var held in _handsSystem.EnumerateHeld((target, hands)))
             {
                 if (HasComp<AccessComponent>(held))
                 {
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 15ec7da467..61e3013bd9 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -4,7 +4,6 @@ using Content.Server.Administration.UI;
 using Content.Server.Disposal.Tube;
 using Content.Server.EUI;
 using Content.Server.Ghost.Roles;
-using Content.Server.Mind.Commands;
 using Content.Server.Mind;
 using Content.Server.Prayer;
 using Content.Server.Silicons.Laws;
@@ -16,7 +15,6 @@ using Content.Shared.Configurable;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.GameTicking;
-using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Mind.Components;
 using Content.Shared.Movement.Components;
@@ -88,7 +86,7 @@ namespace Content.Server.Administration.Systems
 
         private void AddAdminVerbs(GetVerbsEvent<Verb> args)
         {
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            if (!TryComp(args.User, out ActorComponent? actor))
                 return;
 
             var player = actor.PlayerSession;
@@ -390,12 +388,28 @@ namespace Content.Server.Administration.Systems
                         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
+                });
             }
         }
 
         private void AddDebugVerbs(GetVerbsEvent<Verb> args)
         {
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            if (!TryComp(args.User, out ActorComponent? actor))
                 return;
 
             var player = actor.PlayerSession;
@@ -408,7 +422,7 @@ namespace Content.Server.Administration.Systems
                     Text = Loc.GetString("delete-verb-get-data-text"),
                     Category = VerbCategory.Debug,
                     Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png")),
-                    Act = () => EntityManager.DeleteEntity(args.Target),
+                    Act = () => Del(args.Target),
                     Impact = LogImpact.Medium,
                     ConfirmationPopup = true
                 };
@@ -451,14 +465,14 @@ namespace Content.Server.Administration.Systems
             // Make Sentient verb
             if (_groupController.CanCommand(player, "makesentient") &&
                 args.User != args.Target &&
-                !EntityManager.HasComponent<MindContainerComponent>(args.Target))
+                !HasComp<MindContainerComponent>(args.Target))
             {
                 Verb verb = new()
                 {
                     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),
+                    Act = () => _mindSystem.MakeSentient(args.Target),
                     Impact = LogImpact.Medium
                 };
                 args.Verbs.Add(verb);
@@ -517,7 +531,7 @@ namespace Content.Server.Administration.Systems
 
             // Get Disposal tube direction verb
             if (_groupController.CanCommand(player, "tubeconnections") &&
-                EntityManager.TryGetComponent(args.Target, out DisposalTubeComponent? tube))
+                TryComp(args.Target, out DisposalTubeComponent? tube))
             {
                 Verb verb = new()
                 {
@@ -544,7 +558,7 @@ namespace Content.Server.Administration.Systems
             }
 
             if (_groupController.CanAdminMenu(player) &&
-                EntityManager.TryGetComponent(args.Target, out ConfigurationComponent? config))
+                TryComp(args.Target, out ConfigurationComponent? config))
             {
                 Verb verb = new()
                 {
@@ -558,7 +572,7 @@ namespace Content.Server.Administration.Systems
 
             // Add verb to open Solution Editor
             if (_groupController.CanCommand(player, "addreagent") &&
-                EntityManager.HasComponent<SolutionContainerManagerComponent>(args.Target))
+                HasComp<SolutionContainerManagerComponent>(args.Target))
             {
                 Verb verb = new()
                 {
diff --git a/Content.Server/Administration/UI/AdminCameraEui.cs b/Content.Server/Administration/UI/AdminCameraEui.cs
new file mode 100644
index 0000000000..5230933c82
--- /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/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
deleted file mode 100644
index 94650234bb..0000000000
--- a/Content.Server/Advertise/Components/AdvertiseComponent.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Content.Server.Advertise.EntitySystems;
-using Content.Shared.Dataset;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Advertise.Components;
-
-/// <summary>
-/// Makes this entity periodically advertise by speaking a randomly selected
-/// message from a specified dataset into local chat.
-/// </summary>
-[RegisterComponent, Access(typeof(AdvertiseSystem))]
-public sealed partial class AdvertiseComponent : Component
-{
-    /// <summary>
-    /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1.
-    /// </summary>
-    [DataField]
-    public int MinimumWait { get; private set; } = 8 * 60;
-
-    /// <summary>
-    /// Maximum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal
-    /// to <see cref="MinimumWait"/>
-    /// </summary>
-    [DataField]
-    public int MaximumWait { get; private set; } = 10 * 60;
-
-    /// <summary>
-    /// If true, the delay before the first advertisement (at MapInit) will ignore <see cref="MinimumWait"/>
-    /// and instead be rolled between 0 and <see cref="MaximumWait"/>. This only applies to the initial delay;
-    /// <see cref="MinimumWait"/> will be respected after that.
-    /// </summary>
-    [DataField]
-    public bool Prewarm = true;
-
-    /// <summary>
-    /// The identifier for the advertisements dataset prototype.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
-
-    /// <summary>
-    /// The next time an advertisement will be said.
-    /// </summary>
-    [DataField]
-    public TimeSpan NextAdvertisementTime { get; set; } = TimeSpan.Zero;
-
-}
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
deleted file mode 100644
index 7f2e128183..0000000000
--- a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using Content.Server.Advertise.Components;
-using Content.Server.Chat.Systems;
-using Content.Server.Power.Components;
-using Content.Shared.VendingMachines;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Advertise.EntitySystems;
-
-public sealed class AdvertiseSystem : EntitySystem
-{
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-
-    /// <summary>
-    /// The maximum amount of time between checking if advertisements should be displayed
-    /// </summary>
-    private readonly TimeSpan _maximumNextCheckDuration = TimeSpan.FromSeconds(15);
-
-    /// <summary>
-    /// The next time the game will check if advertisements should be displayed
-    /// </summary>
-    private TimeSpan _nextCheckTime = TimeSpan.MinValue;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<AdvertiseComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<ApcPowerReceiverComponent, AttemptAdvertiseEvent>(OnPowerReceiverAttemptAdvertiseEvent);
-        SubscribeLocalEvent<VendingMachineComponent, AttemptAdvertiseEvent>(OnVendingAttemptAdvertiseEvent);
-
-        _nextCheckTime = TimeSpan.MinValue;
-    }
-
-    private void OnMapInit(EntityUid uid, AdvertiseComponent advert, MapInitEvent args)
-    {
-        var prewarm = advert.Prewarm;
-        RandomizeNextAdvertTime(advert, prewarm);
-        _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
-    }
-
-    private void RandomizeNextAdvertTime(AdvertiseComponent advert, bool prewarm = false)
-    {
-        var minDuration = prewarm ? 0 : Math.Max(1, advert.MinimumWait);
-        var maxDuration = Math.Max(minDuration, advert.MaximumWait);
-        var waitDuration = TimeSpan.FromSeconds(_random.Next(minDuration, maxDuration));
-
-        advert.NextAdvertisementTime = _gameTiming.CurTime + waitDuration;
-    }
-
-    public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advert = null)
-    {
-        if (!Resolve(uid, ref advert))
-            return;
-
-        var attemptEvent = new AttemptAdvertiseEvent(uid);
-        RaiseLocalEvent(uid, ref attemptEvent);
-        if (attemptEvent.Cancelled)
-            return;
-
-        if (_prototypeManager.TryIndex(advert.Pack, out var advertisements))
-            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Values)), InGameICChatType.Speak, hideChat: true);
-    }
-
-    public override void Update(float frameTime)
-    {
-        var currentGameTime = _gameTiming.CurTime;
-        if (_nextCheckTime > currentGameTime)
-            return;
-
-        // _nextCheckTime starts at TimeSpan.MinValue, so this has to SET the value, not just increment it.
-        _nextCheckTime = currentGameTime + _maximumNextCheckDuration;
-
-        var query = EntityQueryEnumerator<AdvertiseComponent>();
-        while (query.MoveNext(out var uid, out var advert))
-        {
-            if (currentGameTime > advert.NextAdvertisementTime)
-            {
-                SayAdvertisement(uid, advert);
-                // The timer is always refreshed when it expires, to prevent mass advertising (ex: all the vending machines have no power, and get it back at the same time).
-                RandomizeNextAdvertTime(advert);
-            }
-            _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
-        }
-    }
-
-
-    private static void OnPowerReceiverAttemptAdvertiseEvent(EntityUid uid, ApcPowerReceiverComponent powerReceiver, ref AttemptAdvertiseEvent args)
-    {
-        args.Cancelled |= !powerReceiver.Powered;
-    }
-
-    private static void OnVendingAttemptAdvertiseEvent(EntityUid uid, VendingMachineComponent machine, ref AttemptAdvertiseEvent args)
-    {
-        args.Cancelled |= machine.Broken;
-    }
-}
-
-[ByRefEvent]
-public record struct AttemptAdvertiseEvent(EntityUid? Advertiser)
-{
-    public bool Cancelled = false;
-}
diff --git a/Content.Server/Afk/IsAfkCommand.cs b/Content.Server/Afk/IsAfkCommand.cs
index ebeb200d89..768172a92a 100644
--- a/Content.Server/Afk/IsAfkCommand.cs
+++ b/Content.Server/Afk/IsAfkCommand.cs
@@ -6,34 +6,31 @@ using Robust.Shared.Console;
 namespace Content.Server.Afk
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class IsAfkCommand : IConsoleCommand
+    public sealed class IsAfkCommand : LocalizedCommands
     {
+        [Dependency] private readonly IAfkManager _afkManager = default!;
         [Dependency] private readonly IPlayerManager _players = default!;
 
-        public string Command => "isafk";
-        public string Description => "Checks if a specified player is AFK";
-        public string Help => "Usage: isafk <playerName>";
+        public override string Command => "isafk";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var afkManager = IoCManager.Resolve<IAfkManager>();
-
             if (args.Length == 0)
             {
-                shell.WriteError("Need one argument");
+                shell.WriteError(Loc.GetString($"shell-need-exactly-one-argument"));
                 return;
             }
 
             if (!_players.TryGetSessionByUsername(args[0], out var player))
             {
-                shell.WriteError("Unable to find that player");
+                shell.WriteError(Loc.GetString($"shell-target-player-does-not-exist"));
                 return;
             }
 
-            shell.WriteLine(afkManager.IsAfk(player) ? "They are indeed AFK" : "They are not AFK");
+            shell.WriteLine(Loc.GetString(_afkManager.IsAfk(player) ? "cmd-isafk-true" : "cmd-isafk-false"));
         }
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             if (args.Length == 1)
             {
diff --git a/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs b/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs
deleted file mode 100644
index aa6c5ba2bd..0000000000
--- a/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.AlertLevel.Systems;
-
-namespace Content.Server.AlertLevel;
-/// <summary>
-/// This component is for changing the alert level of the station when triggered.
-/// </summary>
-[RegisterComponent, Access(typeof(AlertLevelChangeOnTriggerSystem))]
-public sealed partial class AlertLevelChangeOnTriggerComponent : Component
-{
-    ///<summary>
-    ///The alert level to change to when triggered.
-    ///</summary>
-    [DataField]
-    public string Level = "blue";
-
-    /// <summary>
-    ///Whether to play the sound when the alert level changes.
-    /// </summary>
-    [DataField]
-    public bool PlaySound = true;
-
-    /// <summary>
-    ///Whether to say the announcement when the alert level changes.
-    /// </summary>
-    [DataField]
-    public bool Announce = true;
-
-    /// <summary>
-    ///Force the alert change. This applies if the alert level is not selectable or not.
-    /// </summary>
-    [DataField]
-    public bool Force = false;
-}
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index 16800711ff..dd4e5f9fc3 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -2,15 +2,15 @@
 using Content.Server.Administration;
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
-using JetBrains.Annotations;
 using Robust.Shared.Console;
 
 namespace Content.Server.AlertLevel.Commands
 {
-    [UsedImplicitly]
     [AdminCommand(AdminFlags.Fun)]
-    public sealed class SetAlertLevelCommand : LocalizedCommands
+    public sealed class SetAlertLevelCommand : LocalizedEntityCommands
     {
+        [Dependency] private readonly AlertLevelSystem _alertLevelSystem = default!;
+        [Dependency] private readonly StationSystem _stationSystem = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
         [Dependency] private readonly IEntityManager _entManager = default!; // Sunrise-Added
 
@@ -22,11 +22,9 @@ namespace Content.Server.AlertLevel.Commands
             var player = shell.Player;
             if (player?.AttachedEntity != null)
             {
-                var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+                var stationUid = _stationSystem.GetOwningStation(player.AttachedEntity.Value);
                 if (stationUid != null)
-                {
                     levelNames = GetStationLevelNames(stationUid.Value);
-                }
             }
 
             return args.Length switch
@@ -61,7 +59,7 @@ namespace Content.Server.AlertLevel.Commands
                 return;
             }
 
-            var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+            var stationUid = _stationSystem.GetOwningStation(player.AttachedEntity.Value);
             if (stationUid == null)
             {
                 shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-grid"));
@@ -76,13 +74,12 @@ namespace Content.Server.AlertLevel.Commands
                 return;
             }
 
-            _entitySystems.GetEntitySystem<AlertLevelSystem>().SetLevel(stationUid.Value, level, true, true, true, locked);
+            _alertLevelSystem.SetLevel(stationUid.Value, level, true, true, true, locked);
         }
 
         private string[] GetStationLevelNames(EntityUid station)
         {
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            if (!entityManager.TryGetComponent<AlertLevelComponent>(station, out var alertLevelComp))
+            if (!EntityManager.TryGetComponent<AlertLevelComponent>(station, out var alertLevelComp))
                 return new string[]{};
 
             if (alertLevelComp.AlertLevels == null)
diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
index a2e25f269a..4276eafd60 100644
--- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
+++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
@@ -246,7 +246,7 @@ public sealed class AmeControllerSystem : EntitySystem
             return;
 
         var humanReadableState = value ? "Inject" : "Not inject";
-        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{EntityManager.ToPrettyString(user.Value):player} has set the AME to {humanReadableState}");
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(user.Value):player} has set the AME to {humanReadableState}");
     }
 
     public void ToggleInjecting(EntityUid uid, EntityUid? user = null, AmeControllerComponent? controller = null)
@@ -281,7 +281,7 @@ public sealed class AmeControllerSystem : EntitySystem
 
         var logImpact = (oldValue <= safeLimit && value > safeLimit) ? LogImpact.Extreme : LogImpact.Medium;
 
-        _adminLogger.Add(LogType.Action, logImpact, $"{EntityManager.ToPrettyString(user.Value):player} has set the AME to inject {controller.InjectionAmount} while set to {humanReadableState}");
+        _adminLogger.Add(LogType.Action, logImpact, $"{ToPrettyString(user.Value):player} has set the AME to inject {controller.InjectionAmount} while set to {humanReadableState}");
     }
 
     public void AdjustInjectionAmount(EntityUid uid, int delta, EntityUid? user = null, AmeControllerComponent? controller = null)
diff --git a/Content.Server/Animals/Components/ParrotListenerComponent.cs b/Content.Server/Animals/Components/ParrotListenerComponent.cs
new file mode 100644
index 0000000000..9d0c8a2d01
--- /dev/null
+++ b/Content.Server/Animals/Components/ParrotListenerComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Server.Animals.Components;
+
+/// <summary>
+/// Makes an entity able to listen to messages from IC chat and attempt to commit them to memory
+/// </summary>
+[RegisterComponent]
+public sealed partial class ParrotListenerComponent : Component
+{
+    /// <summary>
+    /// Whitelist for purposes of limiting which entities a parrot will listen to
+    ///
+    /// This is here because parrots can learn via local chat or radio from other parrots. this can quickly devolve from
+    /// SQUAWK! Polly wants a cracker! BRAAWK
+    /// to
+    /// BRAAWK! SQUAWK! RAWWK! Polly wants a cracker! AAWK! AWWK! Cracker! SQUAWK! BRAWWK! SQUAWK!
+    /// This is limited somewhat by the message length limit on ParrotMemoryComponent, but can be prevented entirely here
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist for purposes of ignoring entities
+    /// As above, this is here to force parrots to ignore certain entities.
+    /// For example, polly will be consistently mapped around EngiDrobes, which will consistently say stuff like
+    /// "Guaranteed to protect your feet from industrial accidents!"
+    /// If polly ends up constantly advertising engineering drip, this can be used to prevent it.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+}
diff --git a/Content.Server/Animals/Systems/ParrotMemorySystem.cs b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
new file mode 100644
index 0000000000..a88957913f
--- /dev/null
+++ b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
@@ -0,0 +1,221 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Administration.Managers;
+using Content.Server.Administration.Systems;
+using Content.Server.Animals.Components;
+using Content.Server.Mind;
+using Content.Server.Popups;
+using Content.Server.Radio;
+using Content.Server.Vocalization.Systems;
+using Content.Shared.Animals.Components;
+using Content.Shared.Animals.Systems;
+using Content.Shared.Database;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Animals.Systems;
+
+/// <summary>
+/// The ParrotMemorySystem handles remembering messages received through local chat (activelistener) or a radio
+/// (radiovocalizer) and stores them in a list. When an entity with a VocalizerComponent attempts to vocalize, this will
+/// try to set the message from memory.
+/// </summary>
+public sealed partial class ParrotMemorySystem : SharedParrotMemorySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IAdminManager _admin = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EraseEvent>(OnErase);
+
+        SubscribeLocalEvent<ParrotListenerComponent, MapInitEvent>(ListenerOnMapInit);
+
+        SubscribeLocalEvent<ParrotListenerComponent, ListenEvent>(OnListen);
+        SubscribeLocalEvent<ParrotListenerComponent, HeadsetRadioReceiveRelayEvent>(OnHeadsetReceive);
+
+        SubscribeLocalEvent<ParrotMemoryComponent, TryVocalizeEvent>(OnTryVocalize);
+    }
+
+    private void OnErase(ref EraseEvent args)
+    {
+        DeletePlayerMessages(args.PlayerNetUserId);
+    }
+
+    private void ListenerOnMapInit(Entity<ParrotListenerComponent> entity, ref MapInitEvent args)
+    {
+        // If an entity has a ParrotListenerComponent it really ought to have an ActiveListenerComponent
+        if (!HasComp<ActiveListenerComponent>(entity))
+            Log.Warning($"Entity {ToPrettyString(entity)} has a ParrotListenerComponent but was not given an ActiveListenerComponent");
+    }
+
+    private void OnListen(Entity<ParrotListenerComponent> entity, ref ListenEvent args)
+    {
+
+        TryLearn(entity.Owner, args.Message, args.Source);
+    }
+
+    private void OnHeadsetReceive(Entity<ParrotListenerComponent> entity, ref HeadsetRadioReceiveRelayEvent args)
+    {
+        var message = args.RelayedEvent.Message;
+        var source = args.RelayedEvent.MessageSource;
+
+        TryLearn(entity.Owner, message, source);
+    }
+
+    /// <summary>
+    /// Called when an entity with a ParrotMemoryComponent tries to vocalize.
+    /// This function picks a message from memory and sets the event to handled
+    /// </summary>
+    private void OnTryVocalize(Entity<ParrotMemoryComponent> entity, ref TryVocalizeEvent args)
+    {
+        // return if this was already handled
+        if (args.Handled)
+            return;
+
+        // if there are no memories, return
+        if (entity.Comp.SpeechMemories.Count == 0)
+            return;
+
+        // get a random memory from the memory list
+        var memory = _random.Pick(entity.Comp.SpeechMemories);
+
+        args.Message = memory.Message;
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Try to learn a new message, returning early if this entity cannot learn a new message,
+    /// the message doesn't pass certain checks, or the chance for learning a new message fails
+    /// </summary>
+    /// <param name="entity">Entity learning a new word</param>
+    /// <param name="incomingMessage">Message to learn</param>
+    /// <param name="source">Source EntityUid of the message</param>
+    public void TryLearn(Entity<ParrotMemoryComponent?, ParrotListenerComponent?> entity, string incomingMessage, EntityUid source)
+    {
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
+            return;
+
+        if (!_whitelist.CheckBoth(source, entity.Comp2.Blacklist, entity.Comp2.Whitelist))
+            return;
+
+        if (source.Equals(entity) || _mobState.IsIncapacitated(entity))
+            return;
+
+        // can't learn too soon after having already learnt something else
+        if (_gameTiming.CurTime < entity.Comp1.NextLearnInterval)
+            return;
+
+        // remove whitespace around message, if any
+        var message = incomingMessage.Trim();
+
+        // ignore messages containing tildes. This is a crude way to ignore whispers that are too far away
+        // TODO: this isn't great. This should be replaced with a const or we should have a better way to check faraway messages
+        if (message.Contains('~'))
+            return;
+
+        // ignore empty messages. These probably aren't sent anyway but just in case
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        // ignore messages that are too short or too long
+        if (message.Length < entity.Comp1.MinEntryLength || message.Length > entity.Comp1.MaxEntryLength)
+            return;
+
+        // only from this point this message has a chance of being learned
+        // set new time for learn interval, regardless of whether the learning succeeds
+        entity.Comp1.NextLearnInterval = _gameTiming.CurTime + entity.Comp1.LearnCooldown;
+
+        // decide if this message passes the learning chance
+        if (!_random.Prob(entity.Comp1.LearnChance))
+            return;
+
+        // actually commit this message to memory
+        Learn((entity, entity.Comp1), message, source);
+    }
+
+    /// <summary>
+    /// Actually learn a message and commit it to memory
+    /// </summary>
+    /// <param name="entity">Entity learning a new word</param>
+    /// <param name="message">Message to learn</param>
+    /// <param name="source">Source EntityUid of the message</param>
+    private void Learn(Entity<ParrotMemoryComponent> entity, string message, EntityUid source)
+    {
+        // log a low-priority chat type log to the admin logger
+        // specifies what message was learnt by what entity, and who taught the message to that entity
+        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Parroting entity {ToPrettyString(entity):entity} learned the phrase \"{message}\" from {ToPrettyString(source):speaker}");
+
+        NetUserId? sourceNetUserId = null;
+        if (_mind.TryGetMind(source, out _, out var mind))
+        {
+            sourceNetUserId = mind.UserId;
+        }
+
+        var newMemory = new SpeechMemory(sourceNetUserId, message);
+
+        // add a new message if there is space in the memory
+        if (entity.Comp.SpeechMemories.Count < entity.Comp.MaxSpeechMemory)
+        {
+            entity.Comp.SpeechMemories.Add(newMemory);
+            return;
+        }
+
+        // if there's no space in memory, replace something at random
+        var replaceIdx = _random.Next(entity.Comp.SpeechMemories.Count);
+        entity.Comp.SpeechMemories[replaceIdx] = newMemory;
+    }
+
+    /// <summary>
+    /// Delete all messages from a specified player on all ParrotMemoryComponents
+    /// </summary>
+    /// <param name="playerNetUserId">The player of whom to delete messages</param>
+    private void DeletePlayerMessages(NetUserId playerNetUserId)
+    {
+        // query to enumerate all entities with a memorycomponent
+        var query = EntityQueryEnumerator<ParrotMemoryComponent>();
+        while (query.MoveNext(out _, out var memory))
+        {
+            DeletePlayerMessages(memory, playerNetUserId);
+        }
+    }
+
+    /// <summary>
+    /// Delete all messages from a specified player on a given ParrotMemoryComponent
+    /// </summary>
+    /// <param name="memoryComponent">The ParrotMemoryComponent on which to delete messages</param>
+    /// <param name="playerNetUserId">The player of whom to delete messages</param>
+    private void DeletePlayerMessages(ParrotMemoryComponent memoryComponent, NetUserId playerNetUserId)
+    {
+        // this is a sort of expensive operation that is hopefully rare and performed on just a few parrots
+        // with limited memory
+        for (var i = 0; i < memoryComponent.SpeechMemories.Count; i++)
+        {
+            var memory = memoryComponent.SpeechMemories[i];
+
+            // netuserid may be null if the message was learnt from a non-player entity
+            if (memory.NetUserId is null)
+                continue;
+
+            // skip if this memory was not learnt from the target user
+            if (!memory.NetUserId.Equals(playerNetUserId))
+                continue;
+
+            // order isn't important in this list so we can use the faster means of removing
+            memoryComponent.SpeechMemories.RemoveSwap(i);
+        }
+    }
+}
diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs
index 1b88429204..46ad9278f8 100644
--- a/Content.Server/Anomaly/AnomalySystem.Generator.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs
@@ -1,6 +1,5 @@
 using Content.Server.Anomaly.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Shared.Anomaly;
 using Content.Shared.CCVar;
 using Content.Shared.Materials;
@@ -164,8 +163,7 @@ public sealed partial class AnomalySystem
         var xform = Transform(uid);
 
         if (_station.GetStationInMap(xform.MapID) is not { } station ||
-            !TryComp<StationDataComponent>(station, out var data) ||
-            _station.GetLargestGrid(data) is not { } grid)
+            _station.GetLargestGrid(station) is not { } grid)
         {
             if (xform.GridUid == null)
                 return;
diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index b0de3de8f3..9ac0ce7c94 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -44,8 +44,7 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     public const float MinParticleVariation = 0.8f;
     public const float MaxParticleVariation = 1.2f;
 
-    [ValidatePrototypeId<WeightedRandomPrototype>]
-    const string WeightListProto = "AnomalyBehaviorList";
+    private static readonly ProtoId<WeightedRandomPrototype> WeightListProto = "AnomalyBehaviorList";
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -189,7 +188,7 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     #region Behavior
     private string GetRandomBehavior()
     {
-        var weightList = _prototype.Index<WeightedRandomPrototype>(WeightListProto);
+        var weightList = _prototype.Index(WeightListProto);
         return weightList.Pick(_random);
     }
 
diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
index ff644ad3e0..bed2499298 100644
--- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
@@ -96,7 +96,7 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
 
         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 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
 
     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 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
         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/Arcade/BlockGame/BlockGameArcadeSystem.cs b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
index a0e52e9b48..1e8ed8cdf3 100644
--- a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
@@ -29,7 +29,7 @@ public sealed class BlockGameArcadeSystem : EntitySystem
 
     public override void Update(float frameTime)
     {
-        var query = EntityManager.EntityQueryEnumerator<BlockGameArcadeComponent>();
+        var query = EntityQueryEnumerator<BlockGameArcadeComponent>();
         while (query.MoveNext(out var _, out var blockGame))
         {
             blockGame.Game?.GameTick(frameTime);
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
index d06eea47f1..208708a85a 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Arcade;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.Arcade.SpaceVillain;
 
@@ -90,8 +89,8 @@ public sealed partial class SpaceVillainArcadeComponent : SharedSpaceVillainArca
     /// The prototypes that can be dispensed as a reward for winning the game.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("possibleRewards", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> PossibleRewards = new();
+    [DataField]
+    public List<EntProtoId> PossibleRewards = new();
 
     /// <summary>
     /// The minimum number of prizes the arcade machine can have.
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
index 20ee89eb3e..0d98c6b5cf 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
@@ -45,7 +45,7 @@ public sealed partial class SpaceVillainArcadeSystem : EntitySystem
         if (arcade.RewardAmount <= 0)
             return;
 
-        EntityManager.SpawnEntity(_random.Pick(arcade.PossibleRewards), xform.Coordinates);
+        Spawn(_random.Pick(arcade.PossibleRewards), xform.Coordinates);
         arcade.RewardAmount--;
     }
 
diff --git a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
index a7debbdc80..ebe79c6b5d 100644
--- a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
+++ b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
@@ -17,6 +17,7 @@ using Robust.Shared.Map.Components;
 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 sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleS
 
         // Grid events
         SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+        SubscribeLocalEvent<PipeNodeGroupRemovedEvent>(OnPipeNodeGroupRemoved);
     }
 
     #region Event handling
@@ -295,6 +297,25 @@ public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleS
 
     #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 @@ public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleS
                 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);
@@ -497,7 +518,7 @@ public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleS
         if (component.NavMapBlip == null)
             return;
 
-        var netEntity = EntityManager.GetNetEntity(uid);
+        var netEntity = GetNetEntity(uid);
         var query = AllEntityQuery<AtmosMonitoringConsoleComponent, TransformComponent>();
 
         while (query.MoveNext(out var ent, out var entConsole, out var entXform))
@@ -531,7 +552,7 @@ public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleS
         if (component.NavMapBlip == null)
             return;
 
-        var netEntity = EntityManager.GetNetEntity(uid);
+        var netEntity = GetNetEntity(uid);
         var query = AllEntityQuery<AtmosMonitoringConsoleComponent>();
 
         while (query.MoveNext(out var ent, out var entConsole))
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index cd07da7112..4a108b38a4 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -122,7 +122,7 @@ namespace Content.Server.Atmos.EntitySystems
 
         public void InvalidatePosition(Entity<MapGridComponent?> grid, Vector2i pos)
         {
-            var query = EntityManager.GetEntityQuery<AirtightComponent>();
+            var query = GetEntityQuery<AirtightComponent>();
             _explosionSystem.UpdateAirtightMap(grid, pos, grid, query);
             _atmosphereSystem.InvalidateTile(grid.Owner, pos);
         }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index df31db6ba0..67f3a20779 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -279,6 +279,14 @@ public partial class AtmosphereSystem
 
     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 @@ public partial class AtmosphereSystem
     [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/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index f38ec3fef6..6893940a97 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -252,6 +252,128 @@ namespace Content.Server.Atmos.EntitySystems
             Merge(destination, buffer);
         }
 
+        /// <summary>
+        /// Calculates the dimensionless fraction of gas required to equalize pressure between two gas mixtures.
+        /// </summary>
+        /// <param name="gasMixture1">The first gas mixture involved in the pressure equalization.
+        /// This mixture should be the one you always expect to be the highest pressure.</param>
+        /// <param name="gasMixture2">The second gas mixture involved in the pressure equalization.</param>
+        /// <returns>A float (from 0 to 1) representing the dimensionless fraction of gas that needs to be transferred from the
+        /// mixture of higher pressure to the mixture of lower pressure.</returns>
+        /// <remarks>
+        /// <para>
+        /// This properly takes into account the effect
+        /// of gas merging from inlet to outlet affecting the temperature
+        /// (and possibly increasing the pressure) in the outlet.
+        /// </para>
+        /// <para>
+        /// The gas is assumed to expand freely,
+        /// so the temperature of the gas with the greater pressure is not changing.
+        /// </para>
+        /// </remarks>
+        /// <example>
+        /// If you want to calculate the moles required to equalize pressure between an inlet and an outlet,
+        /// multiply the fraction returned by the source moles.
+        /// </example>
+        public float FractionToEqualizePressure(GasMixture gasMixture1, GasMixture gasMixture2)
+        {
+            /*
+            Problem: the gas being merged from the inlet to the outlet could affect the
+            temp. of the gas and cause a pressure rise.
+            We want the pressure to be equalized, so we have to account for this.
+
+            For clarity, let's assume that gasMixture1 is the inlet and gasMixture2 is the outlet.
+
+            We require mechanical equilibrium, so \( P_1' = P_2' \)
+
+            Before the transfer, we have:
+            \( P_1 = \frac{n_1 R T_1}{V_1} \)
+            \( P_2 = \frac{n_2 R T_2}{V_2} \)
+
+            After removing fraction \( x \) moles from the inlet, we have:
+            \( P_1' = \frac{(1 - x) n_1 R T_1}{V_1} \)
+
+            The outlet will gain the same \( x n_1 \) moles of gas.
+            So \( n_2' = n_2 + x n_1 \)
+
+            After mixing, the outlet temperature will be changed.
+            Denote the new mixture temperature as \( T_2' \).
+            Volume is constant.
+            So we have:
+            \( P_2' = \frac{(n_2 + x n_1) R T_2}{V_2} \)
+
+            The total energy of the incoming inlet to outlet gas at \( T_1 \) plus the existing energy of the outlet gas at \( T_2 \)
+            will be equal to the energy of the new outlet gas at \( T_2' \).
+            This leads to the following derivation:
+            \( x n_1 C_1 T_1 + n_2 C_2 T_2 = (x n_1 C_1 + n_2 C_2) T_2' \)
+
+            Where \( C_1 \) and \( C_2 \) are the heat capacities of the inlet and outlet gases, respectively.
+
+            Solving for \( T_2' \) gives us:
+            \( T_2' = \frac{x n_1 C_1 T_1 + n_2 C_2 T_2}{x n_1 C_1 + n_2 C_2} \)
+
+            Once again, we require mechanical equilibrium (\( P_1' = P_2' \)),
+            so we can substitute \( T_2' \) into the pressure equation:
+
+            \( \frac{(1 - x) n_1 R T_1}{V_1} =
+            \frac{(n_2 + x n_1) R}{V_2} \cdot
+            \frac{x n_1 C_1 T_1 + n_2 C_2 T_2}
+            {x n_1 C_1 + n_2 C_2} \)
+
+            Now it's a matter of solving for \( x \).
+            Not going to show the full derivation here, just steps.
+            1. Cancel common factor \( R \).
+            2. Multiply both sides by \( x n_1 C_1 + n_2 C_2 \), so that everything
+            becomes a polynomial in terms of \( x \).
+            3. Expand both sides.
+            4. Collect like powers of \( x \).
+            5. After collecting, you should end up with a polynomial of the form:
+
+            \( (-n_1 C_1 T_1 (1 + \frac{V_2}{V_1})) x^2 +
+            (n_1 T_1 \frac{V_2}{V_1} (C_1 - C_2) - n_2 C_1 T_1 - n_1 C_2 T_2) x +
+            (n_1 T_1 \frac{V_2}{V_1} C_2 - n_2 C_2 T_2) = 0 \)
+
+            Divide through by \( n_1 C_1 T_1 \) and replace each ratio with a symbol for clarity:
+            \( k_V = \frac{V_2}{V_1} \)
+            \( k_n = \frac{n_2}{n_1} \)
+            \( k_T = \frac{T_2}{T_1} \)
+            \( k_C = \frac{C_2}{C_1} \)
+            */
+
+            // Ensure that P_1 > P_2 so the quadratic works out.
+            if (gasMixture1.Pressure < gasMixture2.Pressure)
+            {
+                (gasMixture1, gasMixture2) = (gasMixture2, gasMixture1);
+            }
+
+            // Establish the dimensionless ratios.
+            var volumeRatio = gasMixture2.Volume / gasMixture1.Volume;
+            var molesRatio = gasMixture2.TotalMoles / gasMixture1.TotalMoles;
+            var temperatureRatio = gasMixture2.Temperature / gasMixture1.Temperature;
+            var heatCapacityRatio = GetHeatCapacity(gasMixture2) / GetHeatCapacity(gasMixture1);
+
+            // The quadratic equation is solved for the transfer fraction.
+            var quadraticA = 1 + volumeRatio;
+            var quadraticB = molesRatio - volumeRatio + heatCapacityRatio * (temperatureRatio + volumeRatio);
+            var quadraticC = heatCapacityRatio * (molesRatio * temperatureRatio - volumeRatio);
+
+            return (-quadraticB + MathF.Sqrt(quadraticB * quadraticB - 4 * quadraticA * quadraticC)) / (2 * quadraticA);
+        }
+
+        /// <summary>
+        /// Determines the number of moles that need to be removed from a <see cref="GasMixture"/> to reach a target pressure threshold.
+        /// </summary>
+        /// <param name="gasMixture">The gas mixture whose moles and properties will be used in the calculation.</param>
+        /// <param name="targetPressure">The target pressure threshold to calculate against.</param>
+        /// <returns>The difference in moles required to reach the target pressure threshold.</returns>
+        /// <remarks>The temperature of the gas is assumed to be not changing due to a free expansion.</remarks>
+        public static float MolesToPressureThreshold(GasMixture gasMixture, float targetPressure)
+        {
+            // Kid named PV = nRT.
+            return gasMixture.TotalMoles -
+                   targetPressure * gasMixture.Volume / (Atmospherics.R * gasMixture.Temperature);
+        }
+
         /// <summary>
         ///     Checks whether a gas mixture is probably safe.
         ///     This only checks temperature and pressure, not gas composition.
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index cdf7018e23..9720cd38a8 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -7,6 +7,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -14,12 +15,14 @@ namespace Content.Server.Atmos.EntitySystems
 {
     public sealed partial class AtmosphereSystem
     {
+        private static readonly ProtoId<SoundCollectionPrototype> DefaultSpaceWindSounds = "SpaceWind";
+
         private const int SpaceWindSoundCooldownCycles = 75;
 
         private int _spaceWindSoundCooldown = 0;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public string? SpaceWindSound { get; private set; } = "/Audio/Effects/space_wind.ogg";
+        public SoundSpecifier? SpaceWindSound { get; private set; } = new SoundCollectionSpecifier(DefaultSpaceWindSounds, AudioParams.Default.WithVariation(0.125f));
 
         private readonly HashSet<Entity<MovedByPressureComponent>> _activePressures = new(8);
 
@@ -105,10 +108,10 @@ namespace Content.Server.Atmos.EntitySystems
             // Don't play the space wind sound on tiles that are on fire...
             if (tile.PressureDifference > 15 && !tile.Hotspot.Valid)
             {
-                if (_spaceWindSoundCooldown == 0 && !string.IsNullOrEmpty(SpaceWindSound))
+                if (_spaceWindSoundCooldown == 0 && SpaceWindSound != null)
                 {
                     var coordinates = _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.GridIndices);
-                    _audio.PlayPvs(SpaceWindSound, coordinates, AudioParams.Default.WithVariation(0.125f).WithVolume(MathHelper.Clamp(tile.PressureDifference / 10, 10, 100)));
+                    _audio.PlayPvs(SpaceWindSound, coordinates, SpaceWindSound.Params.WithVolume(MathHelper.Clamp(tile.PressureDifference / 10, 10, 100)));
                 }
             }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
index 70f91a5dc1..613fcd14a6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
@@ -7,12 +7,15 @@ using Content.Shared.Database;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     public sealed partial class AtmosphereSystem
     {
+        private static readonly ProtoId<SoundCollectionPrototype> DefaultHotspotSounds = "AtmosHotspot";
+
         [Dependency] private readonly DecalSystem _decalSystem = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
 
@@ -21,7 +24,7 @@ namespace Content.Server.Atmos.EntitySystems
         private int _hotspotSoundCooldown = 0;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public string? HotspotSound { get; private set; } = "/Audio/Effects/fire.ogg";
+        public SoundSpecifier? HotspotSound { get; private set; } = new SoundCollectionSpecifier(DefaultHotspotSounds);
 
         private void ProcessHotspot(
             Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
@@ -105,14 +108,14 @@ namespace Content.Server.Atmos.EntitySystems
             if (tile.Hotspot.Temperature > tile.MaxFireTemperatureSustained)
                 tile.MaxFireTemperatureSustained = tile.Hotspot.Temperature;
 
-            if (_hotspotSoundCooldown++ == 0 && !string.IsNullOrEmpty(HotspotSound))
+            if (_hotspotSoundCooldown++ == 0 && HotspotSound != null)
             {
                 var coordinates = _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.GridIndices);
 
                 // A few details on the audio parameters for fire.
                 // The greater the fire state, the lesser the pitch variation.
                 // The greater the fire state, the greater the volume.
-                _audio.PlayPvs(HotspotSound, coordinates, AudioParams.Default.WithVariation(0.15f/tile.Hotspot.State).WithVolume(-5f + 5f * tile.Hotspot.State));
+                _audio.PlayPvs(HotspotSound, coordinates, HotspotSound.Params.WithVariation(0.15f / tile.Hotspot.State).WithVolume(-5f + 5f * tile.Hotspot.State));
             }
 
             if (_hotspotSoundCooldown > HotspotSoundCooldownCycles)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index cca529fd58..24463442cd 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -596,8 +596,17 @@ namespace Content.Server.Atmos.EntitySystems
             if (!reconsiderAdjacent)
                 return;
 
+            // Before updating the adjacent tile flags that determine whether air is allowed to flow
+            // or not, we explicitly update airtight data on these tiles right now.
+            // This ensures that UpdateAdjacentTiles has updated data before updating flags.
+            // This allows monstermos' floodfill check that determines if firelocks have dropped
+            // to work correctly.
+            UpdateAirtightData(ent.Owner, ent.Comp1, ent.Comp3, tile);
+            UpdateAirtightData(ent.Owner, ent.Comp1, ent.Comp3, other);
+
             UpdateAdjacentTiles(ent, tile);
             UpdateAdjacentTiles(ent, other);
+
             InvalidateVisuals(ent, tile);
             InvalidateVisuals(ent, other);
         }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index 59320ba67b..02d389b215 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -390,10 +390,10 @@ namespace Content.Server.Atmos.EntitySystems
             // Note: This is still processed even if space wind is turned off since this handles playing the sounds.
 
             var number = 0;
-            var bodies = EntityManager.GetEntityQuery<PhysicsComponent>();
-            var xforms = EntityManager.GetEntityQuery<TransformComponent>();
-            var metas = EntityManager.GetEntityQuery<MetaDataComponent>();
-            var pressureQuery = EntityManager.GetEntityQuery<MovedByPressureComponent>();
+            var bodies = GetEntityQuery<PhysicsComponent>();
+            var xforms = GetEntityQuery<TransformComponent>();
+            var metas = GetEntityQuery<MetaDataComponent>();
+            var pressureQuery = GetEntityQuery<MovedByPressureComponent>();
 
             while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
             {
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 6bf57aa0db..acb1ea52d4 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -121,7 +121,7 @@ namespace Content.Server.Atmos.EntitySystems
 
             var otherEnt = args.OtherEntity;
 
-            if (!EntityManager.TryGetComponent(otherEnt, out FlammableComponent? flammable))
+            if (!TryComp(otherEnt, out FlammableComponent? flammable))
                 return;
 
             //Only ignite when the colliding fixture is projectile or ignition.
@@ -396,7 +396,7 @@ namespace Content.Server.Atmos.EntitySystems
             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 e291334ad0..cc53df2ecd 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
@@ -48,7 +48,7 @@ public sealed partial class AtmosAlarmableComponent : Component
     public HashSet<string> SyncWithTags { get; private set; } = new();
 
     [DataField("monitorAlertTypes")]
-    public HashSet<AtmosMonitorThresholdType>? MonitorAlertTypes { get; private set; }
+    public AtmosMonitorThresholdTypeFlags MonitorAlertTypes { get; private set; }
 
     /// <summary>
     ///     If this device should receive only. If it can only
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index 830479561d..ffb1fe0d27 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -59,7 +59,7 @@ public sealed partial class AtmosMonitorComponent : Component
     public AtmosAlarmType LastAlarmState = AtmosAlarmType.Normal;
 
     [DataField("trippedThresholds")]
-    public HashSet<AtmosMonitorThresholdType> TrippedThresholds = new();
+    public AtmosMonitorThresholdTypeFlags TrippedThresholds;
 
     /// <summary>
     ///     Registered devices in this atmos monitor. Alerts will be sent directly
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index 918b0f33ff..2dcba3f464 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -82,7 +82,7 @@ public sealed class AtmosAlarmableSystem : EntitySystem
     {
         if (component.IgnoreAlarms) return;
 
-        if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn))
+        if (!TryComp(uid, out DeviceNetworkComponent? netConn))
             return;
 
         if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? cmd)
@@ -108,9 +108,9 @@ public sealed class AtmosAlarmableSystem : EntitySystem
                     break;
                 }
 
-                if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types) && component.MonitorAlertTypes != null)
+                if (args.Data.TryGetValue(AlertTypes, out AtmosMonitorThresholdTypeFlags types) && component.MonitorAlertTypes != AtmosMonitorThresholdTypeFlags.None)
                 {
-                    isValid = types.Any(type => component.MonitorAlertTypes.Contains(type));
+                    isValid = (types & component.MonitorAlertTypes) != 0;
                 }
 
                 if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 520afe0c58..452b300331 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -207,7 +207,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
         if (component.MonitorFire
             && component.LastAlarmState != AtmosAlarmType.Danger)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component); // technically???
         }
 
@@ -218,7 +218,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
             && component.TemperatureThreshold.CheckThreshold(args.Temperature, out var temperatureState)
             && temperatureState > component.LastAlarmState)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component);
         }
     }
@@ -259,7 +259,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
         if (!Resolve(uid, ref monitor)) return;
 
         var state = AtmosAlarmType.Normal;
-        HashSet<AtmosMonitorThresholdType> alarmTypes = new(monitor.TrippedThresholds);
+        var alarmTypes = monitor.TrippedThresholds;
 
         if (monitor.TemperatureThreshold != null
             && monitor.TemperatureThreshold.CheckThreshold(air.Temperature, out var temperatureState))
@@ -267,11 +267,11 @@ public sealed class AtmosMonitorSystem : EntitySystem
             if (temperatureState > state)
             {
                 state = temperatureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Temperature);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Temperature;
             }
             else if (temperatureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Temperature);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Temperature;
             }
         }
 
@@ -282,11 +282,11 @@ public sealed class AtmosMonitorSystem : EntitySystem
             if (pressureState > state)
             {
                 state = pressureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Pressure);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Pressure;
             }
             else if (pressureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Pressure);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Pressure;
             }
         }
 
@@ -306,17 +306,17 @@ public sealed class AtmosMonitorSystem : EntitySystem
 
             if (tripped)
             {
-                alarmTypes.Add(AtmosMonitorThresholdType.Gas);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Gas;
             }
             else
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Gas);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Gas;
             }
         }
 
         // if the state of the current air doesn't match the last alarm state,
         // we update the state
-        if (state != monitor.LastAlarmState || !alarmTypes.SetEquals(monitor.TrippedThresholds))
+        if (state != monitor.LastAlarmState || alarmTypes != monitor.TrippedThresholds)
         {
             Alert(uid, state, alarmTypes, monitor);
         }
@@ -327,7 +327,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
     /// </summary>
     /// <param name="state">The alarm state to set this monitor to.</param>
     /// <param name="alarms">The alarms that caused this alarm state.</param>
-    public void Alert(EntityUid uid, AtmosAlarmType state, HashSet<AtmosMonitorThresholdType>? alarms = null, AtmosMonitorComponent? monitor = null)
+    public void Alert(EntityUid uid, AtmosAlarmType state, AtmosMonitorThresholdTypeFlags? alarms = null, AtmosMonitorComponent? monitor = null)
     {
         if (!Resolve(uid, ref monitor))
             return;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs
new file mode 100644
index 0000000000..076d5adf8e
--- /dev/null
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs
@@ -0,0 +1,202 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.Nodes;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Atmos.Piping;
+using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Audio;
+using JetBrains.Annotations;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Atmos.Piping.Binary.EntitySystems;
+
+/// <summary>
+/// Handles serverside logic for pressure regulators. Gas will only flow through the regulator
+/// if the pressure on the inlet side is over a certain pressure threshold.
+/// See https://en.wikipedia.org/wiki/Pressure_regulator
+/// </summary>
+[UsedImplicitly]
+public sealed class GasPressureRegulatorSystem : SharedGasPressureRegulatorSystem
+{
+    [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+    [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GasPressureRegulatorComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<GasPressureRegulatorComponent, AtmosDeviceUpdateEvent>(OnPressureRegulatorUpdated);
+        SubscribeLocalEvent<GasPressureRegulatorComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<GasPressureRegulatorComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUiUpdate = _timing.CurTime + ent.Comp.UpdateInterval;
+    }
+
+    /// <summary>
+    /// Dirties the regulator every second or so, so that the UI can update.
+    /// The UI automatically updates after an AutoHandleStateEvent.
+    /// </summary>
+    /// <param name="frameTime"></param>
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<GasPressureRegulatorComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.NextUiUpdate > _timing.CurTime)
+                continue;
+
+            comp.NextUiUpdate += comp.UpdateInterval;
+
+            DirtyFields(uid,
+                comp,
+                null,
+                nameof(comp.InletPressure),
+                nameof(comp.OutletPressure),
+                nameof(comp.FlowRate));
+        }
+    }
+
+    private void OnInit(Entity<GasPressureRegulatorComponent> ent, ref ComponentInit args)
+    {
+        UpdateAppearance(ent);
+    }
+
+    /// <summary>
+    /// Handles the updating logic for the pressure regulator.
+    /// </summary>
+    /// <param name="ent"> the <see cref="Entity{T}" /> of the pressure regulator</param>
+    /// <param name="args"> Args provided to us via <see cref="AtmosDeviceUpdateEvent" /></param>
+    private void OnPressureRegulatorUpdated(Entity<GasPressureRegulatorComponent> ent,
+        ref AtmosDeviceUpdateEvent args)
+    {
+        if (!_nodeContainer.TryGetNodes(ent.Owner,
+                ent.Comp.InletName,
+                ent.Comp.OutletName,
+                out PipeNode? inletPipeNode,
+                out PipeNode? outletPipeNode))
+        {
+            ChangeStatus(false, ent, inletPipeNode, outletPipeNode, 0);
+            return;
+        }
+
+        /*
+        It's time for some math! :)
+
+        Gas is simply transferred from the inlet to the outlet, restricted by flow rate and pressure.
+        We want to transfer enough gas to bring the inlet pressure below the threshold,
+        and only as much as our max flow rate allows.
+
+        The equations:
+        PV = nRT
+        P1 = P2
+
+        Can be used to calculate the amount of gas we need to transfer.
+        */
+
+        var p1 = inletPipeNode.Air.Pressure;
+        var p2 = outletPipeNode.Air.Pressure;
+
+        if (p1 <= ent.Comp.Threshold || p2 >= p1)
+        {
+            ChangeStatus(false, ent, inletPipeNode, outletPipeNode, 0);
+            return;
+        }
+
+        var t1 = inletPipeNode.Air.Temperature;
+
+        // First, calculate the amount of gas we need to transfer to bring us below the threshold.
+        var deltaMolesToPressureThreshold =
+            AtmosphereSystem.MolesToPressureThreshold(inletPipeNode.Air, ent.Comp.Threshold);
+
+        // Second, calculate the moles required to equalize the pressure.
+        // We round here to avoid the valve staying enabled for 0.00001 pressure differences.
+        var deltaMolesToEqualizePressure =
+            float.Round(_atmosphere.FractionToEqualizePressure(inletPipeNode.Air, outletPipeNode.Air) *
+                        inletPipeNode.Air.TotalMoles,
+                1,
+                MidpointRounding.ToPositiveInfinity);
+
+        // Third, make sure we only transfer the minimum of the two.
+        // We do this so that we don't accidentally transfer so much gas to the point
+        // where the outlet pressure is higher than the inlet.
+        var deltaMolesToTransfer = Math.Min(deltaMolesToPressureThreshold, deltaMolesToEqualizePressure);
+
+        // Fourth, convert to the desired volume to transfer.
+        var desiredVolumeToTransfer = deltaMolesToTransfer * ((Atmospherics.R * t1) / p1);
+
+        // And finally, limit the transfer volume to the max flow rate of the valve.
+        var actualVolumeToTransfer = Math.Min(desiredVolumeToTransfer,
+            ent.Comp.MaxTransferRate * _atmosphere.PumpSpeedup() * args.dt);
+
+        // We remove the gas from the inlet and merge it into the outlet.
+        var removed = inletPipeNode.Air.RemoveVolume(actualVolumeToTransfer);
+        _atmosphere.Merge(outletPipeNode.Air, removed);
+
+        // Calculate the flow rate in L/s for the UI.
+        var sentFlowRate = MathF.Round(actualVolumeToTransfer / args.dt, 1);
+
+        ChangeStatus(true, ent, inletPipeNode, outletPipeNode, sentFlowRate);
+    }
+
+    /// <summary>
+    /// Updates the visual appearance of the pressure regulator based on its current state.
+    /// </summary>
+    /// <param name="ent">The <see cref="Entity{GasPressureRegulatorComponent, AppearanceComponent}"/>
+    /// representing the pressure regulator with respective components.</param>
+    private void UpdateAppearance(Entity<GasPressureRegulatorComponent> ent)
+    {
+        _appearance.SetData(ent,
+            PressureRegulatorVisuals.State,
+            ent.Comp.Enabled);
+    }
+
+    /// <summary>
+    /// Updates the pressure regulator's appearance and sound based on its current state, while
+    /// also preventing network spamming.
+    /// Also prepares data for dirtying.
+    /// </summary>
+    /// <param name="enabled">The new state to set</param>
+    /// <param name="ent">The pressure regulator to update</param>
+    /// <param name="inletNode">The inlet node of the pressure regulator</param>
+    /// <param name="outletNode">The outlet node of the pressure regulator</param>
+    /// <param name="flowRate">Current flow rate of the pressure regulator</param>
+    private void ChangeStatus(bool enabled,
+        Entity<GasPressureRegulatorComponent> ent,
+        PipeNode? inletNode,
+        PipeNode? outletNode,
+        float flowRate)
+    {
+        // First, set data on the component server-side.
+        ent.Comp.InletPressure = inletNode?.Air.Pressure ?? 0f;
+        ent.Comp.OutletPressure = outletNode?.Air.Pressure ?? 0f;
+        ent.Comp.FlowRate = flowRate;
+
+        // We need to prevent spamming the network with updates, so only check if we've
+        // switched states.
+        if (ent.Comp.Enabled == enabled)
+            return;
+
+        ent.Comp.Enabled = enabled;
+        _ambientSound.SetAmbience(ent, enabled);
+        UpdateAppearance(ent);
+
+        // The regulator has changed state, so we need to dirty all applicable fields *right now* so the UI updates
+        // at the same time as everything else.
+        DirtyFields(ent.AsNullable(),
+            null,
+            nameof(ent.Comp.InletPressure),
+            nameof(ent.Comp.OutletPressure),
+            nameof(ent.Comp.FlowRate));
+    }
+}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
index f778979409..9645b0a133 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
@@ -39,7 +39,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
         private void OnExamined(Entity<GasRecyclerComponent> ent, ref ExaminedEvent args)
         {
             var comp = ent.Comp;
-            if (!EntityManager.GetComponent<TransformComponent>(ent).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
+            if (!Comp<TransformComponent>(ent).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
                 return;
 
             if (!_nodeContainer.TryGetNode(ent.Owner, comp.InletName, out PipeNode? inlet))
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
index dcb08dcd57..91f70467b4 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
@@ -18,7 +18,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
 
         private void OnStartup(EntityUid uid, AtmosPipeColorComponent component, ComponentStartup args)
         {
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            if (!TryComp(uid, out AppearanceComponent? appearance))
                 return;
 
             _appearance.SetData(uid, PipeColorVisuals.Color, component.Color, appearance);
@@ -26,7 +26,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
 
         private void OnShutdown(EntityUid uid, AtmosPipeColorComponent component, ComponentShutdown args)
         {
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            if (!TryComp(uid, out AppearanceComponent? appearance))
                 return;
 
             _appearance.SetData(uid, PipeColorVisuals.Color, Color.White, appearance);
@@ -36,7 +36,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
         {
             component.Color = color;
 
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            if (!TryComp(uid, out AppearanceComponent? appearance))
                 return;
 
             _appearance.SetData(uid, PipeColorVisuals.Color, color, appearance);
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
index 25439736c7..398d909952 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
@@ -29,7 +29,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
 
         private void OnUnanchorAttempt(EntityUid uid, AtmosUnsafeUnanchorComponent component, UnanchorAttemptEvent args)
         {
-            if (!component.Enabled || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
+            if (!component.Enabled || !TryComp(uid, out NodeContainerComponent? nodes))
                 return;
 
             if (_atmosphere.GetContainingMixture(uid, true) is not {} environment)
@@ -78,7 +78,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems
         /// </summary>
         public void LeakGas(EntityUid uid, bool removeFromPipe = true)
         {
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodes))
+            if (!TryComp(uid, out NodeContainerComponent? nodes))
                 return;
 
             if (_atmosphere.GetContainingMixture(uid, true, true) is not { } environment)
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index c5a91895b2..8d0fb8ad2c 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -103,10 +103,10 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
             if (args.Handled || !args.Complex)
                 return;
 
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            if (!TryComp(args.User, out ActorComponent? actor))
                 return;
 
-            if (EntityManager.GetComponent<TransformComponent>(uid).Anchored)
+            if (Comp<TransformComponent>(uid).Anchored)
             {
                 _userInterfaceSystem.OpenUi(uid, GasFilterUiKey.Key, actor.PlayerSession);
                 DirtyUI(uid, filter);
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index 0852051487..84abede066 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -143,7 +143,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
             if (args.Handled || !args.Complex)
                 return;
 
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            if (!TryComp(args.User, out ActorComponent? actor))
                 return;
 
             if (Transform(uid).Anchored)
@@ -165,7 +165,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
                 return;
 
             _userInterfaceSystem.SetUiState(uid, GasMixerUiKey.Key,
-                new GasMixerBoundUserInterfaceState(EntityManager.GetComponent<MetaDataComponent>(uid).EntityName, mixer.TargetPressure, mixer.Enabled, mixer.InletOneConcentration));
+                new GasMixerBoundUserInterfaceState(Comp<MetaDataComponent>(uid).EntityName, mixer.TargetPressure, mixer.Enabled, mixer.InletOneConcentration));
         }
 
         private void UpdateAppearance(EntityUid uid, GasMixerComponent? mixer = null, AppearanceComponent? appearance = null)
@@ -200,7 +200,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
             mixer.InletOneConcentration = nodeOne;
             mixer.InletTwoConcentration = 1.0f - mixer.InletOneConcentration;
             _adminLogger.Add(LogType.AtmosRatioChanged, LogImpact.Medium,
-                $"{EntityManager.ToPrettyString(args.Actor):player} set the ratio on {EntityManager.ToPrettyString(uid):device} to {mixer.InletOneConcentration}:{mixer.InletTwoConcentration}");
+                $"{ToPrettyString(args.Actor):player} set the ratio on {ToPrettyString(uid):device} to {mixer.InletOneConcentration}:{mixer.InletTwoConcentration}");
             DirtyUI(uid, mixer);
         }
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs
index c277352b6f..682a59cb75 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs
@@ -27,7 +27,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnPortableAnchorAttempt(EntityUid uid, GasPortableComponent component, AnchorAttemptEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform))
+            if (!TryComp(uid, out TransformComponent? transform))
                 return;
 
             // If we can't find any ports, cancel the anchoring.
@@ -52,7 +52,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
             foreach (var entityUid in _mapSystem.GetLocal(gridId.Value, grid, coordinates))
             {
-                if (EntityManager.TryGetComponent(entityUid, out port))
+                if (TryComp(entityUid, out port))
                 {
                     return true;
                 }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index b3d1ccb7f7..12c3936c6e 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -236,7 +236,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnPacketRecv(EntityUid uid, GasVentPumpComponent component, DeviceNetworkPacketEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn)
+            if (!TryComp(uid, out DeviceNetworkComponent? netConn)
                 || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index b5c8a9c1a9..22f22a682a 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -148,7 +148,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnPacketRecv(EntityUid uid, GasVentScrubberComponent component, DeviceNetworkPacketEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn)
+            if (!TryComp(uid, out DeviceNetworkComponent? netConn)
                 || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
                 return;
 
diff --git a/Content.Server/Atmos/PressureEvent.cs b/Content.Server/Atmos/PressureEvent.cs
deleted file mode 100644
index 9c0b36a281..0000000000
--- a/Content.Server/Atmos/PressureEvent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace Content.Server.Atmos
-{
-    public abstract class PressureEvent : EntityEventArgs
-    {
-        /// <summary>
-        ///     The environment pressure.
-        /// </summary>
-        public float Pressure { get; }
-
-        /// <summary>
-        ///     The modifier for the apparent pressure.
-        ///     This number will be added to the environment pressure for calculation purposes.
-        ///     It can be negative to reduce the felt pressure, or positive to increase it.
-        /// </summary>
-        /// <remarks>
-        ///     Do not set this directly. Add to it, or subtract from it to modify it.
-        /// </remarks>
-        public float Modifier { get; set; } = 0f;
-
-        /// <summary>
-        ///     The multiplier for the apparent pressure.
-        ///     The environment pressure will be multiplied by this for calculation purposes.
-        /// </summary>
-        /// <remarks>
-        ///     Do not set, add to or subtract from this directly. Multiply this by your multiplier only.
-        /// </remarks>
-        public float Multiplier { get; set; } = 1f;
-
-        protected PressureEvent(float pressure)
-        {
-            Pressure = pressure;
-        }
-    }
-
-    public sealed class LowPressureEvent : PressureEvent
-    {
-        public LowPressureEvent(float pressure) : base(pressure) { }
-    }
-
-    public sealed class HighPressureEvent : PressureEvent
-    {
-        public HighPressureEvent(float pressure) : base(pressure) { }
-    }
-}
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 43dddce4a4..6f14debc3d 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Rotting;
+using Content.Shared.Body.Events;
 using Content.Shared.Damage;
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs
index f36d14cbaf..88ef49c1b6 100644
--- a/Content.Server/Audio/ContentAudioSystem.cs
+++ b/Content.Server/Audio/ContentAudioSystem.cs
@@ -3,32 +3,52 @@ using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Shared.Audio;
 using Content.Shared.Audio.Events;
+using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Robust.Server.Audio;
 using Robust.Shared.Audio;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
+
 namespace Content.Server.Audio;
 
 public sealed class ContentAudioSystem : SharedContentAudioSystem
 {
-    [ValidatePrototypeId<SoundCollectionPrototype>]
-    private const string LobbyMusicCollection = "LobbyMusic";
-
     [Dependency] private readonly AudioSystem _serverAudio = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-    private SoundCollectionPrototype _lobbyMusicCollection = default!;
+    private SoundCollectionPrototype? _lobbyMusicCollection = default!;
     private string[]? _lobbyPlaylist;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        _lobbyMusicCollection = _prototypeManager.Index<SoundCollectionPrototype>(LobbyMusicCollection);
-        _lobbyPlaylist = ShuffleLobbyPlaylist();
+        //changes the music collection and reshuffles the playlist to update the lobby music
+        Subs.CVar(
+            _cfg,
+            CCVars.LobbyMusicCollection,
+            x =>
+            {
+                //Checks to see if the sound collection exists. If it does change it if not defaults to null
+                // as the new _lobbyMusicCollection meaning it wont play anything in the lobby.
+                if(_prototypeManager.TryIndex<SoundCollectionPrototype>(x, out var outputSoundCollection))
+                {
+                    _lobbyMusicCollection = outputSoundCollection;
+                }
+                else
+                {
+                    Log.Error($"Invalid Lobby Music sound collection specified: {x}");
+                    _lobbyMusicCollection = null;
+                }
+
+                _lobbyPlaylist = ShuffleLobbyPlaylist();
+            },
+            true);
 
         SubscribeLocalEvent<RoundEndMessageEvent>(OnRoundEnd);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
@@ -76,11 +96,16 @@ public sealed class ContentAudioSystem : SharedContentAudioSystem
 
     private string[] ShuffleLobbyPlaylist()
     {
+        if (_lobbyMusicCollection == null)
+        {
+            return [];
+        }
+
         var playlist = _lobbyMusicCollection.PickFiles
                                             .Select(x => x.ToString())
                                             .ToArray();
-         _robustRandom.Shuffle(playlist);
+        _robustRandom.Shuffle(playlist);
 
-         return playlist;
+        return playlist;
     }
 }
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 91b31c782b..8cfb28acb6 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -1,23 +1,15 @@
-using Content.Server.Bed.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.Bed;
 using Content.Shared.Bed.Components;
 using Content.Shared.Bed.Sleep;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Events;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Power;
 
 namespace Content.Server.Bed
 {
     public sealed class BedSystem : SharedBedSystem
     {
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly EmagSystem _emag = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
 
         private EntityQuery<SleepingComponent> _sleepingQuery;
@@ -27,11 +19,6 @@ namespace Content.Server.Bed
             base.Initialize();
 
             _sleepingQuery = GetEntityQuery<SleepingComponent>();
-
-            SubscribeLocalEvent<StasisBedComponent, StrappedEvent>(OnStasisStrapped);
-            SubscribeLocalEvent<StasisBedComponent, UnstrappedEvent>(OnStasisUnstrapped);
-            SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnEmagged);
         }
 
         public override void Update(float frameTime)
@@ -63,61 +50,5 @@ namespace Content.Server.Bed
                 }
             }
         }
-
-        private void UpdateAppearance(EntityUid uid, bool isOn)
-        {
-            _appearance.SetData(uid, StasisBedVisuals.IsOn, isOn);
-        }
-
-        private void OnStasisStrapped(Entity<StasisBedComponent> bed, ref StrappedEvent args)
-        {
-            if (!HasComp<BodyComponent>(args.Buckle) || !this.IsPowered(bed, EntityManager))
-                return;
-
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.Buckle, bed.Comp.Multiplier, true);
-            RaiseLocalEvent(args.Buckle, ref metabolicEvent);
-        }
-
-        private void OnStasisUnstrapped(Entity<StasisBedComponent> bed, ref UnstrappedEvent args)
-        {
-            if (!HasComp<BodyComponent>(args.Buckle) || !this.IsPowered(bed, EntityManager))
-                return;
-
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.Buckle, bed.Comp.Multiplier, false);
-            RaiseLocalEvent(args.Buckle, ref metabolicEvent);
-        }
-
-        private void OnPowerChanged(EntityUid uid, StasisBedComponent component, ref PowerChangedEvent args)
-        {
-            UpdateAppearance(uid, args.Powered);
-            UpdateMetabolisms(uid, component, args.Powered);
-        }
-
-        private void OnEmagged(EntityUid uid, StasisBedComponent component, ref GotEmaggedEvent args)
-        {
-            if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
-                return;
-
-            if (_emag.CheckFlag(uid, EmagType.Interaction))
-                return;
-
-            // Reset any metabolisms first so they receive the multiplier correctly
-            UpdateMetabolisms(uid, component, false);
-            component.Multiplier = 1 / component.Multiplier;
-            UpdateMetabolisms(uid, component, true);
-            args.Handled = true;
-        }
-
-        private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool shouldApply)
-        {
-            if (!TryComp<StrapComponent>(uid, out var strap) || strap.BuckledEntities.Count == 0)
-                return;
-
-            foreach (var buckledEntity in strap.BuckledEntities)
-            {
-                var metabolicEvent = new ApplyMetabolicMultiplierEvent(buckledEntity, component.Multiplier, shouldApply);
-                RaiseLocalEvent(buckledEntity, ref metabolicEvent);
-            }
-        }
     }
 }
diff --git a/Content.Server/Bed/Components/StasisBedComponent.cs b/Content.Server/Bed/Components/StasisBedComponent.cs
deleted file mode 100644
index 160bd0ac67..0000000000
--- a/Content.Server/Bed/Components/StasisBedComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Server.Bed.Components
-{
-    [RegisterComponent]
-    public sealed partial class StasisBedComponent : Component
-    {
-        /// <summary>
-        /// What the metabolic update rate will be multiplied by (higher = slower metabolism)
-        /// </summary>
-        [ViewVariables(VVAccess.ReadOnly)] // Writing is is not supported. ApplyMetabolicMultiplierEvent needs to be refactored first
-        [DataField]
-        public float Multiplier = 10f;
-    }
-}
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index 913d9a3aa8..5a39c39be3 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -98,8 +98,7 @@ public sealed class CryostorageSystem : SharedCryostorageSystem
         EntityUid? entity = null;
         if (args.Type == CryostorageRemoveItemBuiMessage.RemovalType.Hand)
         {
-            if (_hands.TryGetHand(cryoContained, args.Key, out var hand))
-                entity = hand.HeldEntity;
+            entity = _hands.GetHeldItem(cryoContained, args.Key);
         }
         else
         {
@@ -323,10 +322,10 @@ public sealed class CryostorageSystem : SharedCryostorageSystem
 
         foreach (var hand in _hands.EnumerateHands(uid))
         {
-            if (hand.HeldEntity == null)
+            if (!_hands.TryGetHeldItem(uid, hand, out var heldEntity))
                 continue;
 
-            data.HeldItems.Add(hand.Name, Name(hand.HeldEntity.Value));
+            data.HeldItems.Add(hand, Name(heldEntity.Value));
         }
 
         return data;
diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index 839463e836..36c3cfd369 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -108,7 +108,7 @@ namespace Content.Server.Bible
                 // Clean up the old body
                 if (summonableComp.Summon != null)
                 {
-                    EntityManager.DeleteEntity(summonableComp.Summon.Value);
+                    Del(summonableComp.Summon.Value);
                     summonableComp.Summon = null;
                 }
                 summonableComp.AlreadySummoned = false;
@@ -281,7 +281,7 @@ namespace Content.Server.Bible
                 return;
 
             // Make this familiar the component's summon
-            var familiar = EntityManager.SpawnEntity(component.SpecialItemPrototype, position.Coordinates);
+            var familiar = Spawn(component.SpecialItemPrototype, position.Coordinates);
             component.Summon = familiar;
 
             // If this is going to use a ghost role mob spawner, attach it to the bible.
diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
index 3e006c539c..4d2805333a 100644
--- a/Content.Server/Body/Commands/AddHandCommand.cs
+++ b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -1,12 +1,13 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Body.Systems;
+using Content.Server.Hands.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
+using Content.Shared.Hands.Components;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Server.Body.Commands
 {
@@ -15,10 +16,9 @@ namespace Content.Server.Body.Commands
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IPrototypeManager _protoManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string DefaultHandPrototype = "LeftHandHuman";
+        private static readonly EntProtoId DefaultHandPrototype = "LeftHandHuman";
+        private static int _handIdAccumulator;
 
         public string Command => "addhand";
         public string Description => "Adds a hand to your entity.";
@@ -115,9 +115,17 @@ namespace Content.Server.Body.Commands
 
             if (!_entManager.TryGetComponent(entity, out BodyComponent? body) || body.RootContainer.ContainedEntity == null)
             {
-                var text = $"You have no body{(_random.Prob(0.2f) ? " and you must scream." : ".")}";
+                var location = _entManager.GetComponentOrNull<BodyPartComponent>(hand)?.Symmetry switch
+                {
+                    BodyPartSymmetry.None => HandLocation.Middle,
+                    BodyPartSymmetry.Left => HandLocation.Left,
+                    BodyPartSymmetry.Right => HandLocation.Right,
+                    _ => HandLocation.Right
+                };
+                _entManager.DeleteEntity(hand);
 
-                shell.WriteLine(text);
+                // You have no body and you must scream.
+                _entManager.System<HandsSystem>().AddHand(entity, $"{hand}-cmd-{_handIdAccumulator++}", location);
                 return;
             }
 
diff --git a/Content.Server/Body/Commands/DestroyMechanismCommand.cs b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
index 3aa28f4072..e3278fd4e7 100644
--- a/Content.Server/Body/Commands/DestroyMechanismCommand.cs
+++ b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
@@ -3,23 +3,23 @@ using Content.Server.Body.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
 using Robust.Shared.Console;
-using Robust.Shared.Random;
 
 namespace Content.Server.Body.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
-    sealed class DestroyMechanismCommand : IConsoleCommand
+    internal sealed class DestroyMechanismCommand : LocalizedEntityCommands
     {
-        public string Command => "destroymechanism";
-        public string Description => "Destroys a mechanism from your entity";
-        public string Help => $"Usage: {Command} <mechanism>";
+        [Dependency] private readonly IComponentFactory _compFactory = default!;
+        [Dependency] private readonly BodySystem _bodySystem = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "destroymechanism";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
             if (player == null)
             {
-                shell.WriteLine("Only a player can run this command.");
+                shell.WriteLine(Loc.GetString($"shell-only-players-can-run-this-command"));
                 return;
             }
 
@@ -31,36 +31,29 @@ namespace Content.Server.Body.Commands
 
             if (player.AttachedEntity is not {} attached)
             {
-                shell.WriteLine("You have no entity.");
+                shell.WriteLine(Loc.GetString($"shell-must-be-attached-to-entity"));
                 return;
             }
 
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var fac = IoCManager.Resolve<IComponentFactory>();
-
-            if (!entityManager.TryGetComponent(attached, out BodyComponent? body))
+            if (!EntityManager.TryGetComponent(attached, out BodyComponent? body))
             {
-                var random = IoCManager.Resolve<IRobustRandom>();
-                var text = $"You have no body{(random.Prob(0.2f) ? " and you must scream." : ".")}";
-
-                shell.WriteLine(text);
+                shell.WriteLine(Loc.GetString($"shell-must-have-body"));
                 return;
             }
 
             var mechanismName = string.Join(" ", args).ToLowerInvariant();
-            var bodySystem = entityManager.System<BodySystem>();
 
-            foreach (var organ in bodySystem.GetBodyOrgans(attached, body))
+            foreach (var organ in _bodySystem.GetBodyOrgans(attached, body))
             {
-                if (fac.GetComponentName(organ.Component.GetType()).ToLowerInvariant() == mechanismName)
+                if (_compFactory.GetComponentName(organ.Component.GetType()).ToLowerInvariant() == mechanismName)
                 {
-                    entityManager.QueueDeleteEntity(organ.Id);
-                    shell.WriteLine($"Mechanism with name {mechanismName} has been destroyed.");
+                    EntityManager.QueueDeleteEntity(organ.Id);
+                    shell.WriteLine(Loc.GetString($"cmd-destroymechanism-success", ("name", mechanismName)));
                     return;
                 }
             }
 
-            shell.WriteLine($"No mechanism was found with name {mechanismName}.");
+            shell.WriteLine(Loc.GetString($"cmd-destroymechanism-no-mechanism-found", ("name", mechanismName)));
         }
     }
 }
diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
deleted file mode 100644
index ed7a9d3ad0..0000000000
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Alert;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Body.Components
-{
-    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem))]
-    public sealed partial class BloodstreamComponent : Component
-    {
-        public static string DefaultChemicalsSolutionName = "chemicals";
-        public static string DefaultBloodSolutionName = "bloodstream";
-        public static string DefaultBloodTemporarySolutionName = "bloodstreamTemporary";
-
-        /// <summary>
-        /// The next time that blood level will be updated and bloodloss damage dealt.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan NextUpdate;
-
-        /// <summary>
-        /// The interval at which this component updates.
-        /// </summary>
-        [DataField]
-        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(3);
-
-        /// <summary>
-        ///     How much is this entity currently bleeding?
-        ///     Higher numbers mean more blood lost every tick.
-        ///
-        ///     Goes down slowly over time, and items like bandages
-        ///     or clotting reagents can lower bleeding.
-        /// </summary>
-        /// <remarks>
-        ///     This generally corresponds to an amount of damage and can't go above 100.
-        /// </remarks>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float BleedAmount;
-
-        /// <summary>
-        ///     How much should bleeding be reduced every update interval?
-        /// </summary>
-        [DataField]
-        public float BleedReductionAmount = 0.33f;
-
-        /// <summary>
-        ///     How high can <see cref="BleedAmount"/> go?
-        /// </summary>
-        [DataField]
-        public float MaxBleedAmount = 10.0f;
-
-        /// <summary>
-        ///     What percentage of current blood is necessary to avoid dealing blood loss damage?
-        /// </summary>
-        [DataField]
-        public float BloodlossThreshold = 0.9f;
-
-        /// <summary>
-        ///     The base bloodloss damage to be incurred if below <see cref="BloodlossThreshold"/>
-        ///     The default values are defined per mob/species in YML.
-        /// </summary>
-        [DataField(required: true)]
-        public DamageSpecifier BloodlossDamage = new();
-
-        /// <summary>
-        ///     The base bloodloss damage to be healed if above <see cref="BloodlossThreshold"/>
-        ///     The default values are defined per mob/species in YML.
-        /// </summary>
-        [DataField(required: true)]
-        public DamageSpecifier BloodlossHealDamage = new();
-
-        // TODO shouldn't be hardcoded, should just use some organ simulation like bone marrow or smth.
-        /// <summary>
-        ///     How much reagent of blood should be restored each update interval?
-        /// </summary>
-        [DataField]
-        public FixedPoint2 BloodRefreshAmount = 1.0f;
-
-        /// <summary>
-        ///     How much blood needs to be in the temporary solution in order to create a puddle?
-        /// </summary>
-        [DataField]
-        public FixedPoint2 BleedPuddleThreshold = 1.0f;
-
-        /// <summary>
-        ///     A modifier set prototype ID corresponding to how damage should be modified
-        ///     before taking it into account for bloodloss.
-        /// </summary>
-        /// <remarks>
-        ///     For example, piercing damage is increased while poison damage is nullified entirely.
-        /// </remarks>
-        [DataField]
-        public ProtoId<DamageModifierSetPrototype> DamageBleedModifiers = "BloodlossHuman";
-
-        /// <summary>
-        ///     The sound to be played when a weapon instantly deals blood loss damage.
-        /// </summary>
-        [DataField]
-        public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("BleedingStart"); // Sunrise edit - новый звук начатого кровотечения
-
-        // Sunrise added start - звуки кровотечения(капающей крови)
-        [DataField]
-        public SoundSpecifier BloodDrippingSound = new SoundCollectionSpecifier("BloodDripping");
-        // Sunrise added end
-
-        /// <summary>
-        ///     The sound to be played when some damage actually heals bleeding rather than starting it.
-        /// </summary>
-        [DataField]
-        public SoundSpecifier BloodHealedSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
-
-        /// <summary>
-        /// The minimum amount damage reduction needed to play the healing sound/popup.
-        /// This prevents tiny amounts of heat damage from spamming the sound, e.g. spacing.
-        /// </summary>
-        [DataField]
-        public float BloodHealedSoundThreshold = -0.1f;
-
-        // TODO probably damage bleed thresholds.
-
-        /// <summary>
-        ///     Max volume of internal chemical solution storage
-        /// </summary>
-        [DataField]
-        public FixedPoint2 ChemicalMaxVolume = FixedPoint2.New(250);
-
-        /// <summary>
-        ///     Max volume of internal blood storage,
-        ///     and starting level of blood.
-        /// </summary>
-        [DataField]
-        public FixedPoint2 BloodMaxVolume = FixedPoint2.New(300);
-
-        /// <summary>
-        ///     Which reagent is considered this entities 'blood'?
-        /// </summary>
-        /// <remarks>
-        ///     Slime-people might use slime as their blood or something like that.
-        /// </remarks>
-        [DataField]
-        public ProtoId<ReagentPrototype> BloodReagent = "Blood";
-
-        /// <summary>Name/Key that <see cref="BloodSolution"/> is indexed by.</summary>
-        [DataField]
-        public string BloodSolutionName = DefaultBloodSolutionName;
-
-        /// <summary>Name/Key that <see cref="ChemicalSolution"/> is indexed by.</summary>
-        [DataField]
-        public string ChemicalSolutionName = DefaultChemicalsSolutionName;
-
-        /// <summary>Name/Key that <see cref="TemporarySolution"/> is indexed by.</summary>
-        [DataField]
-        public string BloodTemporarySolutionName = DefaultBloodTemporarySolutionName;
-
-        /// <summary>
-        ///     Internal solution for blood storage
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? BloodSolution;
-
-        /// <summary>
-        ///     Internal solution for reagent storage
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? ChemicalSolution;
-
-        /// <summary>
-        ///     Temporary blood solution.
-        ///     When blood is lost, it goes to this solution, and when this
-        ///     solution hits a certain cap, the blood is actually spilled as a puddle.
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? TemporarySolution;
-
-        /// <summary>
-        /// Variable that stores the amount of status time added by having a low blood level.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public TimeSpan StatusTime;
-
-        [DataField]
-        public ProtoId<AlertPrototype> BleedingAlert = "Bleed";
-    }
-}
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 90c99df7db..5821b0d944 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.FixedPoint;
@@ -25,6 +26,18 @@ namespace Content.Server.Body.Components
         [DataField]
         public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
+        /// <summary>
+        /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+        /// </summary>
+        [DataField]
+        public float UpdateIntervalMultiplier = 1f;
+
+        /// <summary>
+        /// Adjusted update interval based off of the multiplier value.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
         /// <summary>
         ///     From which solution will this metabolizer attempt to metabolize chemicals
         /// </summary>
@@ -45,14 +58,14 @@ namespace Content.Server.Body.Components
         /// </summary>
         [DataField]
         [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes = null;
+        public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes;
 
         /// <summary>
         ///     Should this metabolizer remove chemicals that have no metabolisms defined?
         ///     As a stop-gap, basically.
         /// </summary>
         [DataField]
-        public bool RemoveEmpty = false;
+        public bool RemoveEmpty;
 
         /// <summary>
         ///     How many reagents can this metabolizer process at once?
@@ -66,7 +79,7 @@ namespace Content.Server.Body.Components
         ///     A list of metabolism groups that this metabolizer will act on, in order of precedence.
         /// </summary>
         [DataField("groups")]
-        public List<MetabolismGroupEntry>? MetabolismGroups = default!;
+        public List<MetabolismGroupEntry>? MetabolismGroups;
     }
 
     /// <summary>
@@ -77,7 +90,7 @@ namespace Content.Server.Body.Components
     public sealed partial class MetabolismGroupEntry
     {
         [DataField(required: true)]
-        public ProtoId<MetabolismGroupPrototype> Id = default!;
+        public ProtoId<MetabolismGroupPrototype> Id;
 
         [DataField("rateModifier")]
         public FixedPoint2 MetabolismRateModifier = 1.0;
diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs
index ba54a36c24..64272dcfb0 100644
--- a/Content.Server/Body/Components/RespiratorComponent.cs
+++ b/Content.Server/Body/Components/RespiratorComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Body.Systems;
+using Content.Shared.Atmos;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.Prototypes;
@@ -6,13 +7,25 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(RespiratorSystem))]
+    [RegisterComponent, Access(typeof(RespiratorSystem)), AutoGenerateComponentPause]
     public sealed partial class RespiratorComponent : Component
     {
+        /// <summary>
+        ///     Volume of our breath in liters
+        /// </summary>
+        [DataField]
+        public float BreathVolume = Atmospherics.BreathVolume;
+
+        /// <summary>
+        ///     How much of the gas we inhale is metabolized? Value range is (0, 1]
+        /// </summary>
+        [DataField]
+        public float Ratio = 1.0f;
+
         /// <summary>
         ///     The next time that this body will inhale or exhale.
         /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
         public TimeSpan NextUpdate;
 
         /// <summary>
@@ -22,6 +35,18 @@ namespace Content.Server.Body.Components
         [DataField]
         public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2);
 
+        /// <summary>
+        /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+        /// </summary>
+        [DataField]
+        public float UpdateIntervalMultiplier = 1f;
+
+        /// <summary>
+        /// Adjusted update interval based off of the multiplier value.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
         /// <summary>
         ///     Saturation level. Reduced by UpdateInterval each tick.
         ///     Can be thought of as 'how many seconds you have until you start suffocating' in this configuration.
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index 54c2268534..c2185750af 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -1,190 +1,32 @@
-using Content.Server.Body.Components;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Popups;
-using Content.Shared.Alert;
-using Content.Shared.Body.Events;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.Drunk;
-using Content.Shared.EntityEffects.Effects;
-using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
-using Content.Shared.Forensics.Components;
-using Content.Shared.HealthExaminable;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Rejuvenate;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Server.Audio;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
 
-public sealed class BloodstreamSystem : EntitySystem
+public sealed class BloodstreamSystem : SharedBloodstreamSystem
 {
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly PuddleSystem _puddleSystem = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly SharedDrunkSystem _drunkSystem = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!;
-    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<BloodstreamComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<BloodstreamComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<BloodstreamComponent, EntityUnpausedEvent>(OnUnpaused);
-        SubscribeLocalEvent<BloodstreamComponent, DamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<BloodstreamComponent, HealthBeingExaminedEvent>(OnHealthBeingExamined);
-        SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
-        SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-        SubscribeLocalEvent<BloodstreamComponent, ReactionAttemptEvent>(OnReactionAttempt);
-        SubscribeLocalEvent<BloodstreamComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
-        SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<BloodstreamComponent, GenerateDnaEvent>(OnDnaGenerated);
     }
 
-    private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
-    {
-        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-    }
-
-    private void OnUnpaused(Entity<BloodstreamComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUpdate += args.PausedTime;
-    }
-
-    private void OnReactionAttempt(Entity<BloodstreamComponent> entity, ref ReactionAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        foreach (var effect in args.Reaction.Effects)
-        {
-            switch (effect)
-            {
-                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
-                case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
-                    args.Cancelled = true;
-                    return;
-            }
-        }
-
-        // The area-reaction effect canceling is part of avoiding smoke-fork-bombs (create two smoke bombs, that when
-        // ingested by mobs create more smoke). This also used to act as a rapid chemical-purge, because all the
-        // reagents would get carried away by the smoke/foam. This does still work for the stomach (I guess people vomit
-        // up the smoke or spawned entities?).
-
-        // TODO apply organ damage instead of just blocking the reaction?
-        // Having cheese-clots form in your veins can't be good for you.
-    }
-
-    private void OnReactionAttempt(Entity<BloodstreamComponent> entity, ref SolutionRelayEvent<ReactionAttemptEvent> args)
-    {
-        if (args.Name != entity.Comp.BloodSolutionName
-            && args.Name != entity.Comp.ChemicalSolutionName
-            && args.Name != entity.Comp.BloodTemporarySolutionName)
-        {
-            return;
-        }
-
-        OnReactionAttempt(entity, ref args.Event);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<BloodstreamComponent>();
-        while (query.MoveNext(out var uid, out var bloodstream))
-        {
-            if (_gameTiming.CurTime < bloodstream.NextUpdate)
-                continue;
-
-            bloodstream.NextUpdate += bloodstream.UpdateInterval;
-
-            if (!_solutionContainerSystem.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
-                continue;
-
-            // Adds blood to their blood level if it is below the maximum; Blood regeneration. Must be alive.
-            if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
-            {
-                TryModifyBloodLevel(uid, bloodstream.BloodRefreshAmount, bloodstream);
-            }
-
-            // Removes blood from the bloodstream based on bleed amount (bleed rate)
-            // as well as stop their bleeding to a certain extent.
-            if (bloodstream.BleedAmount > 0)
-            {
-                // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
-                TryModifyBloodLevel(uid, (-bloodstream.BleedAmount), bloodstream);
-                // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
-                TryModifyBleedAmount(uid, -bloodstream.BleedReductionAmount, bloodstream);
-            }
-
-            // deal bloodloss damage if their blood level is below a threshold.
-            var bloodPercentage = GetBloodLevelPercentage(uid, bloodstream);
-            if (bloodPercentage < bloodstream.BloodlossThreshold && !_mobStateSystem.IsDead(uid))
-            {
-                // bloodloss damage is based on the base value, and modified by how low your blood level is.
-                var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
-
-                _damageableSystem.TryChangeDamage(uid, amt,
-                    ignoreResistances: false, interruptsDoAfters: false);
-
-                // Apply dizziness as a symptom of bloodloss.
-                // The effect is applied in a way that it will never be cleared without being healthy.
-                // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
-                _drunkSystem.TryApplyDrunkenness(
-                    uid,
-                    (float) bloodstream.UpdateInterval.TotalSeconds * 2,
-                    applySlur: false);
-                _stutteringSystem.DoStutter(uid, bloodstream.UpdateInterval * 2, refresh: false);
-
-                // storing the drunk and stutter time so we can remove it independently from other effects additions
-                bloodstream.StatusTime += bloodstream.UpdateInterval * 2;
-            }
-            else if (!_mobStateSystem.IsDead(uid))
-            {
-                // If they're healthy, we'll try and heal some bloodloss instead.
-                _damageableSystem.TryChangeDamage(
-                    uid,
-                    bloodstream.BloodlossHealDamage * bloodPercentage,
-                    ignoreResistances: true, interruptsDoAfters: false);
-
-                // Remove the drunk effect when healthy. Should only remove the amount of drunk and stutter added by low blood level
-                _drunkSystem.TryRemoveDrunkenessTime(uid, bloodstream.StatusTime.TotalSeconds);
-                _stutteringSystem.DoRemoveStutterTime(uid, bloodstream.StatusTime.TotalSeconds);
-                // Reset the drunk and stutter time to zero
-                bloodstream.StatusTime = TimeSpan.Zero;
-            }
-        }
-    }
-
+    // not sure if we can move this to shared or not
+    // it would certainly help if SolutionContainer was documented
+    // but since we usually don't add the component dynamically to entities we can keep this unpredicted for now
     private void OnComponentInit(Entity<BloodstreamComponent> entity, ref ComponentInit args)
     {
-        if (!_solutionContainerSystem.EnsureSolution(entity.Owner,
+        if (!SolutionContainer.EnsureSolution(entity.Owner,
                 entity.Comp.ChemicalSolutionName,
                 out var chemicalSolution) ||
-            !_solutionContainerSystem.EnsureSolution(entity.Owner,
+            !SolutionContainer.EnsureSolution(entity.Owner,
                 entity.Comp.BloodSolutionName,
                 out var bloodSolution) ||
-            !_solutionContainerSystem.EnsureSolution(entity.Owner,
+            !SolutionContainer.EnsureSolution(entity.Owner,
                 entity.Comp.BloodTemporarySolutionName,
                 out var tempSolution))
             return;
@@ -198,302 +40,10 @@ public sealed class BloodstreamSystem : EntitySystem
         bloodSolution.AddReagent(new ReagentId(entity.Comp.BloodReagent, GetEntityBloodData(entity.Owner)), entity.Comp.BloodMaxVolume - bloodSolution.Volume);
     }
 
-    private void OnDamageChanged(Entity<BloodstreamComponent> ent, ref DamageChangedEvent args)
-    {
-        if (args.DamageDelta is null || !args.DamageIncreased)
-        {
-            return;
-        }
-
-        // TODO probably cache this or something. humans get hurt a lot
-        if (!_prototypeManager.TryIndex(ent.Comp.DamageBleedModifiers, out var modifiers))
-            return;
-
-        // some reagents may deal and heal different damage types in the same tick, which means DamageIncreased will be true
-        // but we only want to consider the dealt damage when causing bleeding
-        var damage = DamageSpecifier.GetPositive(args.DamageDelta);
-        var bloodloss = DamageSpecifier.ApplyModifierSet(damage, modifiers);
-
-        if (bloodloss.Empty)
-            return;
-
-        // Does the calculation of how much bleed rate should be added/removed, then applies it
-        var oldBleedAmount = ent.Comp.BleedAmount;
-        var total = bloodloss.GetTotal();
-        var totalFloat = total.Float();
-        TryModifyBleedAmount(ent, totalFloat, ent);
-
-        /// <summary>
-        ///     Critical hit. Causes target to lose blood, using the bleed rate modifier of the weapon, currently divided by 5
-        ///     The crit chance is currently the bleed rate modifier divided by 25.
-        ///     Higher damage weapons have a higher chance to crit!
-        /// </summary>
-        var prob = Math.Clamp(totalFloat / 25, 0, 1);
-        if (totalFloat > 0 && _robustRandom.Prob(prob))
-        {
-            TryModifyBloodLevel(ent, -total / 5, ent);
-            _audio.PlayPvs(ent.Comp.InstantBloodSound, ent);
-        }
-
-        // Heat damage will cauterize, causing the bleed rate to be reduced.
-        else if (totalFloat <= ent.Comp.BloodHealedSoundThreshold && oldBleedAmount > 0)
-        {
-            // Magically, this damage has healed some bleeding, likely
-            // because it's burn damage that cauterized their wounds.
-
-            // We'll play a special sound and popup for feedback.
-            _audio.PlayPvs(ent.Comp.BloodHealedSound, ent);
-            _popupSystem.PopupEntity(Loc.GetString("bloodstream-component-wounds-cauterized"), ent,
-                ent, PopupType.Medium);
-        }
-    }
-    /// <summary>
-    ///     Shows text on health examine, based on bleed rate and blood level.
-    /// </summary>
-    private void OnHealthBeingExamined(Entity<BloodstreamComponent> ent, ref HealthBeingExaminedEvent args)
-    {
-        // Shows massively bleeding at 0.75x the max bleed rate.
-        if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount * 0.75f)
-        {
-            args.Message.PushNewline();
-            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-massive-bleeding", ("target", ent.Owner)));
-        }
-        // Shows bleeding message when bleeding above half the max rate, but less than massively.
-        else if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount * 0.5f)
-        {
-            args.Message.PushNewline();
-            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-strong-bleeding", ("target", ent.Owner)));
-        }
-        // Shows bleeding message when bleeding above 0.25x the max rate, but less than half the max.
-        else if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount * 0.25f)
-        {
-            args.Message.PushNewline();
-            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner)));
-        }
-        // Shows bleeding message when bleeding below 0.25x the max cap
-        else if (ent.Comp.BleedAmount > 0)
-        {
-            args.Message.PushNewline();
-            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-slight-bleeding", ("target", ent.Owner)));
-        }
-
-        // If the mob's blood level is below the damage threshhold, the pale message is added.
-        if (GetBloodLevelPercentage(ent, ent) < ent.Comp.BloodlossThreshold)
-        {
-            args.Message.PushNewline();
-            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
-        }
-    }
-
-    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref BeingGibbedEvent args)
-    {
-        SpillAllSolutions(ent, ent);
-    }
-
-    private void OnApplyMetabolicMultiplier(
-        Entity<BloodstreamComponent> ent,
-        ref ApplyMetabolicMultiplierEvent args)
-    {
-        // TODO REFACTOR THIS
-        // This will slowly drift over time due to floating point errors.
-        // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-        if (args.Apply)
-        {
-            ent.Comp.UpdateInterval *= args.Multiplier;
-            return;
-        }
-        ent.Comp.UpdateInterval /= args.Multiplier;
-    }
-
-    private void OnRejuvenate(Entity<BloodstreamComponent> entity, ref RejuvenateEvent args)
-    {
-        TryModifyBleedAmount(entity.Owner, -entity.Comp.BleedAmount, entity.Comp);
-
-        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
-            TryModifyBloodLevel(entity.Owner, bloodSolution.AvailableVolume, entity.Comp);
-
-        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.ChemicalSolutionName, ref entity.Comp.ChemicalSolution))
-            _solutionContainerSystem.RemoveAllSolution(entity.Comp.ChemicalSolution.Value);
-    }
-
-    /// <summary>
-    ///     Attempt to transfer provided solution to internal solution.
-    /// </summary>
-    public bool TryAddToChemicals(EntityUid uid, Solution solution, BloodstreamComponent? component = null)
-    {
-        return Resolve(uid, ref component, logMissing: false)
-            && _solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution)
-            && _solutionContainerSystem.TryAddSolution(component.ChemicalSolution.Value, solution);
-    }
-
-    public bool FlushChemicals(EntityUid uid, string excludedReagentID, FixedPoint2 quantity, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution, out var chemSolution))
-            return false;
-
-        for (var i = chemSolution.Contents.Count - 1; i >= 0; i--)
-        {
-            var (reagentId, _) = chemSolution.Contents[i];
-            if (reagentId.Prototype != excludedReagentID)
-            {
-                _solutionContainerSystem.RemoveReagent(component.ChemicalSolution.Value, reagentId, quantity);
-            }
-        }
-
-        return true;
-    }
-
-    public float GetBloodLevelPercentage(EntityUid uid, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-        {
-            return 0.0f;
-        }
-
-        return bloodSolution.FillFraction;
-    }
-
-    public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.BloodlossThreshold = threshold;
-    }
-
-    /// <summary>
-    ///     Attempts to modify the blood level of this entity directly.
-    /// </summary>
-    public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution))
-        {
-            return false;
-        }
-
-        if (amount >= 0)
-            return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, null, GetEntityBloodData(uid));
-
-        // Removal is more involved,
-        // since we also wanna handle moving it to the temporary solution
-        // and then spilling it if necessary.
-        var newSol = _solutionContainerSystem.SplitSolution(component.BloodSolution.Value, -amount);
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodTemporarySolutionName, ref component.TemporarySolution, out var tempSolution))
-            return true;
-
-        tempSolution.AddSolution(newSol, _prototypeManager);
-
-        if (tempSolution.Volume > component.BleedPuddleThreshold)
-        {
-            // Pass some of the chemstream into the spilled blood.
-            if (_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution))
-            {
-                var temp = _solutionContainerSystem.SplitSolution(component.ChemicalSolution.Value, tempSolution.Volume / 10);
-                tempSolution.AddSolution(temp, _prototypeManager);
-            }
-
-            _puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false);
-
-            tempSolution.RemoveAllSolution();
-        }
-
-        // Sunrise added start - звуки кровотечения(капающей крови)
-        _audio.PlayPvs(component.BloodDrippingSound, uid, AudioParams.Default.WithVolume(-1f));
-        // Sunrise added end
-
-        _solutionContainerSystem.UpdateChemicals(component.TemporarySolution.Value);
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Tries to make an entity bleed more or less
-    /// </summary>
-    public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false))
-            return false;
-
-        component.BleedAmount += amount;
-        component.BleedAmount = Math.Clamp(component.BleedAmount, 0, component.MaxBleedAmount);
-
-        if (component.BleedAmount == 0)
-            _alertsSystem.ClearAlert(uid, component.BleedingAlert);
-        else
-        {
-            var severity = (short) Math.Clamp(Math.Round(component.BleedAmount, MidpointRounding.ToZero), 0, 10);
-            _alertsSystem.ShowAlert(uid, component.BleedingAlert, severity);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     BLOOD FOR THE BLOOD GOD
-    /// </summary>
-    public void SpillAllSolutions(EntityUid uid, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        var tempSol = new Solution();
-
-        if (_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-        {
-            tempSol.MaxVolume += bloodSolution.MaxVolume;
-            tempSol.AddSolution(bloodSolution, _prototypeManager);
-            _solutionContainerSystem.RemoveAllSolution(component.BloodSolution.Value);
-        }
-
-        if (_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution, out var chemSolution))
-        {
-            tempSol.MaxVolume += chemSolution.MaxVolume;
-            tempSol.AddSolution(chemSolution, _prototypeManager);
-            _solutionContainerSystem.RemoveAllSolution(component.ChemicalSolution.Value);
-        }
-
-        if (_solutionContainerSystem.ResolveSolution(uid, component.BloodTemporarySolutionName, ref component.TemporarySolution, out var tempSolution))
-        {
-            tempSol.MaxVolume += tempSolution.MaxVolume;
-            tempSol.AddSolution(tempSolution, _prototypeManager);
-            _solutionContainerSystem.RemoveAllSolution(component.TemporarySolution.Value);
-        }
-
-        _puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid);
-    }
-
-    /// <summary>
-    ///     Change what someone's blood is made of, on the fly.
-    /// </summary>
-    public void ChangeBloodReagent(EntityUid uid, string reagent, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || reagent == component.BloodReagent)
-        {
-            return;
-        }
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-        {
-            component.BloodReagent = reagent;
-            return;
-        }
-
-        var currentVolume = bloodSolution.RemoveReagent(component.BloodReagent, bloodSolution.Volume, ignoreReagentData: true);
-
-        component.BloodReagent = reagent;
-
-        if (currentVolume > 0)
-            _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, null, GetEntityBloodData(uid));
-    }
-
+    // forensics is not predicted yet
     private void OnDnaGenerated(Entity<BloodstreamComponent> entity, ref GenerateDnaEvent args)
     {
-        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
+        if (SolutionContainer.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
         {
             foreach (var reagent in bloodSolution.Contents)
             {
@@ -505,22 +55,4 @@ public sealed class BloodstreamSystem : EntitySystem
         else
             Log.Error("Unable to set bloodstream DNA, solution entity could not be resolved");
     }
-
-    /// <summary>
-    /// Get the reagent data for blood that a specific entity should have.
-    /// </summary>
-    public List<ReagentData> GetEntityBloodData(EntityUid uid)
-    {
-        var bloodData = new List<ReagentData>();
-        var dnaData = new DnaData();
-
-        if (TryComp<DnaComponent>(uid, out var donorComp) && donorComp.DNA != null)
-            dnaData.DNA = donorComp.DNA;
-        else
-            dnaData.DNA = Loc.GetString("forensics-dna-unknown");
-
-        bloodData.Add(dnaData);
-
-        return bloodData;
-    }
 }
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 4c830ce847..2063887798 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -1,5 +1,4 @@
 using System.Numerics;
-using Content.Server.Body.Components;
 using Content.Server.Ghost;
 using Content.Server.Humanoid;
 using Content.Shared.Body.Components;
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 86d2cb61ff..e916849a81 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -1,47 +1,46 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
-using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Pointing;
 
-namespace Content.Server.Body.Systems
+namespace Content.Server.Body.Systems;
+
+public sealed class BrainSystem : EntitySystem
 {
-    public sealed class BrainSystem : EntitySystem
+    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+        base.Initialize();
 
-        public override void Initialize()
-        {
-            base.Initialize();
+        SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
+        SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
+        SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
+    }
 
-            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
-            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
-            SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
-        }
+    private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
+    {
+        if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
+            return;
 
-        private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
-        {
-            if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
-                return;
+        EnsureComp<MindContainerComponent>(newEntity);
+        EnsureComp<MindContainerComponent>(oldEntity);
 
-            EnsureComp<MindContainerComponent>(newEntity);
-            EnsureComp<MindContainerComponent>(oldEntity);
+        var ghostOnMove = EnsureComp<GhostOnMoveComponent>(newEntity);
+        ghostOnMove.MustBeDead = HasComp<MobStateComponent>(newEntity); // Don't ghost living players out of their bodies.
 
-            var ghostOnMove = EnsureComp<GhostOnMoveComponent>(newEntity);
-            if (HasComp<BodyComponent>(newEntity))
-                ghostOnMove.MustBeDead = true;
+        if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind))
+            return;
 
-            if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind))
-                return;
+        _mindSystem.TransferTo(mindId, newEntity, mind: mind);
+    }
 
-            _mindSystem.TransferTo(mindId, newEntity, mind: mind);
-        }
-
-        private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
-        {
-            args.Cancel();
-        }
+    private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
+    {
+        args.Cancel();
     }
 }
+
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 93dedf5fff..77f17b384d 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Components;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -47,7 +48,7 @@ public sealed class InternalsSystem : SharedInternalsSystem
             return;
 
         // Could the entity metabolise the air in the linked gas tank?
-        if (!_respirator.CanMetabolizeGas(uid, tank.Value.Comp.Air))
+        if (!_respirator.CanMetabolizeInhaledAir(uid, tank.Value.Comp.Air))
             return;
 
         ToggleInternals(uid, uid, force: false, component, ToggleMode.On);
@@ -58,7 +59,7 @@ public sealed class InternalsSystem : SharedInternalsSystem
         if (AreInternalsWorking(ent))
         {
             var gasTank = Comp<GasTankComponent>(ent.Comp.GasTankEntity!.Value);
-            args.Gas = _gasTank.RemoveAirVolume((ent.Comp.GasTankEntity.Value, gasTank), Atmospherics.BreathVolume);
+            args.Gas = _gasTank.RemoveAirVolume((ent.Comp.GasTankEntity.Value, gasTank), args.Respirator.BreathVolume);
             // TODO: Should listen to gas tank updates instead I guess?
             _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
         }
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index 273a8466ca..fdc071c5f1 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Server/Body/Systems/LungSystem.cs
@@ -63,6 +63,9 @@ public sealed class LungSystem : EntitySystem
         _solutionContainerSystem.UpdateChemicals(lung.Solution.Value);
     }
 
+    /* This should really be moved to somewhere in the atmos system and modernized,
+     so that other systems, like CondenserSystem, can use it.
+     */
     private void GasToReagent(GasMixture gas, Solution solution)
     {
         foreach (var gasId in Enum.GetValues<Gas>())
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index bd152b7c7d..6c18e0f997 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Body.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
+using Content.Shared.Body.Systems;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -19,7 +20,8 @@ using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems
 {
-    public sealed class MetabolizerSystem : EntitySystem
+    /// <inheritdoc/>
+    public sealed class MetabolizerSystem : SharedMetabolizerSystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -46,7 +48,7 @@ namespace Content.Server.Body.Systems
 
         private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
         }
 
         private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
@@ -66,20 +68,9 @@ namespace Content.Server.Body.Systems
             }
         }
 
-        private void OnApplyMetabolicMultiplier(
-            Entity<MetabolizerComponent> ent,
-            ref ApplyMetabolicMultiplierEvent args)
+        private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
         {
-            // TODO REFACTOR THIS
-            // This will slowly drift over time due to floating point errors.
-            // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-            if (args.Apply)
-            {
-                ent.Comp.UpdateInterval *= args.Multiplier;
-                return;
-            }
-
-            ent.Comp.UpdateInterval /= args.Multiplier;
+            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
         }
 
         public override void Update(float frameTime)
@@ -100,7 +91,7 @@ namespace Content.Server.Body.Systems
                 if (_gameTiming.CurTime < metab.NextUpdate)
                     continue;
 
-                metab.NextUpdate += metab.UpdateInterval;
+                metab.NextUpdate += metab.AdjustedUpdateInterval;
                 TryMetabolize((uid, metab));
             }
         }
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 741ef3a21f..9e35201b5c 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -49,9 +49,15 @@ public sealed class RespiratorSystem : EntitySystem
         // We want to process lung reagents before we inhale new reagents.
         UpdatesAfter.Add(typeof(MetabolizerSystem));
         SubscribeLocalEvent<RespiratorComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<RespiratorComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<RespiratorComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
 
+        // BodyComp stuff
+        SubscribeLocalEvent<BodyComponent, InhaledGasEvent>(OnGasInhaled);
+        SubscribeLocalEvent<BodyComponent, ExhaledGasEvent>(OnGasExhaled);
+        SubscribeLocalEvent<BodyComponent, CanMetabolizeGasEvent>(CanBodyMetabolizeGas);
+        SubscribeLocalEvent<BodyComponent, SuffocationEvent>(OnSuffocation);
+        SubscribeLocalEvent<BodyComponent, StopSuffocatingEvent>(OnStopSuffocating);
+
         // Sunrise-Start
         SubscribeLocalEvent<RespiratorImmunityComponent, ComponentInit>(OnPressureImmuneInit);
         SubscribeLocalEvent<RespiratorImmunityComponent, ComponentRemove>(OnPressureImmuneRemove);
@@ -78,41 +84,36 @@ public sealed class RespiratorSystem : EntitySystem
 
     private void OnMapInit(Entity<RespiratorComponent> ent, ref MapInitEvent args)
     {
-        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-    }
-
-    private void OnUnpaused(Entity<RespiratorComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUpdate += args.PausedTime;
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
     }
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<RespiratorComponent, BodyComponent>();
-        while (query.MoveNext(out var uid, out var respirator, out var body))
+        var query = EntityQueryEnumerator<RespiratorComponent>();
+        while (query.MoveNext(out var uid, out var respirator))
         {
             if (_gameTiming.CurTime < respirator.NextUpdate || respirator.HasImmunity) // Sunrise-Edit
                 continue;
 
-            respirator.NextUpdate += respirator.UpdateInterval;
+            respirator.NextUpdate += respirator.AdjustedUpdateInterval;
 
             if (_mobState.IsDead(uid))
                 continue;
 
-            UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
+            UpdateSaturation(uid, -(float)respirator.UpdateInterval.TotalSeconds, respirator);
 
             if (!_mobState.IsIncapacitated(uid)) // cannot breathe in crit.
             {
                 switch (respirator.Status)
                 {
                     case RespiratorStatus.Inhaling:
-                        Inhale(uid, body);
+                        Inhale((uid, respirator));
                         respirator.Status = RespiratorStatus.Exhaling;
                         break;
                     case RespiratorStatus.Exhaling:
-                        Exhale(uid, body);
+                        Exhale((uid, respirator));
                         respirator.Status = RespiratorStatus.Inhaling;
                         break;
                 }
@@ -123,7 +124,10 @@ public sealed class RespiratorSystem : EntitySystem
                 if (_gameTiming.CurTime >= respirator.LastGaspEmoteTime + respirator.GaspEmoteCooldown)
                 {
                     respirator.LastGaspEmoteTime = _gameTiming.CurTime;
-                    _chat.TryEmoteWithChat(uid, respirator.GaspEmote, ChatTransmitRange.HideChat, ignoreActionBlocker: true);
+                    _chat.TryEmoteWithChat(uid,
+                        respirator.GaspEmote,
+                        ChatTransmitRange.HideChat,
+                        ignoreActionBlocker: true);
                 }
 
                 TakeSuffocationDamage((uid, respirator));
@@ -136,68 +140,61 @@ public sealed class RespiratorSystem : EntitySystem
         }
     }
 
-    public void Inhale(EntityUid uid, BodyComponent? body = null)
+    public void Inhale(Entity<RespiratorComponent?> entity)
     {
-        if (!Resolve(uid, ref body, logMissing: false))
+        if (!Resolve(entity, ref entity.Comp, logMissing: false))
             return;
 
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
-
         // Inhale gas
-        var ev = new InhaleLocationEvent();
-        RaiseLocalEvent(uid, ref ev);
+        var ev = new InhaleLocationEvent
+        {
+            Respirator = entity.Comp,
+        };
+        RaiseLocalEvent(entity, ref ev);
 
-        ev.Gas ??= _atmosSys.GetContainingMixture(uid, excite: true);
+        ev.Gas ??= _atmosSys.GetContainingMixture(entity.Owner, excite: true);
 
         if (ev.Gas is null)
-        {
             return;
-        }
 
-        var actualGas = ev.Gas.RemoveVolume(Atmospherics.BreathVolume);
+        var gas = ev.Gas.RemoveVolume(entity.Comp.BreathVolume);
 
-        var lungRatio = 1.0f / organs.Count;
-        var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
-        foreach (var (organUid, lung, _) in organs)
-        {
-            // Merge doesn't remove gas from the giver.
-            _atmosSys.Merge(lung.Air, gas);
-            _lungSystem.GasToReagent(organUid, lung);
-        }
+        var inhaleEv = new InhaledGasEvent(gas);
+        RaiseLocalEvent(entity, ref inhaleEv);
+
+        if (inhaleEv.Handled && inhaleEv.Succeeded)
+            return;
+
+        // If nothing could inhale the gas give it back.
+        _atmosSys.Merge(ev.Gas, gas);
     }
 
-    public void Exhale(EntityUid uid, BodyComponent? body = null)
+    public void Exhale(Entity<RespiratorComponent> entity)
     {
-        if (!Resolve(uid, ref body, logMissing: false))
-            return;
-
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
-
         // exhale gas
 
         var ev = new ExhaleLocationEvent();
-        RaiseLocalEvent(uid, ref ev, broadcast: false);
+        RaiseLocalEvent(entity, ref ev, broadcast: false);
 
         if (ev.Gas is null)
         {
-            ev.Gas = _atmosSys.GetContainingMixture(uid, excite: true);
+            ev.Gas = _atmosSys.GetContainingMixture(entity.Owner, excite: true);
 
             // Walls and grids without atmos comp return null. I guess it makes sense to not be able to exhale in walls,
             // but this also means you cannot exhale on some grids.
             ev.Gas ??= GasMixture.SpaceGas;
         }
 
-        var outGas = new GasMixture(ev.Gas.Volume);
-        foreach (var (organUid, lung, _) in organs)
-        {
-            _atmosSys.Merge(outGas, lung.Air);
-            lung.Air.Clear();
+        Exhale(entity!, ev.Gas);
+    }
 
-            if (_solutionContainerSystem.ResolveSolution(organUid, lung.SolutionName, ref lung.Solution))
-                _solutionContainerSystem.RemoveAllSolution(lung.Solution.Value);
-        }
+    public void Exhale(Entity<RespiratorComponent?> entity, GasMixture gas)
+    {
+        if (!Resolve(entity, ref entity.Comp, logMissing: false))
+            return;
 
-        _atmosSys.Merge(ev.Gas, outGas);
+        var ev = new ExhaledGasEvent(gas);
+        RaiseLocalEvent(entity, ref ev);
     }
 
     /// <summary>
@@ -215,51 +212,117 @@ public sealed class RespiratorSystem : EntitySystem
     }
 
     /// <summary>
-    /// Check whether or not an entity can metabolize inhaled air without suffocating or taking damage (i.e., no toxic
-    /// gasses).
+    /// Checks if it's safe for a given entity to breathe the air from the environment it is currently situated in.
     /// </summary>
+    /// <param name="ent">The entity attempting to metabolize the gas.</param>
+    /// <returns>Returns true only if the air is not toxic, and it wouldn't suffocate.</returns>
     public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        var ev = new InhaleLocationEvent();
+        // Get the gas at our location but don't actually remove it from the gas mixture.
+        var ev = new InhaleLocationEvent
+        {
+            Respirator = ent.Comp,
+        };
         RaiseLocalEvent(ent, ref ev);
 
-        var gas = ev.Gas ?? _atmosSys.GetContainingMixture(ent.Owner);
-        if (gas == null)
-            return false;
+        ev.Gas ??= _atmosSys.GetContainingMixture(ent.Owner, excite: true);
 
-        return CanMetabolizeGas(ent, gas);
+        // If there's no air to breathe or we can't metabolize it then internals should be on.
+        return ev.Gas is not null && CanMetabolizeInhaledAir(ent, ev.Gas);
     }
 
     /// <summary>
-    /// Check whether or not an entity can metabolize the given gas mixture without suffocating or taking damage
-    /// (i.e., no toxic gasses).
+    /// Checks if a given entity can safely metabolize a given gas mixture.
     /// </summary>
-    public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
+    /// <param name="ent">The entity attempting to metabolize the gas.</param>
+    /// <param name="gas">The gas mixture we are trying to metabolize.</param>
+    /// <returns>Returns true only if the gas mixture is not toxic, and it wouldn't suffocate.</returns>
+    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent, GasMixture gas)
     {
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-        if (organs.Count == 0)
+        var ev = new CanMetabolizeGasEvent(gas);
+        RaiseLocalEvent(ent, ref ev);
+
+        if (!ev.Handled || ev.Toxic)
             return false;
 
-        gas = new GasMixture(gas);
-        var lungRatio = 1.0f / organs.Count;
-        gas.Multiply(MathF.Min(lungRatio * gas.Volume/Atmospherics.BreathVolume, lungRatio));
-        var solution = _lungSystem.GasToReagent(gas);
+        return ev.Saturation > ent.Comp.UpdateInterval.TotalSeconds;
+    }
 
-        float saturation = 0;
+    /// <summary>
+    /// Tries to safely metabolize the current solutions in a body's lungs.
+    /// </summary>
+    private void CanBodyMetabolizeGas(Entity<BodyComponent> ent, ref CanMetabolizeGasEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+        if (organs.Count == 0)
+            return;
+
+        var solution = _lungSystem.GasToReagent(args.Gas);
+
+        var saturation = 0f;
         foreach (var organ in organs)
         {
             saturation += GetSaturation(solution, organ.Owner, out var toxic);
-            if (toxic)
-                return false;
+            if (!toxic)
+                continue;
+
+            args.Handled = true;
+            args.Toxic = true;
+            return;
         }
 
-        return saturation > ent.Comp.UpdateInterval.TotalSeconds;
+        args.Handled = true;
+        args.Saturation = saturation;
+    }
+
+    public bool TryInhaleGasToBody(Entity<BodyComponent?> entity, GasMixture gas)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((entity, entity.Comp));
+        if (organs.Count == 0)
+            return false;
+
+        var lungRatio = 1.0f / organs.Count;
+        var splitGas = organs.Count == 1 ? gas : gas.RemoveRatio(lungRatio);
+        foreach (var (organUid, lung, _) in organs)
+        {
+            // Merge doesn't remove gas from the giver.
+            _atmosSys.Merge(lung.Air, splitGas);
+            _lungSystem.GasToReagent(organUid, lung);
+        }
+
+        return true;
+    }
+
+    public void RemoveGasFromBody(Entity<BodyComponent> ent, GasMixture gas)
+    {
+        var outGas = new GasMixture(gas.Volume);
+
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, ent.Comp));
+        if (organs.Count == 0)
+            return;
+
+        foreach (var (organUid, lung, _) in organs)
+        {
+            _atmosSys.Merge(outGas, lung.Air);
+            lung.Air.Clear();
+
+            if (_solutionContainerSystem.ResolveSolution(organUid, lung.SolutionName, ref lung.Solution))
+                _solutionContainerSystem.RemoveAllSolution(lung.Solution.Value);
+        }
+
+        _atmosSys.Merge(gas, outGas);
     }
 
     /// <summary>
@@ -325,18 +388,13 @@ public sealed class RespiratorSystem : EntitySystem
         if (ent.Comp.SuffocationCycles == 2)
             _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} started suffocating");
 
-        if (ent.Comp.SuffocationCycles >= ent.Comp.SuffocationCycleThreshold)
-        {
-            // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-            var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-            foreach (var entity in organs)
-            {
-                _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
-            }
-            RaiseLocalEvent(ent, new MoodEffectEvent("Suffocating"));
-        }
-
         _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false);
+
+        if (ent.Comp.SuffocationCycles < ent.Comp.SuffocationCycleThreshold)
+            return;
+
+        var ev = new SuffocationEvent();
+        RaiseLocalEvent(ent, ref ev);
     }
 
     private void StopSuffocation(Entity<RespiratorComponent> ent)
@@ -344,18 +402,33 @@ public sealed class RespiratorSystem : EntitySystem
         if (ent.Comp.SuffocationCycles >= 2)
             _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating");
 
+        _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
+
+        var ev = new StopSuffocatingEvent();
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    private void OnSuffocation(Entity<BodyComponent> ent, ref SuffocationEvent args)
+    {
+        // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+        foreach (var entity in organs)
+        {
+            _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
+        }
+    }
+
+    private void OnStopSuffocating(Entity<BodyComponent> ent, ref StopSuffocatingEvent args)
+    {
         // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
         var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
         foreach (var entity in organs)
         {
             _alertsSystem.ClearAlert(ent, entity.Comp1.Alert);
         }
-
-        _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
     }
 
-    public void UpdateSaturation(EntityUid uid, float amount,
-        RespiratorComponent? respirator = null)
+    public void UpdateSaturation(EntityUid uid, float amount, RespiratorComponent? respirator = null)
     {
         if (!Resolve(uid, ref respirator, false))
             return;
@@ -365,32 +438,82 @@ public sealed class RespiratorSystem : EntitySystem
             Math.Clamp(respirator.Saturation, respirator.MinSaturation, respirator.MaxSaturation);
     }
 
-    private void OnApplyMetabolicMultiplier(
-        Entity<RespiratorComponent> ent,
-        ref ApplyMetabolicMultiplierEvent args)
+    private void OnApplyMetabolicMultiplier(Entity<RespiratorComponent> ent, ref ApplyMetabolicMultiplierEvent args)
     {
-        // TODO REFACTOR THIS
-        // This will slowly drift over time due to floating point errors.
-        // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-        if (args.Apply)
-        {
-            ent.Comp.UpdateInterval *= args.Multiplier;
-            ent.Comp.Saturation *= args.Multiplier;
-            ent.Comp.MaxSaturation *= args.Multiplier;
-            ent.Comp.MinSaturation *= args.Multiplier;
-            return;
-        }
+        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
+    }
 
-        // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-        ent.Comp.UpdateInterval /= args.Multiplier;
-        ent.Comp.Saturation /= args.Multiplier;
-        ent.Comp.MaxSaturation /= args.Multiplier;
-        ent.Comp.MinSaturation /= args.Multiplier;
+    private void OnGasInhaled(Entity<BodyComponent> entity, ref InhaledGasEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        args.Succeeded = TryInhaleGasToBody((entity, entity.Comp), args.Gas);
+    }
+
+    private void OnGasExhaled(Entity<BodyComponent> entity, ref ExhaledGasEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        RemoveGasFromBody(entity, args.Gas);
     }
 }
 
+/// <summary>
+/// Event raised when an entity first tries to inhale that returns a GasMixture from a given location.
+/// </summary>
+/// <param name="Gas">The gas that gets returned, null if there is none.</param>
+/// <param name="Respirator">The Respirator component of the entity attempting to inhale</param>
 [ByRefEvent]
-public record struct InhaleLocationEvent(GasMixture? Gas);
+public record struct InhaleLocationEvent(GasMixture? Gas, RespiratorComponent Respirator);
 
+/// <summary>
+/// Event raised when an entity first tries to exhale a gas, determines where the gas they're exhaling will be sent.
+/// </summary>
+/// <param name="Gas">The gas mixture that the exhaled gas will be merged into.</param>
 [ByRefEvent]
 public record struct ExhaleLocationEvent(GasMixture? Gas);
+
+/// <summary>
+/// Event raised when an entity successfully inhales a gas, attempts to find a place to put the gas.
+/// </summary>
+/// <param name="Gas">The gas we're inhaling.</param>
+/// <param name="Handled">Whether a system has responded appropriately.</param>
+/// <param name="Succeeded">Whether we successfully managed to inhale the gas</param>
+[ByRefEvent]
+public record struct InhaledGasEvent(GasMixture Gas, bool Handled = false, bool Succeeded = false);
+
+/// <summary>
+/// Event raised when an entity is exhaling
+/// </summary>
+/// <param name="Gas">The gas mixture we're exhaling into.</param>
+/// <param name="Handled">Whether we have successfully exhaled or not.</param>
+[ByRefEvent]
+public record struct ExhaledGasEvent(GasMixture Gas, bool Handled = false);
+
+/// <summary>
+/// Raised when an entity starts suffocating and when suffocation progresses.
+/// </summary>
+[ByRefEvent]
+public record struct SuffocationEvent;
+
+/// <summary>
+/// Raised when an entity that was suffocating stops suffocating.
+/// </summary>
+[ByRefEvent]
+public record struct StopSuffocatingEvent;
+
+/// <summary>
+/// An event raised to inhalation handlers that asks them nicely to simulate what it would be like to metabolize
+/// a given volume of gas, without actually metabolizing it.
+/// </summary>
+/// <param name="Gas">The gas mixture we are testing.</param>
+/// <param name="Toxic">Whether the gas returns as toxic to any respirator.</param>
+/// <param name="Saturation">The amount of saturation we got from the gas.</param>
+[ByRefEvent]
+public record struct CanMetabolizeGasEvent(GasMixture Gas, bool Toxic = false, float Saturation = 0f, bool Handled = false);
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index ae182cbe7e..ee7ca4f584 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,17 +1,14 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
+using Content.Server.EntityEffects;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
-using Content.Shared.EntityEffects;
 using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Utility;
 
-using Content.Server.EntityEffects;
-
 namespace Content.Server.Botany;
 
 [Prototype]
@@ -133,8 +130,8 @@ public partial class SeedData
     /// <summary>
     ///     The entity prototype this seed spawns when it gets harvested.
     /// </summary>
-    [DataField("productPrototypes", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> ProductPrototypes = new();
+    [DataField]
+    public List<EntProtoId> ProductPrototypes = new();
 
     [DataField] public Dictionary<string, SeedChemQuantity> Chemicals = new();
 
@@ -243,8 +240,8 @@ public partial class SeedData
     /// <summary>
     ///     The seed prototypes this seed may mutate into when prompted to.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<SeedPrototype>))]
-    public List<string> MutationPrototypes = new();
+    [DataField]
+    public List<ProtoId<SeedPrototype>> MutationPrototypes = new();
 
     /// <summary>
     ///  Log impact for when the seed is planted.
@@ -270,8 +267,8 @@ public partial class SeedData
             Mysterious = Mysterious,
 
             PacketPrototype = PacketPrototype,
-            ProductPrototypes = new List<string>(ProductPrototypes),
-            MutationPrototypes = new List<string>(MutationPrototypes),
+            ProductPrototypes = new List<EntProtoId>(ProductPrototypes),
+            MutationPrototypes = new List<ProtoId<SeedPrototype>>(MutationPrototypes),
             Chemicals = new Dictionary<string, SeedChemQuantity>(Chemicals),
             ConsumeGasses = new Dictionary<Gas, float>(ConsumeGasses),
             ExudeGasses = new Dictionary<Gas, float>(ExudeGasses),
@@ -330,8 +327,8 @@ public partial class SeedData
             Mysterious = other.Mysterious,
 
             PacketPrototype = other.PacketPrototype,
-            ProductPrototypes = new List<string>(other.ProductPrototypes),
-            MutationPrototypes = new List<string>(other.MutationPrototypes),
+            ProductPrototypes = new List<EntProtoId>(other.ProductPrototypes),
+            MutationPrototypes = new List<ProtoId<SeedPrototype>>(other.MutationPrototypes),
 
             Chemicals = new Dictionary<string, SeedChemQuantity>(Chemicals),
             ConsumeGasses = new Dictionary<Gas, float>(ConsumeGasses),
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index 37b68d9475..ee35db48e3 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -9,13 +9,15 @@ namespace Content.Server.Botany;
 
 public sealed class MutationSystem : EntitySystem
 {
+    private static ProtoId<RandomPlantMutationListPrototype> RandomPlantMutations = "RandomPlantMutations";
+
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private RandomPlantMutationListPrototype _randomMutations = default!;
 
     public override void Initialize()
     {
-        _randomMutations = _prototypeManager.Index<RandomPlantMutationListPrototype>("RandomPlantMutations");
+        _randomMutations = _prototypeManager.Index(RandomPlantMutations);
     }
 
     /// <summary>
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 0686f32097..d8381b2a79 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Botany.Components;
+using Content.Server.Hands.Systems;
 using Content.Server.Kitchen.Components;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.EntitySystems;
@@ -37,6 +38,7 @@ public sealed class PlantHolderSystem : EntitySystem
     [Dependency] private readonly MutationSystem _mutation = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
@@ -45,7 +47,7 @@ public sealed class PlantHolderSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    
+
     public const float HydroponicsSpeedMultiplier = 1f;
     public const float HydroponicsConsumptionMultiplier = 2f;
 
@@ -706,9 +708,9 @@ public sealed class PlantHolderSystem : EntitySystem
 
         if (component.Harvest && !component.Dead)
         {
-            if (TryComp<HandsComponent>(user, out var hands))
+            if (_hands.TryGetActiveItem(user, out var activeItem))
             {
-                if (!_botany.CanHarvest(component.Seed, hands.ActiveHandEntity))
+                if (!_botany.CanHarvest(component.Seed, activeItem))
                 {
                     _popup.PopupCursor(Loc.GetString("plant-holder-component-ligneous-cant-harvest-message"), user);
                     return false;
diff --git a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
index 37d0f5b7d1..56401602b3 100644
--- a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Station.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Cargo.Components;
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 456d979959..934517eadc 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -29,8 +29,7 @@ public sealed partial class CargoSystem
     [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
 
-    [ValidatePrototypeId<NameIdentifierGroupPrototype>]
-    private const string BountyNameIdentifierGroup = "Bounty";
+    private static readonly ProtoId<NameIdentifierGroupPrototype> BountyNameIdentifierGroup = "Bounty";
 
     private EntityQuery<StackComponent> _stackQuery;
     private EntityQuery<ContainerManagerComponent> _containerQuery;
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 84c118af6f..0cde82f62e 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Cargo.Components;
-using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Components;
@@ -13,8 +12,8 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Labels.Components;
 using Content.Shared.Paper;
+using Content.Shared.Station.Components;
 using JetBrains.Annotations;
-using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -635,7 +634,7 @@ namespace Content.Server.Cargo.Systems
             _transformSystem.Unanchor(item, Transform(item));
 
             // Create a sheet of paper to write the order details on
-            var printed = EntityManager.SpawnEntity(paperProto, spawn);
+            var printed = Spawn(paperProto, spawn);
             if (TryComp<PaperComponent>(printed, out var paper))
             {
                 // fill in the order data
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index 25fb514db6..9e5c20e8c9 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -3,11 +3,11 @@ using System.Linq;
 using Content.Server.Cargo.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.DeviceLinking;
 using Content.Shared.Power;
+using Content.Shared.Station.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index 5e449eb8da..24ee4ffaf2 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -90,19 +90,22 @@ public sealed class PricingSystem : EntitySystem
         if (args.Handled)
             return;
 
-        if (!TryComp<BodyComponent>(uid, out var body) || !TryComp<MobStateComponent>(uid, out var state))
+        if (!TryComp<MobStateComponent>(uid, out var state))
         {
-            Log.Error($"Tried to get the mob price of {ToPrettyString(uid)}, which has no {nameof(BodyComponent)} and no {nameof(MobStateComponent)}.");
+            Log.Error($"Tried to get the mob price of {ToPrettyString(uid)}, which has no {nameof(MobStateComponent)}.");
             return;
         }
 
-        // TODO: Better handling of missing.
-        var partList = _bodySystem.GetBodyChildren(uid, body).ToList();
-        var totalPartsPresent = partList.Sum(_ => 1);
-        var totalParts = partList.Count;
+        var partPenalty = 0.0;
+        if (TryComp<BodyComponent>(uid, out var body))
+        {
+            var partList = _bodySystem.GetBodyChildren(uid, body).ToList();
+            var totalPartsPresent = partList.Sum(_ => 1);
+            var totalParts = partList.Count;
 
-        var partRatio = totalPartsPresent / (double) totalParts;
-        var partPenalty = component.Price * (1 - partRatio) * component.MissingBodyPartPenalty;
+            var partRatio = totalPartsPresent / (double) totalParts;
+            partPenalty = component.Price * (1 - partRatio) * component.MissingBodyPartPenalty;
+        }
 
         args.Price += (component.Price - partPenalty) * (_mobStateSystem.IsAlive(uid, state) ? 1.0 : component.DeathPenalty);
     }
diff --git a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
index 5247aafbd5..b1b23b2732 100644
--- a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
@@ -16,8 +16,7 @@ public sealed class CrewManifestCartridgeSystem : EntitySystem
     [Dependency] private readonly CrewManifestSystem _crewManifest = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string CartridgePrototypeName = "CrewManifestCartridge";
+    private static readonly EntProtoId CartridgePrototypeName = "CrewManifestCartridge";
 
     /// <summary>
     /// Flag that shows that if crew manifest is allowed to be viewed from 'unsecure' entities,
diff --git a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
index 8118ca8555..66934c8a87 100644
--- a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
@@ -47,7 +47,7 @@ public sealed class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem
         {
             return;
         }
-        if (!EntityManager.TryGetComponent<NanoTaskPrintedComponent>(args.Used, out var printed))
+        if (!TryComp<NanoTaskPrintedComponent>(args.Used, out var printed))
         {
             return;
         }
@@ -55,7 +55,7 @@ public sealed class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem
         {
             program.Tasks.Add(new(program.Counter++, printed.Task));
             args.Handled = true;
-            EntityManager.DeleteEntity(args.Used);
+            Del(args.Used);
             UpdateUiState(new Entity<NanoTaskCartridgeComponent>(uid.Value, program), ent.Owner);
         }
     }
diff --git a/Content.Server/Chat/Commands/AdminChatCommand.cs b/Content.Server/Chat/Commands/AdminChatCommand.cs
index 1a7ae050b6..38eb977afc 100644
--- a/Content.Server/Chat/Commands/AdminChatCommand.cs
+++ b/Content.Server/Chat/Commands/AdminChatCommand.cs
@@ -6,19 +6,19 @@ using Robust.Shared.Console;
 namespace Content.Server.Chat.Commands
 {
     [AdminCommand(AdminFlags.Adminchat)]
-    internal sealed class AdminChatCommand : IConsoleCommand
+    internal sealed class AdminChatCommand : LocalizedCommands
     {
-        public string Command => "asay";
-        public string Description => "Send chat messages to the private admin chat channel.";
-        public string Help => "asay <text>";
+        [Dependency] private readonly IChatManager _chatManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "asay";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var player = shell.Player;
 
             if (player == null)
             {
-                shell.WriteError("You can't run this command locally.");
+                shell.WriteError(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
@@ -29,7 +29,7 @@ namespace Content.Server.Chat.Commands
             if (string.IsNullOrEmpty(message))
                 return;
 
-            IoCManager.Resolve<IChatManager>().TrySendOOCMessage(player, message, OOCChatType.Admin);
+            _chatManager.TrySendOOCMessage(player, message, OOCChatType.Admin);
         }
     }
 }
diff --git a/Content.Server/Chat/Commands/MeCommand.cs b/Content.Server/Chat/Commands/MeCommand.cs
index e763d5656e..36acfa7a69 100644
--- a/Content.Server/Chat/Commands/MeCommand.cs
+++ b/Content.Server/Chat/Commands/MeCommand.cs
@@ -6,17 +6,17 @@ using Robust.Shared.Enums;
 namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
-    internal sealed class MeCommand : IConsoleCommand
+    internal sealed class MeCommand : LocalizedEntityCommands
     {
-        public string Command => "me";
-        public string Description => "Perform an action.";
-        public string Help => "me <text>";
+        [Dependency] private readonly ChatSystem _chatSystem = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "me";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player is not { } player)
             {
-                shell.WriteError("This command cannot be run from the server.");
+                shell.WriteError(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
@@ -25,7 +25,7 @@ namespace Content.Server.Chat.Commands
 
             if (player.AttachedEntity is not {} playerEntity)
             {
-                shell.WriteError("You don't have an entity!");
+                shell.WriteError(Loc.GetString($"shell-must-be-attached-to-entity"));
                 return;
             }
 
@@ -36,8 +36,7 @@ namespace Content.Server.Chat.Commands
             if (string.IsNullOrEmpty(message))
                 return;
 
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>()
-                .TrySendInGameICMessage(playerEntity, message, InGameICChatType.Emote, ChatTransmitRange.Normal, false, shell, player);
+            _chatSystem.TrySendInGameICMessage(playerEntity, message, InGameICChatType.Emote, ChatTransmitRange.Normal, false, shell, player);
         }
     }
 }
diff --git a/Content.Server/Chat/Commands/OOCCommand.cs b/Content.Server/Chat/Commands/OOCCommand.cs
index 36f6303fbd..1760d49cea 100644
--- a/Content.Server/Chat/Commands/OOCCommand.cs
+++ b/Content.Server/Chat/Commands/OOCCommand.cs
@@ -5,17 +5,17 @@ using Robust.Shared.Console;
 namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
-    internal sealed class OOCCommand : IConsoleCommand
+    internal sealed class OOCCommand : LocalizedCommands
     {
-        public string Command => "ooc";
-        public string Description => "Send Out Of Character chat messages.";
-        public string Help => "ooc <text>";
+        [Dependency] private readonly IChatManager _chatManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "ooc";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player is not { } player)
             {
-                shell.WriteError("This command cannot be run from the server.");
+                shell.WriteError(Loc.GetString($"shell-cannot-run-command-from-server"));
                 return;
             }
 
@@ -26,7 +26,7 @@ namespace Content.Server.Chat.Commands
             if (string.IsNullOrEmpty(message))
                 return;
 
-            IoCManager.Resolve<IChatManager>().TrySendOOCMessage(player, message, OOCChatType.OOC);
+            _chatManager.TrySendOOCMessage(player, message, OOCChatType.OOC);
         }
     }
 }
diff --git a/Content.Server/Chat/Commands/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs
index df6e548e5d..99ca4660f0 100644
--- a/Content.Server/Chat/Commands/SayCommand.cs
+++ b/Content.Server/Chat/Commands/SayCommand.cs
@@ -6,13 +6,12 @@ using Robust.Shared.Enums;
 namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
-    internal sealed class SayCommand : IConsoleCommand
+    internal sealed class SayCommand : LocalizedEntityCommands
     {
-        public string Command => "say";
-        public string Description => "Send chat messages to the local channel or a specified radio channel.";
-        public string Help => "say <text>";
+        [Dependency] private readonly ChatSystem _chatSystem = default!;
+        public override string Command => "say";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player is not { } player)
             {
@@ -25,7 +24,7 @@ namespace Content.Server.Chat.Commands
 
             if (player.AttachedEntity is not {} playerEntity)
             {
-                shell.WriteError("You don't have an entity!");
+                shell.WriteError(Loc.GetString($"shell-must-be-attached-to-entity"));
                 return;
             }
 
@@ -36,8 +35,7 @@ namespace Content.Server.Chat.Commands
             if (string.IsNullOrEmpty(message))
                 return;
 
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>()
-                .TrySendInGameICMessage(playerEntity, message, InGameICChatType.Speak, ChatTransmitRange.Normal, false, shell, player);
+            _chatSystem.TrySendInGameICMessage(playerEntity, message, InGameICChatType.Speak, ChatTransmitRange.Normal, false, shell, player);
         }
     }
 }
diff --git a/Content.Server/Chat/Commands/SetLOOCCommand.cs b/Content.Server/Chat/Commands/SetLOOCCommand.cs
index 9cfa2a67fc..c97c67c569 100644
--- a/Content.Server/Chat/Commands/SetLOOCCommand.cs
+++ b/Content.Server/Chat/Commands/SetLOOCCommand.cs
@@ -7,22 +7,21 @@ using Robust.Shared.Console;
 namespace Content.Server.Chat.Commands;
 
 [AdminCommand(AdminFlags.Server)]
-public sealed class SetLOOCCommand : IConsoleCommand
+public sealed class SetLoocCommand : LocalizedCommands
 {
-    public string Command => "setlooc";
-    public string Description => Loc.GetString("set-looc-command-description");
-    public string Help => Loc.GetString("set-looc-command-help");
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        var cfg = IoCManager.Resolve<IConfigurationManager>();
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
 
+    public override string Command => "setlooc";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
         if (args.Length > 1)
         {
-            shell.WriteError(Loc.GetString("set-looc-command-too-many-arguments-error"));
+            shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 0), ("upper", 1)));
             return;
         }
 
-        var looc = cfg.GetCVar(CCVars.LoocEnabled);
+        var looc = _configManager.GetCVar(CCVars.LoocEnabled);
 
         if (args.Length == 0)
         {
@@ -31,12 +30,12 @@ public sealed class SetLOOCCommand : IConsoleCommand
 
         if (args.Length == 1 && !bool.TryParse(args[0], out looc))
         {
-            shell.WriteError(Loc.GetString("set-looc-command-invalid-argument-error"));
+            shell.WriteError(Loc.GetString("shell-invalid-bool"));
             return;
         }
 
-        cfg.SetCVar(CCVars.LoocEnabled, looc);
+        _configManager.SetCVar(CCVars.LoocEnabled, looc);
 
-        shell.WriteLine(Loc.GetString(looc ? "set-looc-command-looc-enabled" : "set-looc-command-looc-disabled"));
+        shell.WriteLine(Loc.GetString(looc ? "cmd-setlooc-looc-enabled" : "cmd-setlooc-looc-disabled"));
     }
 }
diff --git a/Content.Server/Chat/Commands/SetOOCCommand.cs b/Content.Server/Chat/Commands/SetOOCCommand.cs
index d712a62401..46e7e84af4 100644
--- a/Content.Server/Chat/Commands/SetOOCCommand.cs
+++ b/Content.Server/Chat/Commands/SetOOCCommand.cs
@@ -7,22 +7,21 @@ using Robust.Shared.Console;
 namespace Content.Server.Chat.Commands;
 
 [AdminCommand(AdminFlags.Admin)]
-public sealed class SetOOCCommand : IConsoleCommand
+public sealed class SetOOCCommand : LocalizedCommands
 {
-    public string Command => "setooc";
-    public string Description => Loc.GetString("set-ooc-command-description");
-    public string Help => Loc.GetString("set-ooc-command-help");
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        var cfg = IoCManager.Resolve<IConfigurationManager>();
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
 
+    public override string Command => "setooc";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
         if (args.Length > 1)
         {
-            shell.WriteError(Loc.GetString("set-ooc-command-too-many-arguments-error"));
+            shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 0), ("upper", 1)));
             return;
         }
 
-        var ooc = cfg.GetCVar(CCVars.OocEnabled);
+        var ooc = _configManager.GetCVar(CCVars.OocEnabled);
 
         if (args.Length == 0)
         {
@@ -31,12 +30,12 @@ public sealed class SetOOCCommand : IConsoleCommand
 
         if (args.Length == 1 && !bool.TryParse(args[0], out ooc))
         {
-            shell.WriteError(Loc.GetString("set-ooc-command-invalid-argument-error"));
+            shell.WriteError(Loc.GetString("shell-invalid-bool"));
             return;
         }
 
-        cfg.SetCVar(CCVars.OocEnabled, ooc);
+        _configManager.SetCVar(CCVars.OocEnabled, ooc);
 
-        shell.WriteLine(Loc.GetString(ooc ? "set-ooc-command-ooc-enabled" : "set-ooc-command-ooc-disabled"));
+        shell.WriteLine(Loc.GetString(ooc ? "cmd-setooc-ooc-enabled" : "cmd-setooc-ooc-disabled"));
     }
 }
diff --git a/Content.Server/Chat/Commands/WhisperCommand.cs b/Content.Server/Chat/Commands/WhisperCommand.cs
index 13effa3446..0556dd8036 100644
--- a/Content.Server/Chat/Commands/WhisperCommand.cs
+++ b/Content.Server/Chat/Commands/WhisperCommand.cs
@@ -6,13 +6,12 @@ using Robust.Shared.Enums;
 namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
-    internal sealed class WhisperCommand : IConsoleCommand
+    internal sealed class WhisperCommand : LocalizedEntityCommands
     {
-        public string Command => "whisper";
-        public string Description => "Send chat messages to the local channel as a whisper";
-        public string Help => "whisper <text>";
+        [Dependency] private readonly ChatSystem _chatSystem = default!;
+        public override string Command => "whisper";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player is not { } player)
             {
@@ -25,7 +24,7 @@ namespace Content.Server.Chat.Commands
 
             if (player.AttachedEntity is not {} playerEntity)
             {
-                shell.WriteError("You don't have an entity!");
+                shell.WriteError(Loc.GetString($"shell-must-be-attached-to-entity"));
                 return;
             }
 
@@ -36,8 +35,7 @@ namespace Content.Server.Chat.Commands
             if (string.IsNullOrEmpty(message))
                 return;
 
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>()
-                .TrySendInGameICMessage(playerEntity, message, InGameICChatType.Whisper, ChatTransmitRange.Normal, false, shell, player);
+            _chatSystem.TrySendInGameICMessage(playerEntity, message, InGameICChatType.Whisper, ChatTransmitRange.Normal, false, shell, player);
         }
     }
 }
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index 88bed16973..19f691fc2a 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -12,112 +12,112 @@ namespace Content.Server.Chat.Managers;
 /// </summary>
 public sealed class ChatSanitizationManager : IChatSanitizationManager
 {
-    private static readonly Dictionary<string, string> ShorthandToEmote = new()
-    {
+    private static readonly (Regex regex, string emoteKey)[] ShorthandToEmote =
+    [
         // Russian-Localization-Start
-        { "хд", "chatsan-laughs" },
-        { "о-о", "chatsan-wide-eyed" }, // cyrillic о
-        { "о.о", "chatsan-wide-eyed" }, // cyrillic о
-        { "0_о", "chatsan-wide-eyed" }, // cyrillic о
-        { "о/", "chatsan-waves" }, // cyrillic о
-        { "о7", "chatsan-salutes" }, // cyrillic о
-        { "0_o", "chatsan-wide-eyed" },
-        { "лмао", "chatsan-laughs" },
-        { "рофл", "chatsan-laughs" },
-        { "яхз", "chatsan-shrugs" },
-        { ":0", "chatsan-surprised" },
-        { "кек", "chatsan-laughs" },
-        { "T_T", "chatsan-cries" },
-        { "Т_Т", "chatsan-cries" }, // cyrillic T
-        { "=_(", "chatsan-cries" },
-        { "!с", "chatsan-laughs" },
-        { "!в", "chatsan-sighs" },
-        { "!х", "chatsan-claps" },
-        { "!щ", "chatsan-snaps" },
-        { "))", "chatsan-smiles-widely" },
-        { ")", "chatsan-smiles" },
-        { "((", "chatsan-frowns-deeply" },
-        { "(", "chatsan-frowns" },
-        { "?", "" },
+        Entry( "хд", "chatsan-laughs" ),
+        Entry( "о-о", "chatsan-wide-eyed" ), // cyrillic о
+        Entry( "о.о", "chatsan-wide-eyed" ), // cyrillic о
+        Entry( "0_о", "chatsan-wide-eyed" ), // cyrillic о
+        Entry( "о/", "chatsan-waves" ), // cyrillic о
+        Entry( "о7", "chatsan-salutes" ), // cyrillic о
+        Entry( "0_o", "chatsan-wide-eyed" ),
+        Entry( "лмао", "chatsan-laughs" ),
+        Entry( "рофл", "chatsan-laughs" ),
+        Entry( "яхз", "chatsan-shrugs" ),
+        Entry( ":0", "chatsan-surprised" ),
+        Entry( "кек", "chatsan-laughs" ),
+        Entry( "T_T", "chatsan-cries" ),
+        Entry( "Т_Т", "chatsan-cries" ), // cyrillic T
+        Entry( "=_(", "chatsan-cries" ),
+        Entry( "!с", "chatsan-laughs" ),
+        Entry( "!в", "chatsan-sighs" ),
+        Entry( "!х", "chatsan-claps" ),
+        Entry( "!щ", "chatsan-snaps" ),
+        Entry( "))", "chatsan-smiles-widely" ),
+        Entry( ")", "chatsan-smiles" ),
+        Entry( "((", "chatsan-frowns-deeply" ),
+        Entry( "(", "chatsan-frowns" ),
+        Entry( "?", "" ),
         // Russian-Localization-End
-        { ":)", "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" }
-    };
+        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!;
@@ -151,21 +151,8 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         // -1 is just a canary for nothing found yet
         var lastEmoteIndex = -1;
 
-        foreach (var (shorthand, emoteKey) in ShorthandToEmote)
+        foreach (var (r, emoteKey) in ShorthandToEmote)
         {
-            // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
-            var escaped = Regex.Escape(shorthand);
-
-            // So there are 2 cases:
-            // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
-            //   Delete the word and the whitespace before
-            // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
-            //   Delete the word and the punctuation if it exists.
-            var pattern =
-                $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))";
-
-            var r = new Regex(pattern, RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
-
             // We're using sanitized as the original message until the end so that we can make sure the indices of
             // the emotes are accurate.
             var lastMatch = r.Match(sanitized);
@@ -185,4 +172,21 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         sanitized = message.Trim();
         return emote is not null;
     }
+
+    private static (Regex regex, string emoteKey) Entry(string shorthand, string emoteKey)
+    {
+        // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
+        var escaped = Regex.Escape(shorthand);
+
+        // So there are 2 cases:
+        // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
+        //   Delete the word and the whitespace before
+        // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
+        //   Delete the word and the punctuation if it exists.
+        var pattern = new Regex(
+            $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))",
+            RegexOptions.RightToLeft | RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+        return (pattern, emoteKey);
+    }
 }
diff --git a/Content.Server/Chat/SpeakOnTriggerComponent.cs b/Content.Server/Chat/SpeakOnTriggerComponent.cs
deleted file mode 100644
index d879cbf1bf..0000000000
--- a/Content.Server/Chat/SpeakOnTriggerComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Dataset;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chat;
-
-/// <summary>
-///     Makes the entity speak when triggered. If the item has UseDelay component, the system will respect that cooldown.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SpeakOnTriggerComponent : Component
-{
-    /// <summary>
-    ///     The identifier for the dataset prototype containing messages to be spoken by this entity.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<LocalizedDatasetPrototype> Pack = string.Empty;
-}
diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs
index b9a3ede2bd..dca2959f98 100644
--- a/Content.Server/Chat/SuicideSystem.cs
+++ b/Content.Server/Chat/SuicideSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Ghost;
+using Content.Server.Hands.Systems;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Content.Shared.Database;
-using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
@@ -22,6 +22,7 @@ public sealed class SuicideSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -50,7 +51,7 @@ public sealed class SuicideSystem : EntitySystem
         if (!TryComp<MobStateComponent>(victim, out var mobState) || _mobState.IsDead(victim, mobState))
             return false;
 
-        _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide");
+        _adminLogger.Add(LogType.Mind, $"{ToPrettyString(victim):player} is attempting to suicide");
 
         ICommonSession? session = null;
 
@@ -66,6 +67,9 @@ public sealed class SuicideSystem : EntitySystem
         if (!suicideGhostEvent.Handled || _tagSystem.HasTag(victim, CannotSuicideTag))
             return false;
 
+        // TODO: fix this
+        // This is a handled event, but the result is never used
+        // It looks like TriggerOnMobstateChange is supposed to prevent you from suiciding
         var suicideEvent = new SuicideEvent(victim);
         RaiseLocalEvent(victim, suicideEvent);
 
@@ -76,7 +80,7 @@ public sealed class SuicideSystem : EntitySystem
         }
         else
         {
-            _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided.");
+            _adminLogger.Add(LogType.Mind, $"{ToPrettyString(victim):player} suicided.");
         }
         return true;
     }
@@ -116,10 +120,9 @@ public sealed class SuicideSystem : EntitySystem
         var suicideByEnvironmentEvent = new SuicideByEnvironmentEvent(victim);
 
         // Try to suicide by raising an event on the held item
-        if (EntityManager.TryGetComponent(victim, out HandsComponent? handsComponent)
-            && handsComponent.ActiveHandEntity is { } item)
+        if (_hands.TryGetActiveItem(victim.Owner, out var item))
         {
-            RaiseLocalEvent(item, suicideByEnvironmentEvent);
+            RaiseLocalEvent(item.Value, suicideByEnvironmentEvent);
             if (suicideByEnvironmentEvent.Handled)
             {
                 args.Handled = suicideByEnvironmentEvent.Handled;
diff --git a/Content.Server/Chat/Systems/ChatNotificationSystem.cs b/Content.Server/Chat/Systems/ChatNotificationSystem.cs
new file mode 100644
index 0000000000..8cd3d54e80
--- /dev/null
+++ b/Content.Server/Chat/Systems/ChatNotificationSystem.cs
@@ -0,0 +1,105 @@
+using Content.Server.Chat.Managers;
+using Content.Shared.Chat;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Mind;
+using Content.Shared.Roles;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Chat.Systems;
+
+/// <summary>
+/// This system is used to notify specific players of the occurance of predefined events.
+/// </summary>
+public sealed partial class ChatNotificationSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IChatManager _chats = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
+
+    // The following data does not need to be saved
+
+    // Local cache for rate limiting chat notifications by source
+    // (Recipient, ChatNotification) -> Dictionary<Source, next allowed TOA>
+    private readonly Dictionary<(EntityUid, ProtoId<ChatNotificationPrototype>), Dictionary<EntityUid, TimeSpan>> _chatNotificationsBySource = new();
+
+    // Local cache for rate limiting chat notifications by type
+    // (Recipient, ChatNotification) -> next allowed TOA
+    private readonly Dictionary<(EntityUid, ProtoId<ChatNotificationPrototype>), TimeSpan> _chatNotificationsByType = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ActorComponent, ChatNotificationEvent>(OnChatNotification);
+
+        _sawmill = _logManager.GetSawmill("chatnotification");
+    }
+
+    /// <summary>
+    /// Triggered when the specified player recieves a chat notification event.
+    /// </summary>
+    /// <param name="ent">The player receiving the chat notification.</param>
+    /// <param name="args">The chat notification event</param>
+    public void OnChatNotification(Entity<ActorComponent> ent, ref ChatNotificationEvent args)
+    {
+        if (!_proto.TryIndex(args.ChatNotification, out var chatNotification))
+        {
+            _sawmill.Warning("Attempted to index ChatNotificationPrototype " + args.ChatNotification + " but the prototype does not exist.");
+            return;
+        }
+
+        var source = args.Source;
+        var playerNotification = (ent, args.ChatNotification);
+
+        // Exit without notifying the player if we received a notification before the appropriate time has elasped
+
+        if (chatNotification.NotifyBySource)
+        {
+            if (!_chatNotificationsBySource.TryGetValue(playerNotification, out var trackedSources))
+                trackedSources = new();
+
+            trackedSources.TryGetValue(source, out var timeSpan);
+            trackedSources[source] = _timing.CurTime + chatNotification.NextDelay;
+
+            _chatNotificationsBySource[playerNotification] = trackedSources;
+
+            if (_timing.CurTime < timeSpan)
+                return;
+        }
+        else
+        {
+            _chatNotificationsByType.TryGetValue(playerNotification, out var timeSpan);
+            _chatNotificationsByType[playerNotification] = _timing.CurTime + chatNotification.NextDelay;
+
+            if (_timing.CurTime < timeSpan)
+                return;
+        }
+
+        var sourceName = args.SourceNameOverride ?? Name(source);
+        var userName = args.UserNameOverride ?? (args.User.HasValue ? Name(args.User.Value) : string.Empty);
+        var targetName = Name(ent);
+
+        var message = Loc.GetString(chatNotification.Message, ("source", sourceName), ("user", userName), ("target", targetName));
+        var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
+
+        _chats.ChatMessageToOne(
+            ChatChannel.Notifications,
+            message,
+            wrappedMessage,
+            default,
+            false,
+            ent.Comp.PlayerSession.Channel,
+            colorOverride: chatNotification.Color
+        );
+
+        if (chatNotification.Sound != null && _mind.TryGetMind(ent, out var mindId, out _))
+            _roles.MindPlaySound(mindId, chatNotification.Sound);
+    }
+}
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 72f7bab0a2..0ec0ee62d5 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -1,4 +1,5 @@
 using System.Collections.Frozen;
+using Content.Server.Popups;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Emoting;
@@ -12,6 +13,8 @@ namespace Content.Server.Chat.Systems;
 // emotes using emote prototype
 public partial class ChatSystem
 {
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+
     private FrozenDictionary<string, EmotePrototype> _wordEmoteDict = FrozenDictionary<string, EmotePrototype>.Empty;
 
     protected override void OnPrototypeReload(PrototypesReloadedEventArgs obj)
@@ -53,7 +56,8 @@ public partial class ChatSystem
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
     /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
     /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
-    public void TryEmoteWithChat(
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithChat(
         EntityUid source,
         string emoteId,
         ChatTransmitRange range = ChatTransmitRange.Normal,
@@ -64,8 +68,8 @@ public partial class ChatSystem
         )
     {
         if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
-            return;
-        TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker, forceEmote: forceEmote);
+            return false;
+        return TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker, forceEmote: forceEmote);
     }
 
     /// <summary>
@@ -78,7 +82,8 @@ public partial class ChatSystem
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
     /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
     /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
-    public void TryEmoteWithChat(
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithChat(
         EntityUid source,
         EmotePrototype emote,
         ChatTransmitRange range = ChatTransmitRange.Normal,
@@ -86,10 +91,12 @@ public partial class ChatSystem
         string? nameOverride = null,
         bool ignoreActionBlocker = false,
         bool forceEmote = false
-        )
+    )
     {
         if (!forceEmote && !AllowedToUseEmote(source, emote))
-            return;
+            return false;
+
+        var didEmote = TryEmoteWithoutChat(source, emote, ignoreActionBlocker);
 
         // Sunrise-Start
         if (emote.Animation)
@@ -102,45 +109,38 @@ public partial class ChatSystem
         // Sunrise-End
 
         // check if proto has valid message for chat
-        if (emote.ChatMessages.Count != 0)
+        if (didEmote && emote.ChatMessages.Count != 0)
         {
             // not all emotes are loc'd, but for the ones that are we pass in entity
             var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source));
             SendEntityEmote(source, action, range, nameOverride, hideLog: hideLog, checkEmote: false, ignoreActionBlocker: ignoreActionBlocker);
         }
 
-        // Sunrise-Start
-        if (emote.PopupMessages.Count != 0)
-        {
-            var action = Loc.GetString(_random.Pick(emote.PopupMessages), ("entity", source));
-            _popupSystem.PopupEntity(action, source);
-        }
-        // Sunrise-End
-
-        // do the rest of emote event logic here
-        TryEmoteWithoutChat(source, emote, ignoreActionBlocker);
+        return didEmote;
     }
 
     /// <summary>
     ///     Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
     /// </summary>
-    public void TryEmoteWithoutChat(EntityUid uid, string emoteId, bool ignoreActionBlocker = false)
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithoutChat(EntityUid uid, string emoteId, bool ignoreActionBlocker = false)
     {
         if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
-            return;
+            return false;
 
-        TryEmoteWithoutChat(uid, proto, ignoreActionBlocker);
+        return TryEmoteWithoutChat(uid, proto, ignoreActionBlocker);
     }
 
     /// <summary>
     ///     Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
     /// </summary>
-    public void TryEmoteWithoutChat(EntityUid uid, EmotePrototype proto, bool ignoreActionBlocker = false)
+    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    public bool TryEmoteWithoutChat(EntityUid uid, EmotePrototype proto, bool ignoreActionBlocker = false)
     {
         if (!_actionBlocker.CanEmote(uid) && !ignoreActionBlocker)
-            return;
+            return false;
 
-        InvokeEmoteEvent(uid, proto);
+        return TryInvokeEmoteEvent(uid, proto);
     }
 
     /// <summary>
@@ -180,17 +180,17 @@ public partial class ChatSystem
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="textInput"></param>
-    private void TryEmoteChatInput(EntityUid uid, string textInput)
+    /// <returns>True if the chat message should be displayed (because the emote was explicitly cancelled), false if it should not be.</returns>
+    private bool TryEmoteChatInput(EntityUid uid, string textInput)
     {
         var actionTrimmedLower = TrimPunctuation(textInput.ToLower());
         if (!_wordEmoteDict.TryGetValue(actionTrimmedLower, out var emote))
-            return;
+            return true;
 
         if (!AllowedToUseEmote(uid, emote))
-            return;
+            return true;
 
-        InvokeEmoteEvent(uid, emote);
-        return;
+        return TryInvokeEmoteEvent(uid, emote);
 
         static string TrimPunctuation(string textInput)
         {
@@ -240,11 +240,50 @@ public partial class ChatSystem
         return true;
     }
 
-
-    private void InvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
+    /// <summary>
+    /// Creates and raises <see cref="BeforeEmoteEvent"/> and then <see cref="EmoteEvent"/> to let other systems do things like play audio.
+    /// In the case that the Before event is cancelled, EmoteEvent will NOT be raised, and will optionally show a message to the player
+    /// explaining why the emote didn't happen.
+    /// </summary>
+    /// <param name="uid">The entity which is emoting</param>
+    /// <param name="proto">The emote which is being performed</param>
+    /// <returns>True if the emote was performed, false otherwise.</returns>
+    private bool TryInvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
     {
+        var beforeEv = new BeforeEmoteEvent(uid, proto);
+        RaiseLocalEvent(uid, ref beforeEv);
+
+        if (beforeEv.Cancelled)
+        {
+            if (beforeEv.Blocker != null)
+            {
+                _popupSystem.PopupEntity(
+                    Loc.GetString(
+                        "chat-system-emote-cancelled-blocked",
+                        ("emote", Loc.GetString(proto.Name).ToLower()),
+                        ("blocker", beforeEv.Blocker.Value)
+                    ),
+                    uid,
+                    uid
+                );
+            }
+            else
+            {
+                _popupSystem.PopupEntity(
+                    Loc.GetString("chat-system-emote-cancelled-generic",
+                        ("emote", Loc.GetString(proto.Name).ToLower())),
+                    uid,
+                    uid
+                );
+            }
+
+            return false;
+        }
+
         var ev = new EmoteEvent(proto);
         RaiseLocalEvent(uid, ref ev);
+
+        return true;
     }
 }
 
@@ -253,9 +292,8 @@ public partial class ChatSystem
 ///     Use it to play sound, change sprite or something else.
 /// </summary>
 [ByRefEvent]
-public struct EmoteEvent
+public sealed class EmoteEvent : HandledEntityEventArgs
 {
-    public bool Handled;
     public readonly EmotePrototype Emote;
 
     public EmoteEvent(EmotePrototype emote)
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 81ca7b29d6..499a9ec440 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -9,7 +9,7 @@ using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Speech.Prototypes;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Station.Components;
+using Content.Server.Speech.Prototypes;
 using Content.Server.Station.Systems;
 using Content.Shared._Sunrise.Antags.Abductor;
 using Content.Shared._Sunrise.CollectiveMind;
@@ -26,6 +26,7 @@ using Content.Shared.Players;
 using Content.Shared.Players.RateLimiting;
 using Content.Shared.Popups;
 using Content.Shared.Radio;
+using Content.Shared.Station.Components;
 using Content.Shared.Whitelist;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
@@ -455,7 +456,7 @@ public sealed partial class ChatSystem : SharedChatSystem
             return;
         }
 
-        if (!EntityManager.TryGetComponent<StationDataComponent>(station, out var stationDataComp)) return;
+        if (!TryComp<StationDataComponent>(station, out var stationDataComp)) return;
 
         var filter = _stationSystem.GetInStation(stationDataComp);
 
@@ -682,7 +683,7 @@ public sealed partial class ChatSystem : SharedChatSystem
             if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
                 continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.
 
-            if (data.Range <= WhisperClearRange)
+            if (data.Range <= WhisperClearRange || data.Observer)
                 _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel);
             //If listener is too far, they only hear fragments of the message
             else if (_examineSystem.InRangeUnOccluded(source, listener, WhisperMuffledRange))
@@ -740,8 +741,9 @@ public sealed partial class ChatSystem : SharedChatSystem
             ("entity", ent),
             ("message", isFormatted ? action : FormattedMessage.RemoveMarkupOrThrow(action)));
 
-        if (checkEmote)
-            TryEmoteChatInput(source, action); // sunrise-start
+        if (checkEmote &&
+            !TryEmoteChatInput(source, action))
+            return;
 
         foreach (var (session, data) in GetRecipients(source, VoiceRange))
         {
@@ -973,8 +975,7 @@ public sealed partial class ChatSystem : SharedChatSystem
         return message;
     }
 
-    [ValidatePrototypeId<ReplacementAccentPrototype>]
-    public const string ChatSanitizeAccent = "chatsanitize_sunrise"; // Sunrise-Edit
+    public static readonly ProtoId<ReplacementAccentPrototype> ChatSanitize_Accent = "chatsanitize_sunrise"; // Sunrise-Edit
 
     public string SanitizeMessageReplaceWords(string message)
     {
diff --git a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
index 563708b8f3..a70c2196ab 100644
--- a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
+++ b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
@@ -7,32 +7,31 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Chemistry.Commands;
 
 [AdminCommand(AdminFlags.Debug)]
-public sealed class DumpReagentGuideText : IConsoleCommand
+public sealed class DumpReagentGuideText : LocalizedEntityCommands
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly IEntitySystemManager _entSys = default!;
 
-    public string Command => "dumpreagentguidetext";
-    public string Description => "Dumps the guidebook text for a reagent to the console";
-    public string Help => "dumpreagentguidetext <reagent>";
+    public override string Command => "dumpreagentguidetext";
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1)
         {
-            shell.WriteError("Must have only 1 argument");
+            shell.WriteError(Loc.GetString($"shell-need-exactly-one-argument"));
             return;
         }
 
         if (!_prototype.TryIndex<ReagentPrototype>(args[0], out var reagent))
         {
-            shell.WriteError($"Invalid prototype: {args[0]}");
+            shell.WriteError(Loc.GetString($"shell-argument-must-be-prototype",
+                ("index", args[0]),
+                ("prototype", nameof(ReagentPrototype))));
             return;
         }
 
         if (reagent.Metabolisms is null)
         {
-            shell.WriteLine("Nothing to dump.");
+            shell.WriteLine(Loc.GetString($"cmd-dumpreagentguidetext-nothing-to-dump"));
             return;
         }
 
@@ -40,7 +39,8 @@ public sealed class DumpReagentGuideText : IConsoleCommand
         {
             foreach (var effect in entry.Effects)
             {
-                shell.WriteLine(effect.GuidebookEffectDescription(_prototype, _entSys) ?? $"[skipped effect of type {effect.GetType()}]");
+                shell.WriteLine(effect.GuidebookEffectDescription(_prototype, EntityManager.EntitySysManager) ??
+                                Loc.GetString($"cmd-dumpreagentguidetext-skipped", ("effect", effect.GetType())));
             }
         }
     }
diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
index db6c9c5397..7dbf8e0d2a 100644
--- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
@@ -1,6 +1,6 @@
-using Content.Server.Animals.Systems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.Components;
 
@@ -19,19 +19,19 @@ public sealed partial class TransformableContainerComponent : Component
     /// It will revert to this when emptied.
     ///     /// It defaults to the description of the parent entity unless overwritten.
     /// </summary>
-    [DataField("initialDescription")]
+    [DataField]
     public string? InitialDescription;
+
     /// <summary>
     /// This stores whatever primary reagent is currently in the container.
     /// It is used to help determine if a transformation is needed on solution update.
     /// </summary>
-    [DataField("currentReagent")]
-    public ReagentPrototype? CurrentReagent;
+    [DataField]
+    public ProtoId<ReagentPrototype>? CurrentReagent;
 
     /// <summary>
     /// This returns whether this container in a transformed or initial state.
     /// </summary>
-    ///
-    [DataField("transformed")]
+    [DataField]
     public bool Transformed;
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index 08c3370e05..771451849a 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -41,8 +41,7 @@ namespace Content.Server.Chemistry.EntitySystems
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly TagSystem _tag = default!; //Starlight-edit
 
-        [ValidatePrototypeId<EntityPrototype>]
-        private const string PillPrototypeId = "Pill";
+        private static readonly EntProtoId PillPrototypeId = "Pill";
 
         //Starlight-start
         [ValidatePrototypeId<EntityPrototype>]
diff --git a/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs b/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs
index 4020a114c8..d4e03b0967 100644
--- a/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs
@@ -32,7 +32,7 @@ namespace Content.Server.Chemistry.EntitySystems.DeleteOnSolutionEmptySystem
 
             if (_solutionContainerSystem.TryGetSolution((entity.Owner, solutions), entity.Comp.Solution, out _, out var solution))
                 if (solution.Volume <= 0)
-                    EntityManager.QueueDeleteEntity(entity);
+                    QueueDel(entity);
         }
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index cc08bafba8..8dbbf61fb0 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -1,11 +1,10 @@
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Popups;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Body.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
@@ -196,12 +195,12 @@ public sealed class InjectorSystem : SharedInjectorSystem
             if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
             {
                 AdminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject {EntityManager.ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}");
+                    $"{ToPrettyString(user):user} is attempting to inject {ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}");
             }
             else
             {
                 AdminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from {EntityManager.ToPrettyString(target):target}");
+                    $"{ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from {ToPrettyString(target):target}");
             }
         }
         else
@@ -212,12 +211,12 @@ public sealed class InjectorSystem : SharedInjectorSystem
             if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
             {
                 AdminLogger.Add(LogType.Ingestion,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject themselves with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}.");
+                    $"{ToPrettyString(user):user} is attempting to inject themselves with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}.");
             }
             else
             {
                 AdminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
+                    $"{ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
             }
         }
 
@@ -257,7 +256,7 @@ public sealed class InjectorSystem : SharedInjectorSystem
         // Move units from attackSolution to targetSolution
         var removedSolution = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
 
-        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
+        _blood.TryAddToChemicals(target.AsNullable(), removedSolution);
 
         _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
 
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
index 74c23515ff..ee46cc776d 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Components;
 using Content.Server.Weapons.Ranged.Components;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
@@ -150,7 +150,7 @@ public sealed class SolutionInjectOnCollideSystem : EntitySystem
             // Take our portion of the adjusted solution for this target
             var individualInjection = solutionToInject.SplitSolution(volumePerBloodstream);
             // Inject our portion into the target's bloodstream
-            if (_bloodstream.TryAddToChemicals(targetBloodstream.Owner, individualInjection, targetBloodstream.Comp))
+            if (_bloodstream.TryAddToChemicals(targetBloodstream.AsNullable(), individualInjection))
                 anySuccess = true;
         }
 
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
deleted file mode 100644
index bccd594706..0000000000
--- a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed class SolutionRegenerationSystem : EntitySystem
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<SolutionRegenerationComponent, SolutionContainerManagerComponent>();
-        while (query.MoveNext(out var uid, out var regen, out var manager))
-        {
-            if (_timing.CurTime < regen.NextRegenTime)
-                continue;
-
-            // timer ignores if its full, it's just a fixed cycle
-            regen.NextRegenTime = _timing.CurTime + regen.Duration;
-            if (_solutionContainer.ResolveSolution((uid, manager), regen.SolutionName, ref regen.SolutionRef, out var solution))
-            {
-                var amount = FixedPoint2.Min(solution.AvailableVolume, regen.Generated.Volume);
-                if (amount <= FixedPoint2.Zero)
-                    continue;
-
-                // dont bother cloning and splitting if adding the whole thing
-                Solution generated;
-                if (amount == regen.Generated.Volume)
-                {
-                    generated = regen.Generated;
-                }
-                else
-                {
-                    generated = regen.Generated.Clone().SplitSolution(amount);
-                }
-
-                _solutionContainer.TryAddSolution(regen.SolutionRef.Value, generated);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
index 57875fc16a..48d547d1e0 100644
--- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
@@ -45,8 +45,8 @@ public sealed class TransformableContainerSystem : EntitySystem
         //the biggest reagent in the solution decides the appearance
         var reagentId = solution.GetPrimaryReagentId();
 
-        //If biggest reagent didn't changed - don't change anything at all
-        if (entity.Comp.CurrentReagent != null && entity.Comp.CurrentReagent.ID == reagentId?.Prototype)
+        //If biggest reagent didn't change - don't change anything at all
+        if (entity.Comp.CurrentReagent != null && entity.Comp.CurrentReagent == reagentId?.Prototype)
         {
             return;
         }
@@ -66,7 +66,7 @@ public sealed class TransformableContainerSystem : EntitySystem
 
     private void OnRefreshNameModifiers(Entity<TransformableContainerComponent> entity, ref RefreshNameModifiersEvent args)
     {
-        if (entity.Comp.CurrentReagent is { } currentReagent)
+        if (_prototypeManager.TryIndex(entity.Comp.CurrentReagent, out var currentReagent))
         {
             args.AddModifier("transformable-container-component-glass", priority: -1, ("reagent", currentReagent.LocalizedName));
         }
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 55489e0b31..a6725856ec 100644
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -39,7 +39,7 @@ namespace Content.Server.Chemistry.EntitySystems
 
         private void HandleCollide(Entity<VaporComponent> entity, ref StartCollideEvent args)
         {
-            if (!EntityManager.TryGetComponent(entity.Owner, out SolutionContainerManagerComponent? contents)) return;
+            if (!TryComp(entity.Owner, out SolutionContainerManagerComponent? contents)) return;
 
             foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((entity.Owner, contents)))
             {
@@ -50,7 +50,7 @@ namespace Content.Server.Chemistry.EntitySystems
             // Check for collision with a impassable object (e.g. wall) and stop
             if ((args.OtherFixture.CollisionLayer & (int)CollisionGroup.Impassable) != 0 && args.OtherFixture.Hard)
             {
-                EntityManager.QueueDeleteEntity(entity);
+                QueueDel(entity);
             }
         }
 
@@ -67,7 +67,7 @@ namespace Content.Server.Chemistry.EntitySystems
             despawn.Lifetime = aliveTime;
 
             // Set Move
-            if (EntityManager.TryGetComponent(vapor, out PhysicsComponent? physics))
+            if (TryComp(vapor, out PhysicsComponent? physics))
             {
                 _physics.SetLinearDamping(vapor, physics, 0f);
                 _physics.SetAngularDamping(vapor, physics, 0f);
@@ -156,7 +156,7 @@ namespace Content.Server.Chemistry.EntitySystems
 
                         // Delete the vapor entity if it has no contents
                         if (contents.Volume == 0)
-                            EntityManager.QueueDeleteEntity(uid);
+                            QueueDel(uid);
 
                     }
 
diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
index 0249b6255a..1499967a42 100644
--- a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
@@ -41,33 +41,33 @@ public sealed partial class CreateEntityTileReaction : ITileReaction
         IEntityManager entityManager,
         List<ReagentData>? data)
     {
-        if (reactVolume >= Usage)
+        if (reactVolume < Usage)
+            return FixedPoint2.Zero;
+
+        if (Whitelist != null)
         {
-            if (Whitelist != null)
+            var lookup = entityManager.System<EntityLookupSystem>();
+
+            int acc = 0;
+            foreach (var ent in lookup.GetEntitiesInTile(tile, LookupFlags.Static))
             {
-                int acc = 0;
-                foreach (var ent in tile.GetEntitiesInTile())
-                {
-                    var whitelistSystem = entityManager.System<EntityWhitelistSystem>();
-                    if (whitelistSystem.IsWhitelistPass(Whitelist, ent))
-                        acc += 1;
+                var whitelistSystem = entityManager.System<EntityWhitelistSystem>();
+                if (whitelistSystem.IsWhitelistPass(Whitelist, ent))
+                    acc += 1;
 
-                    if (acc >= MaxOnTile)
-                        return FixedPoint2.Zero;
-                }
+                if (acc >= MaxOnTile)
+                    return FixedPoint2.Zero;
             }
-
-            var random = IoCManager.Resolve<IRobustRandom>();
-            var xoffs = random.NextFloat(-RandomOffsetMax, RandomOffsetMax);
-            var yoffs = random.NextFloat(-RandomOffsetMax, RandomOffsetMax);
-
-            var center = entityManager.System<TurfSystem>().GetTileCenter(tile);
-            var pos = center.Offset(new Vector2(xoffs, yoffs));
-            entityManager.SpawnEntity(Entity, pos);
-
-            return Usage;
         }
 
-        return FixedPoint2.Zero;
+        var random = IoCManager.Resolve<IRobustRandom>();
+        var xoffs = random.NextFloat(-RandomOffsetMax, RandomOffsetMax);
+        var yoffs = random.NextFloat(-RandomOffsetMax, RandomOffsetMax);
+
+        var center = entityManager.System<TurfSystem>().GetTileCenter(tile);
+        var pos = center.Offset(new Vector2(xoffs, yoffs));
+        entityManager.SpawnEntity(Entity, pos);
+
+        return Usage;
     }
 }
diff --git a/Content.Server/Cloning/CloningPodSystem.cs b/Content.Server/Cloning/CloningPodSystem.cs
index 594c5ebbb6..588b0c75a5 100644
--- a/Content.Server/Cloning/CloningPodSystem.cs
+++ b/Content.Server/Cloning/CloningPodSystem.cs
@@ -80,7 +80,7 @@ public sealed class CloningPodSystem : EntitySystem
     internal void TransferMindToClone(EntityUid mindId, MindComponent mind)
     {
         if (!ClonesWaitingForMind.TryGetValue(mind, out var entity) ||
-            !EntityManager.EntityExists(entity) ||
+            !Exists(entity) ||
             !TryComp<MindContainerComponent>(entity, out var mindComp) ||
             mindComp.Mind != null)
             return;
@@ -93,11 +93,11 @@ public sealed class CloningPodSystem : EntitySystem
     private void HandleMindAdded(EntityUid uid, BeingClonedComponent clonedComponent, MindAddedMessage message)
     {
         if (clonedComponent.Parent == EntityUid.Invalid ||
-            !EntityManager.EntityExists(clonedComponent.Parent) ||
+            !Exists(clonedComponent.Parent) ||
             !TryComp<CloningPodComponent>(clonedComponent.Parent, out var cloningPodComponent) ||
             uid != cloningPodComponent.BodyContainer.ContainedEntity)
         {
-            EntityManager.RemoveComponent<BeingClonedComponent>(uid);
+            RemComp<BeingClonedComponent>(uid);
             return;
         }
         UpdateStatus(clonedComponent.Parent, CloningPodStatus.Cloning, cloningPodComponent);
@@ -139,7 +139,7 @@ public sealed class CloningPodSystem : EntitySystem
         var mind = mindEnt.Comp;
         if (ClonesWaitingForMind.TryGetValue(mind, out var clone))
         {
-            if (EntityManager.EntityExists(clone) &&
+            if (Exists(clone) &&
                 !_mobStateSystem.IsDead(clone) &&
                 TryComp<MindContainerComponent>(clone, out var cloneMindComp) &&
                 (cloneMindComp.Mind == null || cloneMindComp.Mind == mindEnt))
@@ -204,7 +204,7 @@ public sealed class CloningPodSystem : EntitySystem
             return false;
         }
 
-        var cloneMindReturn = EntityManager.AddComponent<BeingClonedComponent>(mob.Value);
+        var cloneMindReturn = AddComp<BeingClonedComponent>(mob.Value);
         cloneMindReturn.Mind = mind;
         cloneMindReturn.Parent = uid;
         _containerSystem.Insert(mob.Value, clonePod.BodyContainer);
@@ -272,7 +272,7 @@ public sealed class CloningPodSystem : EntitySystem
         if (clonePod.BodyContainer.ContainedEntity is not { Valid: true } entity || clonePod.CloningProgress < clonePod.CloningTime)
             return;
 
-        EntityManager.RemoveComponent<BeingClonedComponent>(entity);
+        RemComp<BeingClonedComponent>(entity);
         _containerSystem.Remove(entity, clonePod.BodyContainer);
         clonePod.CloningProgress = 0f;
         clonePod.UsedBiomass = 0;
diff --git a/Content.Server/Cloning/CloningSystem.Subscriptions.cs b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
index eba806ceb8..84ef050305 100644
--- a/Content.Server/Cloning/CloningSystem.Subscriptions.cs
+++ b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
@@ -1,11 +1,16 @@
 using Content.Server.Forensics;
+using Content.Server.Speech.EntitySystems;
 using Content.Shared.Cloning.Events;
-using Content.Shared.Clothing.Components;
 using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
 using Content.Shared.Labels.Components;
 using Content.Shared.Labels.EntitySystems;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Paper;
 using Content.Shared.Stacks;
+using Content.Shared.Speech.Components;
+using Content.Shared.Storage;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -13,47 +18,58 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Cloning;
 
 /// <summary>
-///     The part of item cloning responsible for copying over important components.
-///     This is used for <see cref="CopyItem"/>.
-///     Anything not copied over here gets reverted to the values the item had in its prototype.
+/// The part of item cloning responsible for copying over important components.
 /// </summary>
 /// <remarks>
-///     This method of copying items is of course not perfect as we cannot clone every single component, which would be pretty much impossible with our ECS.
-///     We only consider the most important components so the paradox clone gets similar equipment.
-///     This method of using subscriptions was chosen to make it easy for forks to add their own custom components that need to be copied.
+/// These are all not part of their corresponding systems because we don't want systems every system to depend on a CloningSystem namespace import, which is still heavily coupled to med code.
+/// TODO: Create a more generic "CopyEntity" method/event (probably in RT) that doesn't have this problem and then move all these subscriptions.
 /// </remarks>
-public sealed partial class CloningSystem : EntitySystem
+public sealed partial class CloningSystem
 {
     [Dependency] private readonly SharedStackSystem _stack = default!;
     [Dependency] private readonly LabelSystem _label = default!;
     [Dependency] private readonly ForensicsSystem _forensics = default!;
     [Dependency] private readonly PaperSystem _paper = default!;
+    [Dependency] private readonly VocalSystem _vocal = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<StackComponent, CloningItemEvent>(OnCloneStack);
-        SubscribeLocalEvent<LabelComponent, CloningItemEvent>(OnCloneLabel);
-        SubscribeLocalEvent<PaperComponent, CloningItemEvent>(OnClonePaper);
-        SubscribeLocalEvent<ForensicsComponent, CloningItemEvent>(OnCloneForensics);
-        SubscribeLocalEvent<StoreComponent, CloningItemEvent>(OnCloneStore);
+        // These are used for <see cref="CopyItem"/>.
+        // Anything not copied over here gets reverted to the values the item had in its prototype.
+        // This method of copying items is of course not perfect as we cannot clone every single component, which would be pretty much impossible with our ECS.
+        // We only consider the most important components so the paradox clone gets similar equipment.
+        // This method of using subscriptions was chosen to make it easy for forks to add their own custom components that need to be copied.
+        SubscribeLocalEvent<StackComponent, CloningItemEvent>(OnCloneItemStack);
+        SubscribeLocalEvent<LabelComponent, CloningItemEvent>(OnCloneItemLabel);
+        SubscribeLocalEvent<PaperComponent, CloningItemEvent>(OnCloneItemPaper);
+        SubscribeLocalEvent<ForensicsComponent, CloningItemEvent>(OnCloneItemForensics);
+        SubscribeLocalEvent<StoreComponent, CloningItemEvent>(OnCloneItemStore);
+
+        // These are for cloning components that cannot be cloned using CopyComp.
+        // Put them into CloningSettingsPrototype.EventComponents to have them be applied to the clone.
+        SubscribeLocalEvent<VocalComponent, CloningEvent>(OnCloneVocal);
+        SubscribeLocalEvent<StorageComponent, CloningEvent>(OnCloneStorage);
+        SubscribeLocalEvent<InventoryComponent, CloningEvent>(OnCloneInventory);
+        SubscribeLocalEvent<MovementSpeedModifierComponent, CloningEvent>(OnCloneInventory);
     }
 
-    private void OnCloneStack(Entity<StackComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemStack(Entity<StackComponent> ent, ref CloningItemEvent args)
     {
         // if the clone is a stack as well, adjust the count of the copy
         if (TryComp<StackComponent>(args.CloneUid, out var cloneStackComp))
             _stack.SetCount(args.CloneUid, ent.Comp.Count, cloneStackComp);
     }
 
-    private void OnCloneLabel(Entity<LabelComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemLabel(Entity<LabelComponent> ent, ref CloningItemEvent args)
     {
         // copy the label
         _label.Label(args.CloneUid, ent.Comp.CurrentLabel);
     }
 
-    private void OnClonePaper(Entity<PaperComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemPaper(Entity<PaperComponent> ent, ref CloningItemEvent args)
     {
         // copy the text and any stamps
         if (TryComp<PaperComponent>(args.CloneUid, out var clonePaperComp))
@@ -63,13 +79,13 @@ public sealed partial class CloningSystem : EntitySystem
         }
     }
 
-    private void OnCloneForensics(Entity<ForensicsComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemForensics(Entity<ForensicsComponent> ent, ref CloningItemEvent args)
     {
         // copy any forensics to the cloned item
         _forensics.CopyForensicsFrom(ent.Comp, args.CloneUid);
     }
 
-    private void OnCloneStore(Entity<StoreComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemStore(Entity<StoreComponent> ent, ref CloningItemEvent args)
     {
         // copy the current amount of currency in the store
         // at the moment this takes care of uplink implants and the portable nukie uplinks
@@ -80,4 +96,35 @@ public sealed partial class CloningSystem : EntitySystem
         }
     }
 
+    private void OnCloneVocal(Entity<VocalComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _vocal.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
+
+    private void OnCloneStorage(Entity<StorageComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _storage.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
+
+    private void OnCloneInventory(Entity<InventoryComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _inventory.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
+
+    private void OnCloneInventory(Entity<MovementSpeedModifierComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _movementSpeedModifier.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
 }
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index effbc2159e..b0d62be523 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -24,7 +24,7 @@ namespace Content.Server.Cloning;
 ///     System responsible for making a copy of a humanoid's body.
 ///     For the cloning machines themselves look at CloningPodSystem, CloningConsoleSystem and MedicalScannerSystem instead.
 /// </summary>
-public sealed partial class CloningSystem : EntitySystem
+public sealed partial class CloningSystem : SharedCloningSystem
 {
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
@@ -84,13 +84,7 @@ public sealed partial class CloningSystem : EntitySystem
         return true;
     }
 
-    /// <summary>
-    ///     Copy components from one entity to another based on a CloningSettingsPrototype.
-    /// </summary>
-    /// <param name="original">The orignal Entity to clone components from.</param>
-    /// <param name="clone">The target Entity to clone components to.</param>
-    /// <param name="settings">The clone settings prototype containing the list of components to clone.</param>
-    public void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings)
+    public override void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings)
     {
         var componentsToCopy = settings.Components;
         var componentsToEvent = settings.EventComponents;
@@ -128,7 +122,8 @@ public sealed partial class CloningSystem : EntitySystem
             }
 
             // If the original does not have the component, then the clone shouldn't have it either.
-            RemComp(clone, componentRegistration.Type);
+            if (!HasComp(original, componentRegistration.Type))
+                RemComp(clone, componentRegistration.Type);
         }
 
         var cloningEv = new CloningEvent(settings, clone);
@@ -175,7 +170,7 @@ public sealed partial class CloningSystem : EntitySystem
         if (prototype == null)
             return null;
 
-        var spawned = EntityManager.SpawnAtPosition(prototype, coords);
+        var spawned = SpawnAtPosition(prototype, coords);
 
         // copy over important component data
         var ev = new CloningItemEvent(spawned);
diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs
new file mode 100644
index 0000000000..c3fea28bcf
--- /dev/null
+++ b/Content.Server/Clothing/Systems/OutfitSystem.cs
@@ -0,0 +1,109 @@
+using Content.Server.Hands.Systems;
+using Content.Server.Preferences.Managers;
+using Content.Shared.Access.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Hands.Components;
+using Content.Shared.Humanoid;
+using Content.Shared.Inventory;
+using Content.Shared.PDA;
+using Content.Shared.Preferences;
+using Content.Shared.Preferences.Loadouts;
+using Content.Shared.Roles;
+using Content.Shared.Station;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Clothing.Systems;
+
+public sealed class OutfitSystem : EntitySystem
+{
+    [Dependency] private readonly IServerPreferencesManager _preferenceManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly HandsSystem _handSystem = default!;
+    [Dependency] private readonly InventorySystem _invSystem = default!;
+    [Dependency] private readonly SharedStationSpawningSystem _spawningSystem = default!;
+
+    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null)
+    {
+        if (!EntityManager.TryGetComponent(target, out InventoryComponent? inventoryComponent))
+            return false;
+
+        if (!_prototypeManager.TryIndex<StartingGearPrototype>(gear, out var startingGear))
+            return false;
+
+        HumanoidCharacterProfile? profile = null;
+        ICommonSession? session = null;
+        // Check if we are setting the outfit of a player to respect the preferences
+        if (EntityManager.TryGetComponent(target, out ActorComponent? actorComponent))
+        {
+            session = actorComponent.PlayerSession;
+            var userId = actorComponent.PlayerSession.UserId;
+            var prefs = _preferenceManager.GetPreferences(userId);
+            profile = prefs.SelectedCharacter as HumanoidCharacterProfile;
+        }
+
+        if (_invSystem.TryGetSlots(target, out var slots))
+        {
+            foreach (var slot in slots)
+            {
+                _invSystem.TryUnequip(target, slot.Name, true, true, false, inventoryComponent);
+                var gearStr = ((IEquipmentLoadout) startingGear).GetGear(slot.Name);
+                if (gearStr == string.Empty)
+                    continue;
+
+                var equipmentEntity = EntityManager.SpawnEntity(gearStr, EntityManager.GetComponent<TransformComponent>(target).Coordinates);
+                if (slot.Name == "id" &&
+                    EntityManager.TryGetComponent(equipmentEntity, out PdaComponent? pdaComponent) &&
+                    EntityManager.TryGetComponent<IdCardComponent>(pdaComponent.ContainedId, out var id))
+                {
+                    id.FullName = EntityManager.GetComponent<MetaDataComponent>(target).EntityName;
+                }
+
+                _invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent);
+
+                onEquipped?.Invoke(target, equipmentEntity);
+            }
+        }
+
+        if (EntityManager.TryGetComponent(target, out HandsComponent? handsComponent))
+        {
+            var coords = EntityManager.GetComponent<TransformComponent>(target).Coordinates;
+            foreach (var prototype in startingGear.Inhand)
+            {
+                var inhandEntity = EntityManager.SpawnEntity(prototype, coords);
+                _handSystem.TryPickup(target, inhandEntity, checkActionBlocker: false, handsComp: handsComponent);
+            }
+        }
+
+        // See if this starting gear is associated with a job
+        var jobs = _prototypeManager.EnumeratePrototypes<JobPrototype>();
+        foreach (var job in jobs)
+        {
+            if (job.StartingGear != gear)
+                continue;
+
+            var jobProtoId = LoadoutSystem.GetJobPrototype(job.ID);
+            if (!_prototypeManager.TryIndex<RoleLoadoutPrototype>(jobProtoId, out var jobProto))
+                break;
+
+            // Don't require a player, so this works on Urists
+            profile ??= EntityManager.TryGetComponent<HumanoidAppearanceComponent>(target, out var comp)
+                ? HumanoidCharacterProfile.DefaultWithSpecies(comp.Species)
+                : new HumanoidCharacterProfile();
+            // Try to get the user's existing loadout for the role
+            profile.Loadouts.TryGetValue(jobProtoId, out var roleLoadout);
+
+            if (roleLoadout == null)
+            {
+                // If they don't have a loadout for the role, make a default one
+                roleLoadout = new RoleLoadout(jobProtoId);
+                roleLoadout.SetDefault(profile, session, _prototypeManager);
+            }
+
+            // Equip the target with the job loadout
+            _spawningSystem.EquipRoleLoadout(target, roleLoadout, jobProto);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 1fbb0c7269..21a15d812f 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Administration.Commands;
 using Content.Server.Popups;
 using Content.Shared.Popups;
 using Content.Shared.Mobs;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
+using Content.Server.Clothing.Systems;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Random;
 using Content.Shared.Stunnable;
@@ -13,7 +13,6 @@ using Robust.Shared.Prototypes;
 using Content.Server.Emoting.Systems;
 using Content.Server.Speech.EntitySystems;
 using Content.Shared.Cluwne;
-using Content.Shared.Interaction.Components;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Clumsy;
@@ -22,6 +21,8 @@ namespace Content.Server.Cluwne;
 
 public sealed class CluwneSystem : EntitySystem
 {
+    private static readonly ProtoId<DamageGroupPrototype> GeneticDamageGroup = "Genetic";
+
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -31,6 +32,7 @@ public sealed class CluwneSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
     [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly OutfitSystem _outfitSystem = default!;
 
     public override void Initialize()
     {
@@ -53,7 +55,7 @@ public sealed class CluwneSystem : EntitySystem
             RemComp<CluwneComponent>(uid);
             RemComp<ClumsyComponent>(uid);
             RemComp<AutoEmoteComponent>(uid);
-            var damageSpec = new DamageSpecifier(_prototypeManager.Index<DamageGroupPrototype>("Genetic"), 300);
+            var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300);
             _damageableSystem.TryChangeDamage(uid, damageSpec);
         }
     }
@@ -78,7 +80,7 @@ public sealed class CluwneSystem : EntitySystem
 
         _nameMod.RefreshNameModifiers(uid);
 
-        SetOutfitCommand.SetOutfit(uid, "CluwneGear", EntityManager);
+        _outfitSystem.SetOutfit(uid, "CluwneGear");
     }
 
     /// <summary>
@@ -99,7 +101,7 @@ public sealed class CluwneSystem : EntitySystem
         else if (_robustRandom.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/Codewords/CodewordSystem.cs b/Content.Server/Codewords/CodewordSystem.cs
index 54f0e936b4..bd655e61d0 100644
--- a/Content.Server/Codewords/CodewordSystem.cs
+++ b/Content.Server/Codewords/CodewordSystem.cs
@@ -56,7 +56,7 @@ public sealed class CodewordSystem : EntitySystem
         var factionProto = _prototypeManager.Index<CodewordFactionPrototype>(faction.Id);
 
         var codewords = GenerateCodewords(factionProto.Generator);
-        var codewordsContainer = EntityManager.Spawn(protoName:null, MapCoordinates.Nullspace);
+        var codewordsContainer = Spawn(prototype: null, MapCoordinates.Nullspace);
         EnsureComp<CodewordComponent>(codewordsContainer)
             .Codewords = codewords;
         manager.Codewords[faction] = codewordsContainer;
diff --git a/Content.Server/Commands/ContentCompletionHelper.cs b/Content.Server/Commands/ContentCompletionHelper.cs
index f843d84a62..bc80b28762 100644
--- a/Content.Server/Commands/ContentCompletionHelper.cs
+++ b/Content.Server/Commands/ContentCompletionHelper.cs
@@ -1,4 +1,4 @@
-using Content.Server.Station.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.Console;
 
 namespace Content.Server.Commands;
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 394c229091..21ab244d66 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -43,7 +43,6 @@ namespace Content.Server.Communications
         {
             // 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 @@ namespace Content.Server.Communications
         public void OnCommunicationsConsoleMapInit(EntityUid uid, CommunicationsConsoleComponent comp, MapInitEvent args)
         {
             comp.AnnouncementCooldownRemaining = comp.InitialDelay;
+            UpdateCommsConsoleInterface(uid, comp);
         }
 
         /// <summary>
diff --git a/Content.Server/Construction/Commands/TileWallsCommand.cs b/Content.Server/Construction/Commands/TileWallsCommand.cs
index a27caec423..ca87795b06 100644
--- a/Content.Server/Construction/Commands/TileWallsCommand.cs
+++ b/Content.Server/Construction/Commands/TileWallsCommand.cs
@@ -6,6 +6,7 @@ using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Construction.Commands;
 
@@ -20,12 +21,9 @@ public sealed class TileWallsCommand : IConsoleCommand
     public string Description => "Puts an underplating tile below every wall on a grid.";
     public string Help => $"Usage: {Command} <gridId> | {Command}";
 
-    [ValidatePrototypeId<ContentTileDefinition>]
-    public const string TilePrototypeId = "Plating";
-
-    [ValidatePrototypeId<TagPrototype>]
-    public const string WallTag = "Wall";
-    public const string DiagonalTag = "Diagonal";
+    public static readonly ProtoId<ContentTileDefinition> TilePrototypeId = "Plating";
+    public static readonly ProtoId<TagPrototype> WallTag = "Wall";
+    public static readonly ProtoId<TagPrototype> DiagonalTag = "Diagonal";
 
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs
index 429c4fdabf..6af8c36e24 100644
--- a/Content.Server/Construction/Conditions/ComponentInTile.cs
+++ b/Content.Server/Construction/Conditions/ComponentInTile.cs
@@ -58,9 +58,7 @@ namespace Content.Server.Construction.Conditions
             if (!entityManager.System<SharedMapSystem>().TryGetTileRef(transform.GridUid.Value, grid, indices, out var tile))
                 return !HasEntity;
 
-            var entities = tile.GetEntitiesInTile(LookupFlags.Approximate | LookupFlags.Static, lookup);
-
-            foreach (var ent in entities)
+            foreach (var ent in lookup.GetEntitiesInTile(tile, flags: LookupFlags.Approximate | LookupFlags.Static))
             {
                 if (entityManager.HasComponent(ent, type))
                     return HasEntity;
diff --git a/Content.Server/Construction/ConstructionSystem.Computer.cs b/Content.Server/Construction/ConstructionSystem.Computer.cs
index 6951d44b4d..a35491ca10 100644
--- a/Content.Server/Construction/ConstructionSystem.Computer.cs
+++ b/Content.Server/Construction/ConstructionSystem.Computer.cs
@@ -60,7 +60,7 @@ public sealed partial class ConstructionSystem
         if (container.ContainedEntities.Count != 0)
             return;
 
-        var board = EntityManager.SpawnEntity(component.BoardPrototype, Transform(ent).Coordinates);
+        var board = Spawn(component.BoardPrototype, Transform(ent).Coordinates);
 
         if (!_container.Insert(board, container))
             Log.Warning($"Couldn't insert board {board} to computer {ent}!");
diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs
index 7d4dd6153d..a3f3bcc42a 100644
--- a/Content.Server/Construction/ConstructionSystem.Graph.cs
+++ b/Content.Server/Construction/ConstructionSystem.Graph.cs
@@ -325,7 +325,7 @@ namespace Content.Server.Construction
             var newUid = EntityManager.CreateEntityUninitialized(newEntity, transform.Coordinates);
 
             // Construction transferring.
-            var newConstruction = EntityManager.EnsureComponent<ConstructionComponent>(newUid);
+            var newConstruction = EnsureComp<ConstructionComponent>(newUid);
 
             // Transfer all construction-owned containers.
             newConstruction.Containers.UnionWith(construction.Containers);
@@ -372,7 +372,7 @@ namespace Content.Server.Construction
             if (containerManager != null)
             {
                 // Ensure the new entity has a container manager. Also for resolve goodness.
-                var newContainerManager = EntityManager.EnsureComponent<ContainerManagerComponent>(newUid);
+                var newContainerManager = EnsureComp<ContainerManagerComponent>(newUid);
 
                 // Transfer all construction-owned containers from the old entity to the new one.
                 foreach (var container in construction.Containers)
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 3d29baec10..c783eda798 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -70,7 +70,7 @@ namespace Content.Server.Construction
                     if(!containerSlot.ContainedEntity.HasValue)
                         continue;
 
-                    if (EntityManager.TryGetComponent(containerSlot.ContainedEntity.Value, out StorageComponent? storage))
+                    if (TryComp(containerSlot.ContainedEntity.Value, out StorageComponent? storage))
                     {
                         foreach (var storedEntity in storage.Container.ContainedEntities)
                         {
@@ -271,7 +271,7 @@ namespace Content.Server.Construction
             }
 
             var newEntityProto = graph.Nodes[edge.Target].Entity.GetId(null, user, new(EntityManager));
-            var newEntity = EntityManager.SpawnAttachedTo(newEntityProto, coords, rotation: angle);
+            var newEntity = SpawnAttachedTo(newEntityProto, coords, rotation: angle);
 
             if (!TryComp(newEntity, out ConstructionComponent? construction))
             {
@@ -485,7 +485,7 @@ namespace Content.Server.Construction
             }
 
             if (!_actionBlocker.CanInteract(user, null)
-                || !EntityManager.TryGetComponent(user, out HandsComponent? hands) || hands.ActiveHandEntity == null)
+                || !TryComp(user, out HandsComponent? hands) || _handsSystem.GetActiveItem((user, hands)) == null)
             {
                 Cleanup();
                 return;
@@ -510,7 +510,7 @@ namespace Content.Server.Construction
 
             var valid = false;
 
-            if (hands.ActiveHandEntity is not {Valid: true} holding)
+            if (_handsSystem.GetActiveItem((user, hands)) is not {Valid: true} holding)
             {
                 Cleanup();
                 return;
diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
index 343143b9bd..fa031038d3 100644
--- a/Content.Server/Construction/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -41,13 +41,13 @@ namespace Content.Server.Construction
             var construction = ent.Comp;
             if (GetCurrentGraph(ent, construction) is not {} graph)
             {
-                Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
+                Log.Warning($"Prototype {Comp<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
                 return;
             }
 
             if (GetNodeFromGraph(graph, construction.Node) is not {} node)
             {
-                Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid node specified.");
+                Log.Warning($"Prototype {Comp<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid node specified.");
                 return;
             }
 
@@ -56,7 +56,7 @@ namespace Content.Server.Construction
             {
                 if (GetEdgeFromNode(node, edgeIndex) is not {} currentEdge)
                 {
-                    Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
+                    Log.Warning($"Prototype {Comp<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
                     return;
                 }
 
@@ -67,7 +67,7 @@ namespace Content.Server.Construction
             {
                 if (GetNodeFromGraph(graph, targetNodeId) is not { } targetNode)
                 {
-                    Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
+                    Log.Warning($"Prototype {Comp<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
                     return;
                 }
 
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 88d5aedd80..d2ffc038af 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -9,13 +9,13 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <NoWarn>1998</NoWarn>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Discord.Net" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="NetCord" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index f2597cd424..f3abc2bf7a 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -76,7 +76,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
         component.Charges--;
         Dirty(uid, component);
 
-        _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
+        _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
         args.Handled = true;
 
         if (component.DeleteEmpty && component.Charges <= 0)
@@ -143,6 +143,6 @@ public sealed class CrayonSystem : SharedCrayonSystem
     private void UseUpCrayon(EntityUid uid, EntityUid user)
     {
         _popup.PopupEntity(Loc.GetString("crayon-interact-used-up-text", ("owner", uid)), user, user);
-        EntityManager.QueueDeleteEntity(uid);
+        QueueDel(uid);
     }
 }
diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 63971a6884..7e944d3c0f 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.EUI;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationRecords;
 using Content.Server.StationRecords.Systems;
@@ -11,13 +10,13 @@ using Content.Shared.CCVar;
 using Content.Shared.CrewManifest;
 using Content.Shared.GameTicking;
 using Content.Shared.Roles;
+using Content.Shared.Station.Components;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.StationRecords;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Server.CrewManifest;
 
@@ -292,56 +291,45 @@ public sealed class CrewManifestSystem : EntitySystem
 }
 
 [AdminCommand(AdminFlags.Admin)]
-public sealed class CrewManifestCommand : IConsoleCommand
+public sealed class CrewManifestCommand : LocalizedEntityCommands
 {
-    public string Command => "crewmanifest";
-    public string Description => "Opens the crew manifest for the given station.";
-    public string Help => $"Usage: {Command} <entity uid>";
+    [Dependency] private readonly CrewManifestSystem _manifestSystem = default!;
 
-    [Dependency] private readonly IEntityManager _entityManager = default!;
+    public override string Command => "crewmanifest";
 
-    public CrewManifestCommand()
-    {
-        IoCManager.InjectDependencies(this);
-    }
-
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1)
         {
-            shell.WriteLine($"Invalid argument count.\n{Help}");
+            shell.WriteLine(Loc.GetString($"shell-need-exactly-one-argument"));
             return;
         }
 
-        if (!NetEntity.TryParse(args[0], out var uidNet) || !_entityManager.TryGetEntity(uidNet, out var uid))
+        if (!NetEntity.TryParse(args[0], out var uidNet) || !EntityManager.TryGetEntity(uidNet, out var uid))
         {
-            shell.WriteLine($"{args[0]} is not a valid entity UID.");
+            shell.WriteLine(Loc.GetString($"shell-argument-station-id-invalid", ("index", args[0])));
             return;
         }
 
-        if (shell.Player == null || shell.Player is not { } session)
+        if (shell.Player is not { } session)
         {
-            shell.WriteLine("You must run this from a client.");
+            shell.WriteLine(Loc.GetString($"shell-cannot-run-command-from-server"));
             return;
         }
 
-        var crewManifestSystem = _entityManager.System<CrewManifestSystem>();
-
-        crewManifestSystem.OpenEui(uid.Value, session);
+        _manifestSystem.OpenEui(uid.Value, session);
     }
 
-    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         if (args.Length != 1)
-        {
             return CompletionResult.Empty;
-        }
 
         var stations = new List<CompletionOption>();
-        var query = _entityManager.EntityQueryEnumerator<StationDataComponent>();
+        var query = EntityManager.EntityQueryEnumerator<StationDataComponent>();
         while (query.MoveNext(out var uid, out _))
         {
-            var meta = _entityManager.GetComponent<MetaDataComponent>(uid);
+            var meta = EntityManager.GetComponent<MetaDataComponent>(uid);
             stations.Add(new CompletionOption(uid.ToString(), meta.EntityName));
         }
 
diff --git a/Content.Server/Damage/Components/ExaminableDamageComponent.cs b/Content.Server/Damage/Components/ExaminableDamageComponent.cs
index 46a86012ad..26e9e40692 100644
--- a/Content.Server/Damage/Components/ExaminableDamageComponent.cs
+++ b/Content.Server/Damage/Components/ExaminableDamageComponent.cs
@@ -1,16 +1,18 @@
-using Content.Shared.Damage.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Damage.Components;
 
 /// <summary>
-///     This component shows entity damage severity when it is examined by player.
+/// This component shows entity damage severity when it is examined by player.
 /// </summary>
 [RegisterComponent]
 public sealed partial class ExaminableDamageComponent : Component
 {
-    [DataField("messages", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<ExaminableDamagePrototype>))]
-    public string? MessagesProtoId;
-
-    public ExaminableDamagePrototype? MessagesProto;
+    /// <summary>
+    /// ID of the <see cref="LocalizedDatasetPrototype"/> containing messages to display a different damage levels.
+    /// The first message will be used at 0 damage with the others equally distributed across the range from undamaged to fully damaged.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? Messages;
 }
diff --git a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
index 5980455e49..8c0e0a1382 100644
--- a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
@@ -31,7 +31,7 @@ namespace Content.Server.Damage.Systems
                 return;
 
             if (component.WeldingDamage is {} weldingDamage
-            && EntityManager.TryGetComponent(args.Used, out WelderComponent? welder)
+            && TryComp(args.Used, out WelderComponent? welder)
             && itemToggle.Activated
             && !welder.TankSafe)
             {
diff --git a/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs b/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
deleted file mode 100644
index 8a0ee51076..0000000000
--- a/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
-
-namespace Content.Server.Damage.Systems;
-
-// System for damage that occurs on specific trigger, towards the user..
-public sealed class DamageUserOnTriggerSystem : EntitySystem
-{
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<DamageUserOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(EntityUid uid, DamageUserOnTriggerComponent component, TriggerEvent args)
-    {
-        if (args.User is null)
-            return;
-
-        args.Handled |= OnDamageTrigger(uid, args.User.Value, component);
-    }
-
-    private bool OnDamageTrigger(EntityUid source, EntityUid target, DamageUserOnTriggerComponent? component = null)
-    {
-        if (!Resolve(source, ref component))
-        {
-            return false;
-        }
-
-        var damage = new DamageSpecifier(component.Damage);
-        var ev = new BeforeDamageUserOnTriggerEvent(damage, target);
-        RaiseLocalEvent(source, ev);
-
-        return _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: source) is not null;
-    }
-}
-
-public sealed class BeforeDamageUserOnTriggerEvent : EntityEventArgs
-{
-    public DamageSpecifier Damage { get; set;  }
-    public EntityUid Tripper { get; }
-
-    public BeforeDamageUserOnTriggerEvent(DamageSpecifier damage, EntityUid target)
-    {
-        Damage = damage;
-        Tripper = target;
-    }
-}
diff --git a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
index c80e19a53d..155cf08962 100644
--- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
+++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
@@ -1,9 +1,6 @@
-using System.Linq;
-using Content.Server.Damage.Components;
+using Content.Server.Damage.Components;
 using Content.Server.Destructible;
-using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Examine;
 using Content.Shared.Rounding;
 using Robust.Shared.Prototypes;
@@ -12,59 +9,42 @@ namespace Content.Server.Damage.Systems;
 
 public sealed class ExaminableDamageSystem : EntitySystem
 {
+    [Dependency] private readonly DestructibleSystem _destructible = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<ExaminableDamageComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<ExaminableDamageComponent, ExaminedEvent>(OnExamine);
     }
 
-    private void OnInit(EntityUid uid, ExaminableDamageComponent component, ComponentInit args)
+    private void OnExamine(Entity<ExaminableDamageComponent> ent, ref ExaminedEvent args)
     {
-        if (component.MessagesProtoId == null)
+        if (!_prototype.TryIndex(ent.Comp.Messages, out var proto) || proto.Values.Count == 0)
             return;
-        component.MessagesProto = _prototype.Index<ExaminableDamagePrototype>(component.MessagesProtoId);
+
+        var percent = GetDamagePercent(ent);
+        var level = ContentHelpers.RoundToNearestLevels(percent, 1, proto.Values.Count - 1);
+        var msg = Loc.GetString(proto.Values[level]);
+        args.PushMarkup(msg, -99);
     }
 
-    private void OnExamine(EntityUid uid, ExaminableDamageComponent component, ExaminedEvent args)
+    /// <summary>
+    /// Returns a value between 0 and 1 representing how damaged the entity is,
+    /// where 0 is undamaged and 1 is fully damaged.
+    /// </summary>
+    /// <returns>How damaged the entity is from 0 to 1</returns>
+    private float GetDamagePercent(Entity<ExaminableDamageComponent> ent)
     {
-        if (component.MessagesProto == null)
-            return;
-
-        var messages = component.MessagesProto.Messages;
-        if (messages.Length == 0)
-            return;
-
-        var level = GetDamageLevel(uid, component);
-        var msg = Loc.GetString(messages[level]);
-        args.PushMarkup(msg,-99);
-    }
-
-    private int GetDamageLevel(EntityUid uid, ExaminableDamageComponent? component = null,
-        DamageableComponent? damageable = null, DestructibleComponent? destructible = null)
-    {
-        if (!Resolve(uid, ref component, ref damageable, ref destructible))
-            return 0;
-
-        if (component.MessagesProto == null)
-            return 0;
-
-        var maxLevels = component.MessagesProto.Messages.Length - 1;
-        if (maxLevels <= 0)
-            return 0;
-
-        var trigger = (DamageTrigger?) destructible.Thresholds
-            .LastOrDefault(threshold => threshold.Trigger is DamageTrigger)?.Trigger;
-        if (trigger == null)
+        if (!TryComp<DamageableComponent>(ent, out var damageable))
             return 0;
 
         var damage = damageable.TotalDamage;
-        var damageThreshold = trigger.Damage;
-        var fraction = damageThreshold == 0 ? 0f : (float) damage / damageThreshold;
+        var damageThreshold = _destructible.DestroyedAt(ent);
 
-        var level = ContentHelpers.RoundToNearestLevels(fraction, 1, maxLevels);
-        return level;
+        if (damageThreshold == 0)
+            return 0;
+
+        return (damage / damageThreshold).Float();
     }
 }
diff --git a/Content.Server/Decals/Commands/AddDecalCommand.cs b/Content.Server/Decals/Commands/AddDecalCommand.cs
index 2d9c5a1b25..e7463ff9cb 100644
--- a/Content.Server/Decals/Commands/AddDecalCommand.cs
+++ b/Content.Server/Decals/Commands/AddDecalCommand.cs
@@ -54,8 +54,9 @@ namespace Content.Server.Decals.Commands
             }
 
             var mapSystem = _entManager.System<MapSystem>();
+            var turfSystem = _entManager.System<TurfSystem>();
             var coordinates = new EntityCoordinates(gridIdRaw.Value, new Vector2(x, y));
-            if (mapSystem.GetTileRef(gridIdRaw.Value, grid, coordinates).IsSpace())
+            if (turfSystem.IsSpace(mapSystem.GetTileRef(gridIdRaw.Value, grid, coordinates)))
             {
                 shell.WriteError($"Cannot create decal on space tile at {coordinates}.");
                 return;
diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index 690d24c2e4..bc77900df7 100644
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -29,7 +29,6 @@ namespace Content.Server.Decals
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
-        [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
         [Dependency] private readonly IParallelManager _parMan = default!;
         [Dependency] private readonly ChunkingSystem _chunking = default!;
         [Dependency] private readonly IConfigurationManager _conf = default!;
@@ -37,6 +36,7 @@ namespace Content.Server.Decals
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedMapSystem _mapSystem = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
+        [Dependency] private readonly TurfSystem _turf = default!;
 
         private readonly Dictionary<NetEntity, HashSet<Vector2i>> _dirtyChunks = new();
         private readonly Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> _previousSentChunks = new();
@@ -167,7 +167,7 @@ namespace Content.Server.Decals
 
             foreach (var change in args.Changes)
             {
-                if (!change.NewTile.IsSpace(_tileDefMan))
+                if (!_turf.IsSpace(change.NewTile))
                     continue;
 
                 var indices = GetChunkIndices(change.GridIndices);
@@ -308,7 +308,7 @@ namespace Content.Server.Decals
             if (!TryComp(gridId, out MapGridComponent? grid))
                 return false;
 
-            if (_mapSystem.GetTileRef(gridId.Value, grid, coordinates).IsSpace(_tileDefMan))
+            if (_turf.IsSpace(_mapSystem.GetTileRef(gridId.Value, grid, coordinates)))
                 return false;
 
             if (!TryComp(gridId, out DecalGridComponent? comp))
diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs
index 1e9caece94..5c589d2131 100644
--- a/Content.Server/Defusable/Systems/DefusableSystem.cs
+++ b/Content.Server/Defusable/Systems/DefusableSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Defusable.Components;
-using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Wires;
@@ -8,13 +7,13 @@ using Content.Shared.Construction.Components;
 using Content.Shared.Database;
 using Content.Shared.Defusable;
 using Content.Shared.Examine;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Popups;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Defusable.Systems;
@@ -74,12 +73,13 @@ public sealed class DefusableSystem : SharedDefusableSystem
             {
                 args.PushMarkup(Loc.GetString("defusable-examine-defused", ("name", uid)));
             }
-            else if (comp.Activated && TryComp<ActiveTimerTriggerComponent>(uid, out var activeComp))
+            else if (comp.Activated)
             {
-                if (comp.DisplayTime)
+                var remaining = _trigger.GetRemainingTime(uid);
+                if (comp.DisplayTime && remaining != null)
                 {
                     args.PushMarkup(Loc.GetString("defusable-examine-live", ("name", uid),
-                        ("time", MathF.Floor(activeComp.TimeRemaining))));
+                        ("time", Math.Floor(remaining.Value.TotalSeconds))));
                 }
                 else
                 {
@@ -139,16 +139,9 @@ public sealed class DefusableSystem : SharedDefusableSystem
         SetActivated(comp, true);
 
         _popup.PopupEntity(Loc.GetString("defusable-popup-begun", ("name", uid)), uid);
-        if (TryComp<OnUseTimerTriggerComponent>(uid, out var timerTrigger))
+        if (TryComp<TimerTriggerComponent>(uid, out var timerTrigger))
         {
-            _trigger.HandleTimerTrigger(
-                uid,
-                user,
-                timerTrigger.Delay,
-                timerTrigger.BeepInterval,
-                timerTrigger.InitialBeepDelay,
-                timerTrigger.BeepSound
-            );
+            _trigger.ActivateTimerTrigger((uid, timerTrigger));
         }
 
         RaiseLocalEvent(uid, new BombArmedEvent(uid));
@@ -168,7 +161,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
 
         RaiseLocalEvent(uid, new BombDetonatedEvent(uid));
 
-        _explosion.TriggerExplosive(uid, user:detonator);
+        _explosion.TriggerExplosive(uid, user: detonator);
         QueueDel(uid);
 
         _appearance.SetData(uid, DefusableVisuals.Active, comp.Activated);
@@ -188,7 +181,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         {
             SetUsable(comp, false);
             RemComp<ExplodeOnTriggerComponent>(uid);
-            RemComp<OnUseTimerTriggerComponent>(uid);
+            RemComp<TimerTriggerComponent>(uid);
         }
         RemComp<ActiveTimerTriggerComponent>(uid);
 
@@ -246,7 +239,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         if (comp is not { Activated: true, DelayWireUsed: false })
             return;
 
-        _trigger.TryDelay(wire.Owner, 30f);
+        _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(30));
         _popup.PopupEntity(Loc.GetString("defusable-popup-wire-chirp", ("name", wire.Owner)), wire.Owner);
         comp.DelayWireUsed = true;
     }
@@ -268,7 +261,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         if (comp is { Activated: true, ProceedWireUsed: false })
         {
             comp.ProceedWireUsed = true;
-            _trigger.TryDelay(wire.Owner, -15f);
+            _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(-15));
         }
 
         _popup.PopupEntity(Loc.GetString("defusable-popup-wire-proceed-pulse", ("name", wire.Owner)), wire.Owner);
@@ -298,7 +291,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         {
             if (!comp.ActivatedWireUsed)
             {
-                _trigger.TryDelay(wire.Owner, 30f);
+                _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(30));
                 _popup.PopupEntity(Loc.GetString("defusable-popup-wire-chirp", ("name", wire.Owner)), wire.Owner);
                 comp.ActivatedWireUsed = true;
             }
diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index 82d5ffcb9a..b4a79c6830 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
@@ -14,15 +15,13 @@ using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.FixedPoint;
+using Content.Shared.Humanoid;
+using Content.Shared.Trigger.Systems;
 using JetBrains.Annotations;
 using Robust.Server.Audio;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using System.Linq;
-using Content.Shared.Humanoid;
-using Robust.Shared.Player;
 
 namespace Content.Server.Destructible
 {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
index 97a5f8b7ef..cf337ac76a 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
@@ -5,6 +5,6 @@ public sealed partial class TimerStartBehavior : IThresholdBehavior
 {
     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        system.TriggerSystem.StartTimer(owner, cause);
+        system.TriggerSystem.ActivateTimerTrigger(owner, cause);
     }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
index 03bdb8ff69..66da79063c 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
@@ -1,10 +1,18 @@
-namespace Content.Server.Destructible.Thresholds.Behaviors;
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Server.Destructible.Thresholds.Behaviors;
 
 [DataDefinition]
 public sealed partial class TriggerBehavior : IThresholdBehavior
 {
+    /// <summary>
+    /// The trigger key to use when triggering.
+    /// </summary>
+    [DataField]
+    public string? KeyOut { get; set; } = TriggerSystem.DefaultTriggerKey;
+
     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        system.TriggerSystem.Trigger(owner, cause);
+        system.TriggerSystem.Trigger(owner, cause, KeyOut);
     }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
index e02ed87322..96fa4dd438 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/WeightedSpawnEntityBehavior.cs
@@ -19,6 +19,8 @@ namespace Content.Server.Destructible.Thresholds.Behaviors;
 [DataDefinition]
 public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
 {
+    private static readonly EntProtoId TempEntityProtoId = "TemporaryEntityForTimedDespawnSpawners";
+
     /// <summary>
     /// A table of entities with assigned weights to randomly pick from
     /// </summary>
@@ -64,7 +66,7 @@ public sealed partial class WeightedSpawnEntityBehavior : IThresholdBehavior
         if (SpawnAfter != 0)
         {
             // if it fails to get the spawner, this won't ever work so just return
-            if (!system.PrototypeManager.TryIndex("TemporaryEntityForTimedDespawnSpawners", out var tempSpawnerProto))
+            if (!system.PrototypeManager.TryIndex(TempEntityProtoId, out var tempSpawnerProto))
                 return;
 
             // spawn the spawner, assign it a lifetime, and assign the entity that it will spawn when despawned
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
index d957f0171e..ff20ac4d8d 100644
--- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
@@ -1,4 +1,6 @@
 using Content.Server.DeviceLinking.Components;
+using Content.Server.DeviceNetwork;
+using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
diff --git a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
index 45e4d21750..7743a97d72 100644
--- a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceNetwork;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
 using Content.Shared.DeviceNetwork;
diff --git a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
index 67fad29d93..8a557049bc 100644
--- a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceLinking.Components;
 using Content.Server.DeviceNetwork;
 using Content.Shared.Interaction;
+using Content.Shared.Lock;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 
@@ -10,6 +11,7 @@ public sealed class SignalSwitchSystem : EntitySystem
 {
     [Dependency] private readonly DeviceLinkSystem _deviceLink = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly LockSystem _lock = default!;
 
     public override void Initialize()
     {
@@ -29,6 +31,9 @@ public sealed class SignalSwitchSystem : EntitySystem
         if (args.Handled || !args.Complex)
             return;
 
+        if (_lock.IsLocked(uid))
+            return;
+
         comp.State = !comp.State;
         _deviceLink.InvokePort(uid, comp.State ? comp.OnPort : comp.OffPort);
 
diff --git a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
index a5091508ed..7d684d1cd5 100644
--- a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration.Logs;
 using Content.Server.DeviceLinking.Components;
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Timing;
@@ -10,7 +9,6 @@ namespace Content.Server.DeviceLinking.Systems;
 public sealed class SignallerSystem : EntitySystem
 {
     [Dependency] private readonly DeviceLinkSystem _link = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
@@ -19,7 +17,6 @@ public sealed class SignallerSystem : EntitySystem
 
         SubscribeLocalEvent<SignallerComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SignallerComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<SignallerComponent, TriggerEvent>(OnTrigger);
     }
 
     private void OnInit(EntityUid uid, SignallerComponent component, ComponentInit args)
@@ -36,16 +33,4 @@ public sealed class SignallerSystem : EntitySystem
         _link.InvokePort(uid, component.Port);
         args.Handled = true;
     }
-
-    private void OnTrigger(EntityUid uid, SignallerComponent component, TriggerEvent args)
-    {
-        if (!TryComp(uid, out UseDelayComponent? useDelay)
-            // if on cooldown, do nothing
-            // and set cooldown to prevent clocks
-            || !_useDelay.TryResetDelay((uid, useDelay), true))
-            return;
-
-        _link.InvokePort(uid, component.Port);
-        args.Handled = true;
-    }
 }
diff --git a/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
index 288732bb0a..5edcdae8ac 100644
--- a/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs
@@ -29,7 +29,7 @@ namespace Content.Server.DeviceNetwork.Systems
         /// </summary>
         private void OnBeforePacketSent(EntityUid uid, ApcNetworkComponent receiver, BeforePacketSentEvent args)
         {
-            if (!EntityManager.TryGetComponent(args.Sender, out ApcNetworkComponent? sender)) return;
+            if (!TryComp(args.Sender, out ApcNetworkComponent? sender)) return;
 
             if (sender.ConnectedNode?.NodeGroup == null || !sender.ConnectedNode.NodeGroup.Equals(receiver.ConnectedNode?.NodeGroup))
             {
@@ -39,7 +39,7 @@ namespace Content.Server.DeviceNetwork.Systems
 
         private void OnProviderConnected(EntityUid uid, ApcNetworkComponent component, ExtensionCableSystem.ProviderConnectedEvent args)
         {
-            if (!EntityManager.TryGetComponent(args.Provider.Owner, out NodeContainerComponent? nodeContainer)) return;
+            if (!TryComp(args.Provider.Owner, out NodeContainerComponent? nodeContainer)) return;
 
             if (_nodeContainer.TryGetNode(nodeContainer, "power", out CableNode? node))
             {
diff --git a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
index 588020a963..8f513130d1 100644
--- a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
@@ -24,7 +24,7 @@ namespace Content.Server.DeviceNetwork.Systems.Devices
         /// </summary>
         private void OnInteracted(EntityUid uid, ApcNetSwitchComponent component, InteractHandEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? networkComponent)) return;
+            if (!TryComp(uid, out DeviceNetworkComponent? networkComponent)) return;
 
             component.State = !component.State;
 
@@ -47,7 +47,7 @@ namespace Content.Server.DeviceNetwork.Systems.Devices
         /// </summary>
         private void OnPackedReceived(EntityUid uid, ApcNetSwitchComponent component, DeviceNetworkPacketEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? networkComponent) || args.SenderAddress == networkComponent.Address) return;
+            if (!TryComp(uid, out DeviceNetworkComponent? networkComponent) || args.SenderAddress == networkComponent.Address) return;
             if (!args.Data.TryGetValue(DeviceNetworkConstants.Command, out string? command) || command != DeviceNetworkConstants.CmdSetState) return;
             if (!args.Data.TryGetValue(DeviceNetworkConstants.StateEnabled, out bool enabled)) return;
 
diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
index 6bcbe30456..e34929bd2e 100644
--- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -18,6 +18,7 @@ using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Map.Events;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -496,14 +497,15 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
             return;
 
         var sources = _deviceLinkSystem.GetSourcePorts(sourceUid, sourceComponent);
-        var sinks = _deviceLinkSystem.GetSinkPorts(sinkUid, sinkComponent);
+        var sinks = _deviceLinkSystem.GetSinkPortIds((sinkUid, sinkComponent));
         var links = _deviceLinkSystem.GetLinks(sourceUid, sinkUid, sourceComponent);
         var defaults = _deviceLinkSystem.GetDefaults(sources);
+        var sourceIds = sources.Select(s => (ProtoId<SourcePortPrototype>)s.ID).ToArray();
 
         var sourceAddress = Resolve(sourceUid, ref sourceNetworkComponent, false) ? sourceNetworkComponent.Address : "";
         var sinkAddress = Resolve(sinkUid, ref sinkNetworkComponent, false) ? sinkNetworkComponent.Address : "";
 
-        var state = new DeviceLinkUserInterfaceState(sources, sinks, links, sourceAddress, sinkAddress, defaults);
+        var state = new DeviceLinkUserInterfaceState(sourceIds, sinks, links, sourceAddress, sinkAddress, defaults);
         _uiSystem.SetUiState(configuratorUid, NetworkConfiguratorUiKey.Link, state);
     }
 
diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs
deleted file mode 100644
index 8ee4cf852b..0000000000
--- a/Content.Server/Devour/DevourSystem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Devour;
-using Content.Shared.Devour.Components;
-using Content.Shared.Humanoid;
-
-namespace Content.Server.Devour;
-
-public sealed class DevourSystem : SharedDevourSystem
-{
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
-    }
-
-    private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        var ichorInjection = new Solution(component.Chemical, component.HealRate);
-
-        if (component.FoodPreference == FoodPreference.All ||
-            (component.FoodPreference == FoodPreference.Humanoid && HasComp<HumanoidAppearanceComponent>(args.Args.Target)))
-        {
-            if (component.ShouldStoreDevoured && args.Args.Target is not null)
-            {
-                ContainerSystem.Insert(args.Args.Target.Value, component.Stomach);
-            }
-            _bloodstreamSystem.TryAddToChemicals(uid, ichorInjection);
-        }
-
-        //TODO: Figure out a better way of removing structures via devour that still entails standing still and waiting for a DoAfter. Somehow.
-        //If it's not human, it must be a structure
-        else if (args.Args.Target != null)
-        {
-            QueueDel(args.Args.Target.Value);
-        }
-
-        _audioSystem.PlayPvs(component.SoundDevour, uid);
-    }
-
-    private void OnGibContents(EntityUid uid, DevourerComponent component, ref BeingGibbedEvent args)
-    {
-        if (!component.ShouldStoreDevoured)
-            return;
-
-        // For some reason we have two different systems that should handle gibbing,
-        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
-        ContainerSystem.EmptyContainer(component.Stomach);
-    }
-}
-
diff --git a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs
index 5a2c064e4d..358bc4ab3e 100644
--- a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs
+++ b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs
@@ -1,8 +1,7 @@
-using System.Threading.Tasks;
-using Content.Server.Chat.Managers;
+using Content.Server.Chat.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
-using Discord.WebSocket;
+using NetCord.Gateway;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
 
@@ -59,18 +58,18 @@ public sealed class DiscordChatLink : IPostInjectInit
         _adminChannelId = ulong.Parse(channelId);
     }
 
-    private void OnMessageReceived(SocketMessage message)
+    private void OnMessageReceived(Message message)
     {
         if (message.Author.IsBot)
             return;
 
         var contents = message.Content.ReplaceLineEndings(" ");
 
-        if (message.Channel.Id == _oocChannelId)
+        if (message.ChannelId == _oocChannelId)
         {
             _taskManager.RunOnMainThread(() => _chatManager.SendHookOOC(message.Author.Username, contents));
         }
-        else if (message.Channel.Id == _adminChannelId)
+        else if (message.ChannelId == _adminChannelId)
         {
             _taskManager.RunOnMainThread(() => _chatManager.SendHookAdmin(message.Author.Username, contents));
         }
diff --git a/Content.Server/Discord/DiscordLink/DiscordLink.cs b/Content.Server/Discord/DiscordLink/DiscordLink.cs
index abf3189a99..cbfe12f180 100644
--- a/Content.Server/Discord/DiscordLink/DiscordLink.cs
+++ b/Content.Server/Discord/DiscordLink/DiscordLink.cs
@@ -1,12 +1,9 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Shared.CCVar;
-using Discord;
-using Discord.WebSocket;
+using NetCord;
+using NetCord.Gateway;
+using NetCord.Rest;
 using Robust.Shared.Configuration;
-using Robust.Shared.Reflection;
-using Robust.Shared.Utility;
-using LogMessage = Discord.LogMessage;
 
 namespace Content.Server.Discord.DiscordLink;
 
@@ -28,7 +25,7 @@ public sealed class CommandReceivedEventArgs
     /// Information about the message that the command was received from. This includes the message content, author, etc.
     /// Use this to reply to the message, delete it, etc.
     /// </summary>
-    public SocketMessage Message { get; init; } = default!;
+    public Message Message { get; init; } = default!;
 }
 
 /// <summary>
@@ -45,7 +42,7 @@ public sealed class DiscordLink : IPostInjectInit
     /// <remarks>
     ///     This should not be used directly outside of DiscordLink. So please do not make it public. Use the methods in this class instead.
     /// </remarks>
-    private DiscordSocketClient? _client;
+    private GatewayClient? _client;
     private ISawmill _sawmill = default!;
     private ISawmill _sawmillLog = default!;
 
@@ -67,7 +64,7 @@ public sealed class DiscordLink : IPostInjectInit
     /// <summary>
     ///     Event that is raised when a message is received from Discord. This is raised for every message, including commands.
     /// </summary>
-    public event Action<SocketMessage>? OnMessageReceived;
+    public event Action<Message>? OnMessageReceived;
 
     public void RegisterCommandCallback(Action<CommandReceivedEventArgs> callback, string command)
     {
@@ -101,33 +98,34 @@ public sealed class DiscordLink : IPostInjectInit
             return;
         }
 
-        _client = new DiscordSocketClient(new DiscordSocketConfig()
+        _client = new GatewayClient(new BotToken(token), new GatewayClientConfiguration()
         {
-            GatewayIntents = GatewayIntents.Guilds
-                             | GatewayIntents.GuildMembers
+            Intents = GatewayIntents.Guilds
+                             | GatewayIntents.GuildUsers
                              | GatewayIntents.GuildMessages
                              | GatewayIntents.MessageContent
                              | GatewayIntents.DirectMessages,
+            Logger = new DiscordSawmillLogger(_sawmillLog),
         });
-        _client.Log += Log;
-        _client.MessageReceived += OnCommandReceivedInternal;
-        _client.MessageReceived += OnMessageReceivedInternal;
+        _client.MessageCreate += OnCommandReceivedInternal;
+        _client.MessageCreate += OnMessageReceivedInternal;
 
         _botToken = token;
         // Since you cannot change the token while the server is running / the DiscordLink is initialized,
         // we can just set the token without updating it every time the cvar changes.
 
-        _client.Ready += () =>
+        _client.Ready += _ =>
         {
             _sawmill.Info("Discord client ready.");
-            return Task.CompletedTask;
+            return default;
         };
 
         Task.Run(async () =>
         {
             try
             {
-                await LoginAsync(token);
+                await _client.StartAsync();
+                _sawmill.Info("Connected to Discord.");
             }
             catch (Exception e)
             {
@@ -143,12 +141,11 @@ public sealed class DiscordLink : IPostInjectInit
             _sawmill.Info("Disconnecting from Discord.");
 
             // Unsubscribe from the events.
-            _client.MessageReceived -= OnCommandReceivedInternal;
-            _client.MessageReceived -= OnMessageReceivedInternal;
+            _client.MessageCreate -= OnCommandReceivedInternal;
+            _client.MessageCreate -= OnMessageReceivedInternal;
 
-            await _client.LogoutAsync();
-            await _client.StopAsync();
-            await _client.DisposeAsync();
+            await _client.CloseAsync();
+            _client.Dispose();
             _client = null;
         }
 
@@ -172,45 +169,12 @@ public sealed class DiscordLink : IPostInjectInit
         BotPrefix = prefix;
     }
 
-    private async Task LoginAsync(string token)
-    {
-        DebugTools.Assert(_client != null);
-        DebugTools.Assert(_client.LoginState == LoginState.LoggedOut);
-
-        await _client.LoginAsync(TokenType.Bot, token);
-        await _client.StartAsync();
-
-
-        _sawmill.Info("Connected to Discord.");
-    }
-
-    private string FormatLog(LogMessage msg)
-    {
-        return msg.Exception is null
-            ? $"{msg.Source}: {msg.Message}"
-            : $"{msg.Source}: {msg.Message}\n{msg.Exception}";
-    }
-
-    private Task Log(LogMessage msg)
-    {
-        var logLevel = msg.Severity switch
-        {
-            LogSeverity.Critical => LogLevel.Fatal,
-            LogSeverity.Error => LogLevel.Error,
-            LogSeverity.Warning => LogLevel.Warning,
-            _ => LogLevel.Debug
-        };
-
-        _sawmillLog.Log(logLevel, FormatLog(msg));
-        return Task.CompletedTask;
-    }
-
-    private Task OnCommandReceivedInternal(SocketMessage message)
+    private ValueTask OnCommandReceivedInternal(Message message)
     {
         var content = message.Content;
         // If the message doesn't start with the bot prefix, ignore it.
         if (!content.StartsWith(BotPrefix))
-            return Task.CompletedTask;
+            return ValueTask.CompletedTask;
 
         // Split the message into the command and the arguments.
         var trimmedInput = content[BotPrefix.Length..].Trim();
@@ -236,13 +200,13 @@ public sealed class DiscordLink : IPostInjectInit
             Arguments = arguments,
             Message = message,
         });
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 
-    private Task OnMessageReceivedInternal(SocketMessage message)
+    private ValueTask OnMessageReceivedInternal(Message message)
     {
         OnMessageReceived?.Invoke(message);
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 
     #region Proxy methods
@@ -257,14 +221,18 @@ public sealed class DiscordLink : IPostInjectInit
             return;
         }
 
-        var channel = _client.GetChannel(channelId) as IMessageChannel;
+        var channel = await _client.Rest.GetChannelAsync(channelId) as TextChannel;
         if (channel == null)
         {
             _sawmill.Error("Tried to send a message to Discord but the channel {Channel} was not found.", channel);
             return;
         }
 
-        await channel.SendMessageAsync(message, allowedMentions: AllowedMentions.None);
+        await channel.SendMessageAsync(new MessageProperties()
+        {
+            AllowedMentions = AllowedMentionsProperties.None,
+            Content = message,
+        });
     }
 
     #endregion
diff --git a/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs b/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs
new file mode 100644
index 0000000000..c6ca6acd0e
--- /dev/null
+++ b/Content.Server/Discord/DiscordLink/DiscordSawmillLogger.cs
@@ -0,0 +1,34 @@
+using NetCord.Logging;
+using NLogLevel = NetCord.Logging.LogLevel;
+using LogLevel = Robust.Shared.Log.LogLevel;
+
+namespace Content.Server.Discord.DiscordLink;
+
+public sealed class DiscordSawmillLogger(ISawmill sawmill) : IGatewayLogger, IRestLogger, IVoiceLogger
+{
+    private static LogLevel GetLogLevel(NLogLevel logLevel)
+    {
+        return logLevel switch
+        {
+            NLogLevel.Critical => LogLevel.Fatal,
+            NLogLevel.Error => LogLevel.Error,
+            NLogLevel.Warning => LogLevel.Warning,
+            _ => LogLevel.Debug,
+        };
+    }
+
+    void IGatewayLogger.Log<TState>(NetCord.Logging.LogLevel logLevel, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+    {
+        sawmill.Log(GetLogLevel(logLevel), exception, formatter(state, exception));
+    }
+
+    void IRestLogger.Log<TState>(NetCord.Logging.LogLevel logLevel, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+    {
+        sawmill.Log(GetLogLevel(logLevel), exception, formatter(state, exception));
+    }
+
+    void IVoiceLogger.Log<TState>(NetCord.Logging.LogLevel logLevel, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+    {
+        sawmill.Log(GetLogLevel(logLevel), exception, formatter(state, exception));
+    }
+}
diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
index f1e094db20..7e63bc4e23 100644
--- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
+++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
@@ -102,7 +102,7 @@ namespace Content.Server.Disposal.Tube
         /// <param name="msg">A user interface message from the client.</param>
         private void OnUiAction(EntityUid uid, DisposalRouterComponent router, SharedDisposalRouterComponent.UiActionMessage msg)
         {
-            if (!EntityManager.EntityExists(msg.Actor))
+            if (!Exists(msg.Actor))
                 return;
 
             if (TryComp<PhysicsComponent>(uid, out var physBody) && physBody.BodyType != BodyType.Static)
@@ -428,7 +428,7 @@ namespace Content.Server.Disposal.Tube
 
             foreach (var entity in from.Container.ContainedEntities.ToArray())
             {
-                _disposableSystem.TryInsert(holder, entity, holderComponent);
+                _containerSystem.Insert(entity, holderComponent.Container);
             }
 
             _atmosSystem.Merge(holderComponent.Air, from.Air);
diff --git a/Content.Server/Disposal/Unit/DisposableSystem.cs b/Content.Server/Disposal/Unit/DisposableSystem.cs
index a94176246c..d307488110 100644
--- a/Content.Server/Disposal/Unit/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/DisposableSystem.cs
@@ -43,6 +43,8 @@ namespace Content.Server.Disposal.Unit
             _xformQuery = GetEntityQuery<TransformComponent>();
 
             SubscribeLocalEvent<DisposalHolderComponent, ComponentStartup>(OnComponentStartup);
+            SubscribeLocalEvent<DisposalHolderComponent, ContainerIsInsertingAttemptEvent>(CanInsert);
+            SubscribeLocalEvent<DisposalHolderComponent, EntInsertedIntoContainerMessage>(OnInsert);
         }
 
         private void OnComponentStartup(EntityUid uid, DisposalHolderComponent holder, ComponentStartup args)
@@ -50,34 +52,16 @@ namespace Content.Server.Disposal.Unit
             holder.Container = _containerSystem.EnsureContainer<Container>(uid, nameof(DisposalHolderComponent));
         }
 
-        public bool TryInsert(EntityUid uid, EntityUid toInsert, DisposalHolderComponent? holder = null)
+        private void CanInsert(Entity<DisposalHolderComponent> ent, ref ContainerIsInsertingAttemptEvent args)
         {
-            if (!Resolve(uid, ref holder))
-                return false;
-            if (!CanInsert(uid, toInsert, holder))
-                return false;
-
-            if (!_containerSystem.Insert(toInsert, holder.Container))
-                return false;
-
-            if (_physicsQuery.TryGetComponent(toInsert, out var physBody))
-                _physicsSystem.SetCanCollide(toInsert, false, body: physBody);
-
-            return true;
+            if (!HasComp<ItemComponent>(args.EntityUid) && !HasComp<BodyComponent>(args.EntityUid))
+                args.Cancel();
         }
 
-        private bool CanInsert(EntityUid uid, EntityUid toInsert, DisposalHolderComponent? holder = null)
+        private void OnInsert(Entity<DisposalHolderComponent> ent, ref EntInsertedIntoContainerMessage args)
         {
-            if (!Resolve(uid, ref holder))
-                return false;
-
-            if (!_containerSystem.CanInsert(toInsert, holder.Container))
-            {
-                return false;
-            }
-
-            return HasComp<ItemComponent>(toInsert) ||
-                   HasComp<BodyComponent>(toInsert);
+            if (_physicsQuery.TryGetComponent(args.Entity, out var physBody))
+                _physicsSystem.SetCanCollide(args.Entity, false, body: physBody);
         }
 
         public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null)
@@ -156,7 +140,7 @@ namespace Content.Server.Disposal.Unit
                 holder.Air.Clear();
             }
 
-            EntityManager.DeleteEntity(uid);
+            Del(uid);
         }
 
         // Note: This function will cause an ExitDisposals on any failure that does not make an ExitDisposals impossible.
@@ -243,7 +227,7 @@ namespace Content.Server.Disposal.Unit
                 holder.TimeLeft -= time;
                 frameTime -= time;
 
-                if (!EntityManager.EntityExists(holder.CurrentTube))
+                if (!Exists(holder.CurrentTube))
                 {
                     ExitDisposals(uid, holder);
                     break;
@@ -268,7 +252,7 @@ namespace Content.Server.Disposal.Unit
 
                 // Find next tube
                 var nextTube = _disposalTubeSystem.NextTubeFor(currentTube, holder.CurrentDirection);
-                if (!EntityManager.EntityExists(nextTube))
+                if (!Exists(nextTube))
                 {
                     ExitDisposals(uid, holder);
                     break;
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index efac049b35..960365a7ca 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -21,7 +21,6 @@ namespace Content.Server.Dragon;
 public sealed partial class DragonSystem : EntitySystem
 {
     [Dependency] private readonly CarpRiftsConditionSystem _carpRifts = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDef = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly NpcFactionSystem _faction = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
@@ -30,6 +29,7 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -159,7 +159,7 @@ public sealed partial class DragonSystem : EntitySystem
         // cant put a rift on solars
         foreach (var tile in _map.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
         {
-            if (!tile.IsSpace(_tileDef))
+            if (!_turf.IsSpace(tile))
                 continue;
 
             _popup.PopupEntity(Loc.GetString("carp-rift-space-proximity", ("proximity", RiftTileRadius)), uid, uid);
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
index 2511bc790e..2ea0482590 100644
--- a/Content.Server/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Drowsiness;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -8,9 +9,6 @@ namespace Content.Server.Drowsiness;
 
 public sealed class DrowsinessSystem : SharedDrowsinessSystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string SleepKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
-
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
@@ -18,33 +16,37 @@ public sealed class DrowsinessSystem : SharedDrowsinessSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<DrowsinessComponent, ComponentStartup>(OnInit);
+        SubscribeLocalEvent<DrowsinessStatusEffectComponent, StatusEffectAppliedEvent>(OnEffectApplied);
     }
 
-    private void OnInit(EntityUid uid, DrowsinessComponent component, ComponentStartup args)
+    private void OnEffectApplied(Entity<DrowsinessStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+        ent.Comp.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(ent.Comp.TimeBetweenIncidents.X, ent.Comp.TimeBetweenIncidents.Y));
     }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<DrowsinessComponent>();
-        while (query.MoveNext(out var uid, out var component))
+        var query = EntityQueryEnumerator<DrowsinessStatusEffectComponent, StatusEffectComponent>();
+        while (query.MoveNext(out var uid, out var drowsiness, out var statusEffect))
         {
-            if (_timing.CurTime < component.NextIncidentTime)
+            if (_timing.CurTime < drowsiness.NextIncidentTime)
+                continue;
+
+            if (statusEffect.AppliedTo is null)
                 continue;
 
             // Set the new time.
-            component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+            drowsiness.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(drowsiness.TimeBetweenIncidents.X, drowsiness.TimeBetweenIncidents.Y));
 
             // sleep duration
-            var duration = TimeSpan.FromSeconds(_random.NextFloat(component.DurationOfIncident.X, component.DurationOfIncident.Y));
+            var duration = TimeSpan.FromSeconds(_random.NextFloat(drowsiness.DurationOfIncident.X, drowsiness.DurationOfIncident.Y));
 
             // Make sure the sleep time doesn't cut into the time to next incident.
-            component.NextIncidentTime += duration;
+            drowsiness.NextIncidentTime += duration;
 
-            _statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(uid, SleepKey, duration, false);
+            _statusEffects.TryAddStatusEffectDuration(statusEffect.AppliedTo.Value, SleepingSystem.StatusEffectForcedSleeping, duration);
         }
     }
 }
diff --git a/Content.Server/Electrocution/ElectrocuteCommand.cs b/Content.Server/Electrocution/ElectrocuteCommand.cs
index 75eb64c1bb..6bc3977544 100644
--- a/Content.Server/Electrocution/ElectrocuteCommand.cs
+++ b/Content.Server/Electrocution/ElectrocuteCommand.cs
@@ -2,56 +2,48 @@ using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Electrocution
+namespace Content.Server.Electrocution;
+
+[AdminCommand(AdminFlags.Fun)]
+public sealed class ElectrocuteCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Fun)]
-    public sealed class ElectrocuteCommand : IConsoleCommand
+    [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+
+    public override string Command => "electrocute";
+
+    private static readonly ProtoId<StatusEffectPrototype> ElectrocutionStatusEffect = "Electrocution";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-
-        public string Command => "electrocute";
-        public string Description => Loc.GetString("electrocute-command-description");
-        public string Help => $"{Command} <uid> <seconds> <damage>";
-
-        [ValidatePrototypeId<StatusEffectPrototype>]
-        public const string ElectrocutionStatusEffect = "Electrocution";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        if (args.Length is < 1 or > 3)
         {
-            if (args.Length < 1)
-            {
-                // TODO: Localize this.
-                shell.WriteError("Not enough arguments!");
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[0], out var uidNet) ||
-                !_entManager.TryGetEntity(uidNet, out var uid) ||
-                !_entManager.EntityExists(uid))
-            {
-                shell.WriteError($"Invalid entity specified!");
-                return;
-            }
-
-            if (!_entManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>().CanApplyEffect(uid.Value, ElectrocutionStatusEffect))
-            {
-                shell.WriteError(Loc.GetString("electrocute-command-entity-cannot-be-electrocuted"));
-                return;
-            }
-
-            if (args.Length < 2 || !int.TryParse(args[1], out var seconds))
-            {
-                seconds = 10;
-            }
-
-            if (args.Length < 3 || !int.TryParse(args[2], out var damage))
-            {
-                damage = 10;
-            }
-
-            _entManager.EntitySysManager.GetEntitySystem<ElectrocutionSystem>()
-                .TryDoElectrocution(uid.Value, null, damage, TimeSpan.FromSeconds(seconds), refresh: true, ignoreInsulation: true);
+            shell.WriteError(Loc.GetString($"shell-need-between-arguments",
+                ("lower", 1),
+                ("upper", 3)));
+            return;
         }
+
+        if (!NetEntity.TryParse(args[0], out var uidNet) || !EntityManager.TryGetEntity(uidNet, out var uid) || !EntityManager.EntityExists(uid))
+        {
+            shell.WriteError(Loc.GetString($"shell-could-not-find-entity-with-uid", ("uid", args[0])));
+            return;
+        }
+
+        if (!_statusEffects.CanApplyEffect(uid.Value, ElectrocutionStatusEffect))
+        {
+            shell.WriteError(Loc.GetString("cmd-electrocute-entity-cannot-be-electrocuted"));
+            return;
+        }
+
+        if (args.Length < 2 || !int.TryParse(args[1], out var seconds))
+            seconds = 10;
+
+        if (args.Length < 3 || !int.TryParse(args[2], out var damage))
+            damage = 10;
+
+        _electrocution.TryDoElectrocution(uid.Value, null, damage, TimeSpan.FromSeconds(seconds), refresh: true, ignoreInsulation: true);
     }
 }
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 957f881bed..05dfffa4a9 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -40,7 +40,6 @@ namespace Content.Server.Electrocution;
 public sealed class ElectrocutionSystem : SharedElectrocutionSystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
@@ -57,13 +56,10 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
     [Dependency] private readonly SharedStutteringSystem _stuttering = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string StatusEffectKey = "Electrocution";
-
-    [ValidatePrototypeId<DamageTypePrototype>]
-    private const string DamageType = "Shock";
-
+    private static readonly ProtoId<StatusEffectPrototype> StatusKeyIn = "Electrocution";
+    private static readonly ProtoId<DamageTypePrototype> DamageType = "Shock";
     private static readonly ProtoId<TagPrototype> WindowTag = "Window";
 
     // Multiply and shift the log scale for shock damage.
@@ -137,7 +133,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
             return false;
         if (electrified.NoWindowInTile)
         {
-            var tileRef = transform.Coordinates.GetTileRef(EntityManager, _mapManager);
+            var tileRef = _turf.GetTileRef(transform.Coordinates);
 
             if (tileRef != null)
             {
@@ -390,25 +386,30 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
         }
 
         if (!Resolve(uid, ref statusEffects, false) ||
-            !_statusEffects.CanApplyEffect(uid, StatusEffectKey, statusEffects))
+            !_statusEffects.CanApplyEffect(uid, StatusKeyIn, statusEffects))
         {
             return false;
         }
 
-        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusEffectKey, time, refresh, statusEffects))
+        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusKeyIn, time, refresh, statusEffects))
             return false;
 
         var shouldStun = siemensCoefficient > 0.5f;
 
         if (shouldStun)
-            _stun.TryParalyze(uid, time * ParalyzeTimeMultiplier, refresh, statusEffects);
+        {
+            _ = refresh
+                ? _stun.TryUpdateParalyzeDuration(uid, time * ParalyzeTimeMultiplier)
+                : _stun.TryAddParalyzeDuration(uid, time * ParalyzeTimeMultiplier);
+        }
+            
 
         // TODO: Sparks here.
 
         if (shockDamage is { } dmg)
         {
             var actual = _damageable.TryChangeDamage(uid,
-                new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>(DamageType), dmg), origin: sourceUid);
+                new DamageSpecifier(_prototypeManager.Index(DamageType), dmg), origin: sourceUid);
 
             if (actual != null)
             {
diff --git a/Content.Server/Emoting/Components/BodyEmotesComponent.cs b/Content.Server/Emoting/Components/BodyEmotesComponent.cs
index 3fd71def0d..d911a89ec9 100644
--- a/Content.Server/Emoting/Components/BodyEmotesComponent.cs
+++ b/Content.Server/Emoting/Components/BodyEmotesComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Emoting.Systems;
 using Content.Shared.Chat.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Emoting.Components;
 
@@ -14,11 +14,6 @@ public sealed partial class BodyEmotesComponent : Component
     /// <summary>
     ///     Emote sounds prototype id for body emotes.
     /// </summary>
-    [DataField("soundsId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
-    public string? SoundsId;
-
-    /// <summary>
-    ///     Loaded emote sounds prototype used for body emotes.
-    /// </summary>
-    public EmoteSoundsPrototype? Sounds;
+    [DataField]
+    public ProtoId<EmoteSoundsPrototype>? SoundsId;
 }
diff --git a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
index 594eb0ec6d..aef79f1419 100644
--- a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
+++ b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
@@ -14,15 +14,8 @@ public sealed class BodyEmotesSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<BodyEmotesComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<BodyEmotesComponent, EmoteEvent>(OnEmote);
-    }
 
-    private void OnStartup(EntityUid uid, BodyEmotesComponent component, ComponentStartup args)
-    {
-        if (component.SoundsId == null)
-            return;
-        _proto.TryIndex(component.SoundsId, out component.Sounds);
+        SubscribeLocalEvent<BodyEmotesComponent, EmoteEvent>(OnEmote);
     }
 
     private void OnEmote(EntityUid uid, BodyEmotesComponent component, ref EmoteEvent args)
@@ -43,6 +36,9 @@ public sealed class BodyEmotesSystem : EntitySystem
         if (!TryComp(uid, out HandsComponent? hands) || hands.Count <= 0)
             return false;
 
-        return _chat.TryPlayEmoteSound(uid, component.Sounds, emote);
+        if (!_proto.Resolve(component.SoundsId, out var sounds))
+            return false;
+
+        return _chat.TryPlayEmoteSound(uid, sounds, emote);
     }
 }
diff --git a/Content.Server/Emp/EmpOnTriggerComponent.cs b/Content.Server/Emp/EmpOnTriggerComponent.cs
deleted file mode 100644
index fac509ea9f..0000000000
--- a/Content.Server/Emp/EmpOnTriggerComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Content.Server.Emp;
-
-/// <summary>
-/// Upon being triggered will EMP area around it.
-/// </summary>
-[RegisterComponent]
-[Access(typeof(EmpSystem))]
-public sealed partial class EmpOnTriggerComponent : Component
-{
-    [DataField("range"), ViewVariables(VVAccess.ReadWrite)]
-    public float Range = 1.0f;
-
-    /// <summary>
-    /// How much energy will be consumed per battery in range
-    /// </summary>
-    [DataField("energyConsumption"), ViewVariables(VVAccess.ReadWrite)]
-    public float EnergyConsumption;
-
-    /// <summary>
-    /// How long it disables targets in seconds
-    /// </summary>
-    [DataField("disableDuration"), ViewVariables(VVAccess.ReadWrite)]
-    public float DisableDuration = 60f;
-}
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index e8f8e0e626..775ab00e62 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -1,10 +1,7 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio;
 using Content.Server.SurveillanceCamera;
 using Content.Shared.Emp;
-using Content.Shared.Examine;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.Emp;
@@ -12,16 +9,12 @@ namespace Content.Server.Emp;
 public sealed class EmpSystem : SharedEmpSystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
 
     public const string EmpPulseEffectPrototype = "EffectEmpPulse";
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(HandleEmpTrigger);
-        SubscribeLocalEvent<EmpImmuneComponent, EmpAttemptEvent>(OnEmpAttempt); // Sunrise-Edit
 
         SubscribeLocalEvent<EmpDisabledComponent, RadioSendAttemptEvent>(OnRadioSendAttempt);
         SubscribeLocalEvent<EmpDisabledComponent, RadioReceiveAttemptEvent>(OnRadioReceiveAttempt);
@@ -29,14 +22,7 @@ public sealed class EmpSystem : SharedEmpSystem
         SubscribeLocalEvent<EmpDisabledComponent, SurveillanceCameraSetActiveAttemptEvent>(OnCameraSetActive);
     }
 
-    /// <summary>
-    ///   Triggers an EMP pulse at the given location, by first raising an <see cref="EmpAttemptEvent"/>, then a raising <see cref="EmpPulseEvent"/> on all entities in range.
-    /// </summary>
-    /// <param name="coordinates">The location to trigger the EMP pulse at.</param>
-    /// <param name="range">The range of the EMP pulse.</param>
-    /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
-    /// <param name="duration">The duration of the EMP effects.</param>
-    public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
+    public override void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
     {
         foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range))
         {
@@ -87,15 +73,15 @@ public sealed class EmpSystem : SharedEmpSystem
     {
         var ev = new EmpPulseEvent(energyConsumption, false, false, TimeSpan.FromSeconds(duration));
         RaiseLocalEvent(uid, ref ev);
+
         if (ev.Affected)
-        {
             Spawn(EmpDisabledEffectPrototype, Transform(uid).Coordinates);
-        }
-        if (ev.Disabled)
-        {
-            var disabled = EnsureComp<EmpDisabledComponent>(uid);
-            disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
-        }
+
+        if (!ev.Disabled)
+            return;
+
+        var disabled = EnsureComp<EmpDisabledComponent>(uid);
+        disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
     }
 
     public override void Update(float frameTime)
@@ -114,17 +100,6 @@ public sealed class EmpSystem : SharedEmpSystem
         }
     }
 
-    private void OnExamine(EntityUid uid, EmpDisabledComponent component, ExaminedEvent args)
-    {
-        args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine"));
-    }
-
-    private void HandleEmpTrigger(EntityUid uid, EmpOnTriggerComponent comp, TriggerEvent args)
-    {
-        EmpPulse(_transform.GetMapCoordinates(uid), comp.Range, comp.EnergyConsumption, comp.DisableDuration);
-        args.Handled = true;
-    }
-
     private void OnRadioSendAttempt(EntityUid uid, EmpDisabledComponent component, ref RadioSendAttemptEvent args)
     {
         args.Cancelled = true;
@@ -156,9 +131,7 @@ public sealed class EmpSystem : SharedEmpSystem
 /// <summary>
 /// Raised on an entity before <see cref="EmpPulseEvent"/>. Cancel this to prevent the emp event being raised.
 /// </summary>
-public sealed partial class EmpAttemptEvent : CancellableEntityEventArgs
-{
-}
+public sealed partial class EmpAttemptEvent : CancellableEntityEventArgs;
 
 [ByRefEvent]
 public record struct EmpPulseEvent(float EnergyConsumption, bool Affected, bool Disabled, TimeSpan Duration);
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index 94994a38b8..743646c92b 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -63,13 +63,13 @@ namespace Content.Server.Engineering.EntitySystems
             if (component.Deleted || !IsTileClear())
                 return;
 
-            if (EntityManager.TryGetComponent(uid, out StackComponent? stackComp)
+            if (TryComp(uid, out StackComponent? stackComp)
                 && component.RemoveOnInteract && !_stackSystem.Use(uid, 1, stackComp))
             {
                 return;
             }
 
-            EntityManager.SpawnEntity(component.Prototype, args.ClickLocation.SnapToGrid(grid));
+            Spawn(component.Prototype, args.ClickLocation.SnapToGrid(grid));
 
             if (component.RemoveOnInteract && stackComp == null)
                 TryQueueDel(uid);
diff --git a/Content.Server/Ensnaring/Components/EnsnaringComponent.cs b/Content.Server/Ensnaring/Components/EnsnaringComponent.cs
deleted file mode 100644
index da9ad56c5e..0000000000
--- 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 164199c200..1277c8df59 100644
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/EntityEffectSystem.cs
@@ -10,7 +10,6 @@ using Content.Server.Botany;
 using Content.Server.Chat.Systems;
 using Content.Server.Emp;
 using Content.Server.Explosion.EntitySystems;
-using Content.Server.Flash;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Medical;
@@ -23,13 +22,13 @@ using Content.Server.Temperature.Systems;
 using Content.Server.Traits.Assorted;
 using Content.Server.Zombies;
 using Content.Shared.Atmos;
-using Content.Shared.Audio;
+using Content.Shared.Body.Components;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.EntityEffects.EffectConditions;
 using Content.Shared.EntityEffects.Effects.PlantMetabolism;
-using Content.Shared.EntityEffects.Effects.StatusEffects;
 using Content.Shared.EntityEffects.Effects;
 using Content.Shared.EntityEffects;
+using Content.Shared.Flash;
 using Content.Shared.Maps;
 using Content.Shared.Mind.Components;
 using Content.Shared.Popups;
@@ -38,7 +37,6 @@ using Content.Shared.Zombies;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -50,13 +48,15 @@ namespace Content.Server.EntityEffects;
 
 public sealed class EntityEffectSystem : EntitySystem
 {
+    private static readonly ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly EmpSystem _emp = default!;
     [Dependency] private readonly ExplosionSystem _explosion = default!;
     [Dependency] private readonly FlammableSystem _flammable = default!;
-    [Dependency] private readonly FlashSystem _flash = default!;
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -74,6 +74,7 @@ public sealed class EntityEffectSystem : EntitySystem
     [Dependency] private readonly TemperatureSystem _temperature = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly VomitSystem _vomit = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     public override void Initialize()
     {
@@ -132,7 +133,7 @@ public sealed class EntityEffectSystem : EntitySystem
         args.Result = false;
         if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
         {
-            if (temp.CurrentTemperature > args.Condition.Min && temp.CurrentTemperature < args.Condition.Max)
+            if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
                 args.Result = true;
         }
     }
@@ -520,7 +521,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
             var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / args.Effect.OverflowThreshold).Float()));
             var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
-            var transform = EntityManager.GetComponent<TransformComponent>(reagentArgs.TargetEntity);
+            var transform = Comp<TransformComponent>(reagentArgs.TargetEntity);
             var mapCoords = _xform.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
 
             if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
@@ -529,11 +530,11 @@ public sealed class EntityEffectSystem : EntitySystem
                 return;
             }
 
-            if (_spreader.RequiresFloorToSpread(args.Effect.PrototypeId) && tileRef.Tile.IsSpace())
+            if (_spreader.RequiresFloorToSpread(args.Effect.PrototypeId) && _turf.IsSpace(tileRef))
                 return;
 
             var coords = _map.MapToGrid(gridUid, mapCoords);
-            var ent = EntityManager.SpawnEntity(args.Effect.PrototypeId, coords.SnapToGrid());
+            var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
 
             _smoke.StartSmoke(ent, splitSolution, args.Effect.Duration, spreadAmount);
 
@@ -560,11 +561,11 @@ public sealed class EntityEffectSystem : EntitySystem
                 return;
 
             cleanseRate *= reagentArgs.Scale.Float();
-            _bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
+            _bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent, cleanseRate);
         }
         else
         {
-            _bloodstream.FlushChemicals(args.Args.TargetEntity, "", cleanseRate);
+            _bloodstream.FlushChemicals(args.Args.TargetEntity, null, cleanseRate);
         }
     }
 
@@ -643,7 +644,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecuteEmpReactionEffect(ref ExecuteEntityEffectEvent<EmpReactionEffect> args)
     {
-        var transform = EntityManager.GetComponent<TransformComponent>(args.Args.TargetEntity);
+        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
 
         var range = args.Effect.EmpRangePerUnit;
 
@@ -699,7 +700,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecuteFlashReactionEffect(ref ExecuteEntityEffectEvent<FlashReactionEffect> args)
     {
-        var transform = EntityManager.GetComponent<TransformComponent>(args.Args.TargetEntity);
+        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
 
         var range = 1f;
 
@@ -710,7 +711,7 @@ public sealed class EntityEffectSystem : EntitySystem
             args.Args.TargetEntity,
             null,
             range,
-            args.Effect.Duration * 1000,
+            args.Effect.Duration,
             slowTo: args.Effect.SlowTo,
             sound: args.Effect.Sound);
 
@@ -766,7 +767,7 @@ public sealed class EntityEffectSystem : EntitySystem
         ghostRole = AddComp<GhostRoleComponent>(uid);
         EnsureComp<GhostTakeoverAvailableComponent>(uid);
 
-        var entityData = EntityManager.GetComponent<MetaDataComponent>(uid);
+        var entityData = Comp<MetaDataComponent>(uid);
         ghostRole.RoleName = entityData.EntityName;
         ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
     }
@@ -782,7 +783,7 @@ public sealed class EntityEffectSystem : EntitySystem
                 amt *= reagentArgs.Scale.Float();
             }
 
-            _bloodstream.TryModifyBleedAmount(args.Args.TargetEntity, amt, blood);
+            _bloodstream.TryModifyBleedAmount((args.Args.TargetEntity, blood), amt);
         }
     }
 
@@ -798,7 +799,7 @@ public sealed class EntityEffectSystem : EntitySystem
                 amt *= reagentArgs.Scale;
             }
 
-            _bloodstream.TryModifyBloodLevel(args.Args.TargetEntity, amt, blood);
+            _bloodstream.TryModifyBloodLevel((args.Args.TargetEntity, blood), amt);
         }
     }
 
@@ -849,13 +850,13 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecutePlantMutateChemicals(ref ExecuteEntityEffectEvent<PlantMutateChemicals> args)
     {
-        var plantholder = EntityManager.GetComponent<PlantHolderComponent>(args.Args.TargetEntity);
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
 
         if (plantholder.Seed == null)
             return;
 
         var chemicals = plantholder.Seed.Chemicals;
-        var randomChems = _protoManager.Index<WeightedRandomFillSolutionPrototype>("RandomPickBotanyReagent").Fills;
+        var randomChems = _protoManager.Index(RandomPickBotanyReagent).Fills;
 
         // Add a random amount of a random chemical to this set of chemicals
         if (randomChems != null)
@@ -883,7 +884,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecutePlantMutateConsumeGasses(ref ExecuteEntityEffectEvent<PlantMutateConsumeGasses> args)
     {
-        var plantholder = EntityManager.GetComponent<PlantHolderComponent>(args.Args.TargetEntity);
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
 
         if (plantholder.Seed == null)
             return;
@@ -905,7 +906,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecutePlantMutateExudeGasses(ref ExecuteEntityEffectEvent<PlantMutateExudeGasses> args)
     {
-        var plantholder = EntityManager.GetComponent<PlantHolderComponent>(args.Args.TargetEntity);
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
 
         if (plantholder.Seed == null)
             return;
@@ -927,7 +928,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecutePlantMutateHarvest(ref ExecuteEntityEffectEvent<PlantMutateHarvest> args)
     {
-        var plantholder = EntityManager.GetComponent<PlantHolderComponent>(args.Args.TargetEntity);
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
 
         if (plantholder.Seed == null)
             return;
@@ -940,7 +941,7 @@ public sealed class EntityEffectSystem : EntitySystem
 
     private void OnExecutePlantSpeciesChange(ref ExecuteEntityEffectEvent<PlantSpeciesChange> args)
     {
-        var plantholder = EntityManager.GetComponent<PlantHolderComponent>(args.Args.TargetEntity);
+        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
         if (plantholder.Seed == null)
             return;
 
diff --git a/Content.Server/EntityList/SpawnEntityListCommand.cs b/Content.Server/EntityList/SpawnEntityListCommand.cs
index 127e1ec47c..f70b0ccb07 100644
--- a/Content.Server/EntityList/SpawnEntityListCommand.cs
+++ b/Content.Server/EntityList/SpawnEntityListCommand.cs
@@ -7,17 +7,17 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.EntityList
 {
     [AdminCommand(AdminFlags.Spawn)]
-    public sealed class SpawnEntityListCommand : IConsoleCommand
+    public sealed class SpawnEntityListCommand : LocalizedEntityCommands
     {
-        public string Command => "spawnentitylist";
-        public string Description => "Spawns a list of entities around you";
-        public string Help => $"Usage: {Command} <entityListPrototypeId>";
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "spawnentitylist";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 1)
             {
-                shell.WriteError($"Invalid arguments.\n{Help}");
+                shell.WriteError(Loc.GetString($"shell-need-exactly-one-argument"));
                 return;
             }
 
@@ -33,24 +33,23 @@ namespace Content.Server.EntityList
                 return;
             }
 
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-
-            if (!prototypeManager.TryIndex(args[0], out EntityListPrototype? prototype))
+            if (!_prototypeManager.TryIndex(args[0], out EntityListPrototype? prototype))
             {
-                shell.WriteError($"No {nameof(EntityListPrototype)} found with id {args[0]}");
+                shell.WriteError(Loc.GetString($"cmd-spawnentitylist-failed",
+                    ("prototype", nameof(EntityListPrototype)),
+                    ("id", args[0])));
                 return;
             }
 
-            var entityManager = IoCManager.Resolve<IEntityManager>();
             var i = 0;
 
-            foreach (var entity in prototype.Entities(prototypeManager))
+            foreach (var entity in prototype.GetEntities(_prototypeManager))
             {
-                entityManager.SpawnEntity(entity.ID, entityManager.GetComponent<TransformComponent>(attached).Coordinates);
+                EntityManager.SpawnEntity(entity.ID, EntityManager.GetComponent<TransformComponent>(attached).Coordinates);
                 i++;
             }
 
-            shell.WriteLine($"Spawned {i} entities.");
+            shell.WriteLine(Loc.GetString($"cmd-spawnentitylist-success", ("count", i)));
         }
     }
 }
diff --git a/Content.Server/Examine/ExamineSystem.cs b/Content.Server/Examine/ExamineSystem.cs
index d7546e2eb0..480974e28f 100644
--- a/Content.Server/Examine/ExamineSystem.cs
+++ b/Content.Server/Examine/ExamineSystem.cs
@@ -51,7 +51,7 @@ namespace Content.Server.Examine
             var entity = GetEntity(request.NetEntity);
 
             if (session.AttachedEntity is not {Valid: true} playerEnt
-                || !EntityManager.EntityExists(entity))
+                || !Exists(entity))
             {
                 RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(
                     request.NetEntity, request.Id, _entityNotFoundMessage), channel);
diff --git a/Content.Server/Explosion/Components/ActiveTriggerOnTimedCollideComponent.cs b/Content.Server/Explosion/Components/ActiveTriggerOnTimedCollideComponent.cs
deleted file mode 100644
index 9d8073413c..0000000000
--- a/Content.Server/Explosion/Components/ActiveTriggerOnTimedCollideComponent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-[RegisterComponent]
-public sealed partial class ActiveTriggerOnTimedCollideComponent : Component { }
diff --git a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
deleted file mode 100644
index c01aeb91e5..0000000000
--- a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Disallows starting the timer by hand, must be stuck or triggered by a system using <c>StartTimer</c>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AutomatedTimerComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/AnchorOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/AnchorOnTriggerComponent.cs
deleted file mode 100644
index d83b57c188..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/AnchorOnTriggerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Will anchor the attached entity upon a <see cref="TriggerEvent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AnchorOnTriggerComponent : Component
-{
-    [DataField("removeOnTrigger")]
-    public bool RemoveOnTrigger = true;
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/DeleteOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/DeleteOnTriggerComponent.cs
deleted file mode 100644
index 9846cad84b..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/DeleteOnTriggerComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Will delete the attached entity upon a <see cref="TriggerEvent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class DeleteOnTriggerComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/GibOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/GibOnTriggerComponent.cs
deleted file mode 100644
index da58467659..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/GibOnTriggerComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Gibs on trigger, self explanatory.
-/// Also in case of an implant using this, gibs the implant user instead.
-/// </summary>
-[RegisterComponent]
-public sealed partial class GibOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Should gibbing also delete the owners items?
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("deleteItems")]
-    public bool DeleteItems = false;
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/SoundOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/SoundOnTriggerComponent.cs
deleted file mode 100644
index 7f9f16a227..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/SoundOnTriggerComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Will play sound from the attached entity upon a <see cref="TriggerEvent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SoundOnTriggerComponent : Component
-{
-    [DataField("removeOnTrigger")]
-    public bool RemoveOnTrigger = true;
-
-    [DataField("sound")]
-    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Effects/Grenades/supermatter_start.ogg");
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
deleted file mode 100644
index a63d6fcf66..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Explosion.Components.OnTrigger;
-
-/// <summary>
-/// After being triggered applies the specified components and runs triggers again.
-/// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
-public sealed partial class TwoStageTriggerComponent : Component
-{
-    /// <summary>
-    /// How long it takes for the second stage to be triggered.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("triggerDelay")]
-    public TimeSpan TriggerDelay = TimeSpan.FromSeconds(10);
-
-    /// <summary>
-    /// This list of components that will be added for the second trigger.
-    /// </summary>
-    [DataField("components", required: true)]
-    public ComponentRegistry SecondStageComponents = new();
-
-    [DataField("nextTriggerTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan? NextTriggerTime;
-
-    [DataField("triggered")]
-    public bool Triggered = false;
-
-    [DataField("ComponentsIsLoaded")]
-    public bool ComponentsIsLoaded = false;
-}
diff --git a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
index 58d687e025..20a73b46b5 100644
--- a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
+++ b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
@@ -45,4 +45,10 @@ public sealed partial class ProjectileGrenadeComponent : Component
     /// </summary>
     [DataField]
     public float MaxVelocity = 6f;
+
+    /// <summary>
+    /// The trigger key that will activate the grenade.
+    /// </summary>
+    [DataField]
+    public string TriggerKey = "timer";
 }
diff --git a/Content.Server/Explosion/Components/ShockOnTriggerComponent.cs b/Content.Server/Explosion/Components/ShockOnTriggerComponent.cs
deleted file mode 100644
index a553cc047a..0000000000
--- a/Content.Server/Explosion/Components/ShockOnTriggerComponent.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Content.Server.Explosion.EntitySystems;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// A component that electrocutes an entity having this component when a trigger is triggered.
-/// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
-[Access(typeof(TriggerSystem))]
-public sealed partial class ShockOnTriggerComponent : Component
-{
-    /// <summary>
-    /// The force of an electric shock when the trigger is triggered.
-    /// </summary>
-    [DataField]
-    public int Damage = 5;
-
-    /// <summary>
-    /// Duration of electric shock when the trigger is triggered.
-    /// </summary>
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(2);
-
-    /// <summary>
-    /// The minimum delay between repeating triggers.
-    /// </summary>
-    [DataField]
-    public TimeSpan Cooldown = TimeSpan.FromSeconds(4);
-
-    /// <summary>
-    /// When can the trigger run again?
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan NextTrigger = TimeSpan.Zero;
-}
diff --git a/Content.Server/Explosion/Components/SpawnOnTriggerComponent.cs b/Content.Server/Explosion/Components/SpawnOnTriggerComponent.cs
deleted file mode 100644
index c28ec7faeb..0000000000
--- a/Content.Server/Explosion/Components/SpawnOnTriggerComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Spawns a protoype when triggered.
-/// </summary>
-[RegisterComponent, Access(typeof(TriggerSystem))]
-public sealed partial class SpawnOnTriggerComponent : Component
-{
-    /// <summary>
-    ///     The prototype to spawn.
-    /// </summary>
-    [DataField(required: true)]
-    public EntProtoId Proto = string.Empty;
-
-    /// <summary>
-    ///     Use MapCoordinates for spawning?
-    ///     Set to true if you don't want the new entity parented to the spawner.
-    /// </summary>
-    [DataField]
-    public bool mapCoords;
-}
diff --git a/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs b/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs
deleted file mode 100644
index 9adc6dab87..0000000000
--- a/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// Sends a trigger when signal is received.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class TimerStartOnSignalComponent : Component
-    {
-        [DataField("port", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-        public string Port = "Timer";
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnActivateComponent.cs b/Content.Server/Explosion/Components/TriggerOnActivateComponent.cs
deleted file mode 100644
index 1531c7425e..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnActivateComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers on click.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnActivateComponent : Component { }
diff --git a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs b/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
deleted file mode 100644
index 28c2ed8c34..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Triggers when colliding with another entity.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnCollideComponent : Component
-{
-    /// <summary>
-    ///     The fixture with which to collide.
-    /// </summary>
-    [DataField(required: true)]
-    public string FixtureID = string.Empty;
-
-    /// <summary>
-    ///     Doesn't trigger if the other colliding fixture is nonhard.
-    /// </summary>
-    [DataField]
-    public bool IgnoreOtherNonHard = true;
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnMobstateChangeComponent.cs b/Content.Server/Explosion/Components/TriggerOnMobstateChangeComponent.cs
deleted file mode 100644
index a6cdda247c..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnMobstateChangeComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Mobs;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Use where you want something to trigger on mobstate change
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnMobstateChangeComponent : Component
-{
-    /// <summary>
-    /// What state should trigger this?
-    /// </summary>
-    [ViewVariables]
-    [DataField("mobState", required: true)]
-    public List<MobState> MobState = new();
-
-    /// <summary>
-    /// If true, prevents suicide attempts for the trigger to prevent cheese.
-    /// </summary>
-    [ViewVariables]
-    [DataField("preventSuicide")]
-    public bool PreventSuicide = false;
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs b/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
deleted file mode 100644
index 4f3fb4754e..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Explosion;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Explosion.Components
-{
-
-    /// <summary>
-    /// Raises a <see cref="TriggerEvent"/> whenever an entity collides with a fixture attached to the owner of this component.
-    /// </summary>
-    [RegisterComponent, AutoGenerateComponentPause]
-    public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximityComponent
-    {
-        public const string FixtureID = "trigger-on-proximity-fixture";
-
-        [ViewVariables]
-        public readonly Dictionary<EntityUid, PhysicsComponent> Colliding = new();
-
-        /// <summary>
-        /// What is the shape of the proximity fixture?
-        /// </summary>
-        [ViewVariables]
-        [DataField("shape")]
-        public IPhysShape Shape = new PhysShapeCircle(2f);
-
-        /// <summary>
-        /// How long the the proximity trigger animation plays for.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("animationDuration")]
-        public TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.6f);
-
-        /// <summary>
-        /// Whether the entity needs to be anchored for the proximity to work.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("requiresAnchored")]
-        public bool RequiresAnchored = true;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("enabled")]
-        public bool Enabled = true;
-
-        /// <summary>
-        /// The minimum delay between repeating triggers.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("cooldown")]
-        public TimeSpan Cooldown = TimeSpan.FromSeconds(5);
-
-        /// <summary>
-        /// When can the trigger run again?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("nextTrigger", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        [AutoPausedField]
-        public TimeSpan NextTrigger = TimeSpan.Zero;
-
-        /// <summary>
-        /// When will the visual state be updated again after activation?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("nextVisualUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        [AutoPausedField]
-        public TimeSpan NextVisualUpdate = TimeSpan.Zero;
-
-        /// <summary>
-        /// What speed should the other object be moving at to trigger the proximity fixture?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("triggerSpeed")]
-        public float TriggerSpeed = 3.5f;
-
-        /// <summary>
-        /// If this proximity is triggered should we continually repeat it?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("repeating")]
-        public bool Repeating = true;
-
-        /// <summary>
-        /// What layer is the trigger fixture on?
-        /// </summary>
-        [ViewVariables]
-        [DataField("layer", customTypeSerializer: typeof(FlagSerializer<CollisionLayer>))]
-        public int Layer = (int) (CollisionGroup.MidImpassable | CollisionGroup.LowImpassable | CollisionGroup.HighImpassable);
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnSignalComponent.cs b/Content.Server/Explosion/Components/TriggerOnSignalComponent.cs
deleted file mode 100644
index fb7495612c..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnSignalComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// Sends a trigger when signal is received.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class TriggerOnSignalComponent : Component
-    {
-        [DataField("port", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-        public string Port = "Trigger";
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnSlipComponent.cs b/Content.Server/Explosion/Components/TriggerOnSlipComponent.cs
deleted file mode 100644
index 16632b9b72..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnSlipComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-[RegisterComponent]
-public sealed partial class TriggerOnSlipComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnSpawnComponent.cs b/Content.Server/Explosion/Components/TriggerOnSpawnComponent.cs
deleted file mode 100644
index 704ff410cd..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnSpawnComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// calls the trigger when the object is initialized
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnSpawnComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnStepTriggerComponent.cs b/Content.Server/Explosion/Components/TriggerOnStepTriggerComponent.cs
deleted file mode 100644
index 49e99ff785..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnStepTriggerComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// This is used for entities that want the more generic 'trigger' behavior after a step trigger occurs.
-/// Not done by default, since it's not useful for everything and might cause weird behavior. But it is useful for a lot of stuff like mousetraps.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnStepTriggerComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnTimedCollideComponent.cs b/Content.Server/Explosion/Components/TriggerOnTimedCollideComponent.cs
deleted file mode 100644
index d53bcbcc5d..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnTimedCollideComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers when the entity is overlapped for the specified duration.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnTimedCollideComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("threshold")]
-    public float Threshold;
-
-    /// <summary>
-    /// A collection of entities that are colliding with this, and their own unique accumulator.
-    /// </summary>
-    [ViewVariables]
-    public readonly Dictionary<EntityUid, float> Colliding = new();
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnUseComponent.cs b/Content.Server/Explosion/Components/TriggerOnUseComponent.cs
deleted file mode 100644
index 2b44d2fbac..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnUseComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers on use in hand.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnUseComponent : Component { }
diff --git a/Content.Server/Explosion/Components/TriggerOnVoiceComponent.cs b/Content.Server/Explosion/Components/TriggerOnVoiceComponent.cs
deleted file mode 100644
index 7d07f496d0..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnVoiceComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// Sends a trigger when the keyphrase is heard
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class TriggerOnVoiceComponent : Component
-    {
-        public bool IsListening => IsRecording || !string.IsNullOrWhiteSpace(KeyPhrase);
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("keyPhrase")]
-        public string? KeyPhrase;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("listenRange")]
-        public int ListenRange { get; private set; } = 4;
-
-        [DataField("isRecording")]
-        public bool IsRecording = false;
-
-        [DataField("minLength")]
-        public int MinLength = 3;
-
-        [DataField("maxLength")]
-        public int MaxLength = 50;
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerWhenEmptyComponent.cs b/Content.Server/Explosion/Components/TriggerWhenEmptyComponent.cs
deleted file mode 100644
index ad39b9c515..0000000000
--- a/Content.Server/Explosion/Components/TriggerWhenEmptyComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers a gun when attempting to shoot while it's empty
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerWhenEmptyComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs b/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs
deleted file mode 100644
index 80becf17cc..0000000000
--- a/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Whitelist;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Checks if the user of a Trigger satisfies a whitelist and blacklist condition.
-/// Cancels the trigger otherwise.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerWhitelistComponent : Component
-{
-    /// <summary>
-    /// Whitelist for what entites can cause this trigger.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Whitelist;
-
-    /// <summary>
-    /// Blacklist for what entites can cause this trigger.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Blacklist;
-}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
index adc2e14f69..af004e112e 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
@@ -66,9 +66,9 @@ public sealed partial class ExplosionSystem
         if (!_airtightMap.ContainsKey(gridId))
             _airtightMap[gridId] = new();
 
-        query ??= EntityManager.GetEntityQuery<AirtightComponent>();
-        var damageQuery = EntityManager.GetEntityQuery<DamageableComponent>();
-        var destructibleQuery = EntityManager.GetEntityQuery<DestructibleComponent>();
+        query ??= GetEntityQuery<AirtightComponent>();
+        var damageQuery = GetEntityQuery<DamageableComponent>();
+        var destructibleQuery = GetEntityQuery<DestructibleComponent>();
         var anchoredEnumerator = _mapSystem.GetAnchoredEntitiesEnumerator(gridId, grid, tile);
 
         while (anchoredEnumerator.MoveNext(out var uid))
@@ -99,7 +99,7 @@ public sealed partial class ExplosionSystem
         if (!airtight.AirBlocked)
             return;
 
-        if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform) || !transform.Anchored)
+        if (!TryComp(uid, out TransformComponent? transform) || !transform.Anchored)
             return;
 
         if (!TryComp<MapGridComponent>(transform.GridUid, out var grid))
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index b067b2b626..8515e1af42 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -102,7 +102,7 @@ public sealed partial class ExplosionSystem
                 continue;
             }
 
-            var xforms = EntityManager.GetEntityQuery<TransformComponent>();
+            var xforms = GetEntityQuery<TransformComponent>();
             var xform = xforms.GetComponent(gridToTransform);
             var  (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = _transformSystem.GetWorldPositionRotationMatrixWithInv(xform, xforms);
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 3f08532e37..b61f78e909 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -913,10 +913,10 @@ sealed class Explosion
 /// <summary>
 /// Data needed to spawn an explosion with <see cref="ExplosionSystem.SpawnExplosion"/>.
 /// </summary>
-public sealed class QueuedExplosion
+public sealed class QueuedExplosion(ExplosionPrototype proto)
 {
     public MapCoordinates Epicenter;
-    public ExplosionPrototype Proto = new();
+    public ExplosionPrototype Proto = proto;
     public float TotalIntensity, Slope, MaxTileIntensity, TileBreakScale;
     public int MaxTileBreak;
     public bool CanCreateVacuum;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 4ffe34748b..bc17eeee65 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -71,14 +71,13 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
     ///     find errors. However some components, like rogue arrows, or some commands like the admin-smite need to have
     ///     a "default" option specified outside of yaml data-fields. Hence this const string.
     /// </remarks>
-    [ValidatePrototypeId<ExplosionPrototype>]
-    public const string DefaultExplosionPrototypeId = "Default";
+    public static readonly ProtoId<ExplosionPrototype> DefaultExplosionPrototypeId = "Default";
 
     public override void Initialize()
     {
         base.Initialize();
 
-        DebugTools.Assert(_prototypeManager.HasIndex<ExplosionPrototype>(DefaultExplosionPrototypeId));
+        DebugTools.Assert(_prototypeManager.HasIndex(DefaultExplosionPrototypeId));
 
         // handled in ExplosionSystem.GridMap.cs
         SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
@@ -168,7 +167,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
             user);
 
         if (explosive.DeleteAfterExplosion ?? delete)
-            EntityManager.QueueDeleteEntity(uid);
+            QueueDel(uid);
     }
 
     /// <summary>
@@ -307,10 +306,9 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
             return;
         }
 
-        var boom = new QueuedExplosion()
+        var boom = new QueuedExplosion(type)
         {
             Epicenter = epicenter,
-            Proto = type,
             TotalIntensity = totalIntensity,
             Slope = slope,
             MaxTileIntensity = maxTileIntensity,
diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
index dbb96e06a5..4b93f22cd1 100644
--- a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Explosion.Components;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.Trigger;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -45,6 +46,9 @@ public sealed class ProjectileGrenadeSystem : EntitySystem
     /// </summary>
     private void OnFragTrigger(Entity<ProjectileGrenadeComponent> entity, ref TriggerEvent args)
     {
+        if (args.Key != entity.Comp.TriggerKey)
+            return;
+
         FragmentIntoProjectiles(entity.Owner, entity.Comp);
         args.Handled = true;
     }
@@ -58,6 +62,11 @@ public sealed class ProjectileGrenadeSystem : EntitySystem
         var grenadeCoord = _transformSystem.GetMapCoordinates(uid);
         var shootCount = 0;
         var totalCount = component.Container.ContainedEntities.Count + component.UnspawnedCount;
+
+        // Just in case
+        if (totalCount == 0)
+            return;
+
         var segmentAngle = 360 / totalCount;
 
         while (TrySpawnContents(grenadeCoord, component, out var contentUid))
diff --git a/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs
deleted file mode 100644
index ae3f84f843..0000000000
--- a/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-/// <summary>
-/// Releases a gas mixture to the atmosphere when triggered.
-/// Can also release gas over a set timespan to prevent trolling people
-/// with the instant-wall-of-pressure-inator.
-/// </summary>
-public sealed partial class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ReleaseGasOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    /// <summary>
-    /// Shrimply sets the component to active when triggered, allowing it to release over time.
-    /// </summary>
-    private void OnTrigger(Entity<ReleaseGasOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        ent.Comp.Active = true;
-        ent.Comp.NextReleaseTime = _timing.CurTime;
-        ent.Comp.StartingTotalMoles = ent.Comp.Air.TotalMoles;
-        UpdateAppearance(ent.Owner, true);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var curTime = _timing.CurTime;
-        var query = EntityQueryEnumerator<ReleaseGasOnTriggerComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (!comp.Active || comp.NextReleaseTime > curTime)
-                continue;
-
-            var giverGasMix = comp.Air.Remove(comp.StartingTotalMoles * comp.RemoveFraction);
-            var environment = _atmosphereSystem.GetContainingMixture(uid, false, true);
-
-            if (environment == null)
-            {
-                UpdateAppearance(uid, false);
-                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
-                continue;
-            }
-
-            _atmosphereSystem.Merge(environment, giverGasMix);
-            comp.NextReleaseTime += comp.ReleaseInterval;
-
-            if (comp.PressureLimit != 0 && environment.Pressure >= comp.PressureLimit ||
-                comp.Air.TotalMoles <= 0)
-            {
-                UpdateAppearance(uid, false);
-                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
-                continue;
-            }
-        }
-    }
-
-    private void UpdateAppearance(Entity<AppearanceComponent?> entity, bool state)
-    {
-        if (!Resolve(entity, ref entity.Comp, false))
-            return;
-
-        _appearance.SetData(entity, ReleaseGasOnTriggerVisuals.Key, state);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs
deleted file mode 100644
index 9e595c5d9e..0000000000
--- a/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
-using Content.Shared.RepulseAttract;
-using Content.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed class RepulseAttractOnTriggerSystem : SharedRepulseAttractOnTriggerSystem
-{
-    [Dependency] private readonly RepulseAttractSystem _repulse = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly UseDelaySystem _delay = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SharedRepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<SharedRepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (_delay.IsDelayed(ent.Owner))
-            return;
-
-        var position = _transform.GetMapCoordinates(ent);
-        _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
index 2657ba3449..5f7df28beb 100644
--- a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
@@ -1,5 +1,8 @@
 using Content.Shared.Explosion.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Systems;
+using Content.Shared.Trigger.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -15,6 +18,7 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly TriggerSystem _trigger = default!;
 
     public override void Initialize()
     {
@@ -30,6 +34,9 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
     /// </summary>
     private void OnScatteringTrigger(Entity<ScatteringGrenadeComponent> entity, ref TriggerEvent args)
     {
+        if (args.Key != entity.Comp.TriggerKey)
+            return;
+
         entity.Comp.IsTriggered = true;
         args.Handled = true;
     }
@@ -76,13 +83,12 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
 
                     _throwingSystem.TryThrow(contentUid, direction, component.Velocity);
 
-                    if (component.TriggerContents)
+                    if (component.TriggerContents && TryComp<TimerTriggerComponent>(contentUid, out var contentTimer))
                     {
                         additionalIntervalDelay += _random.NextFloat(component.IntervalBetweenTriggersMin, component.IntervalBetweenTriggersMax);
-                        var contentTimer = EnsureComp<ActiveTimerTriggerComponent>(contentUid);
-                        contentTimer.TimeRemaining = component.DelayBeforeTriggerContents + additionalIntervalDelay;
-                        var ev = new ActiveTimerTriggerEvent(contentUid, uid);
-                        RaiseLocalEvent(contentUid, ref ev);
+
+                        _trigger.SetDelay((contentUid, contentTimer), TimeSpan.FromSeconds(component.DelayBeforeTriggerContents + additionalIntervalDelay));
+                        _trigger.ActivateTimerTrigger((contentUid, contentTimer));
                     }
                 }
 
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
deleted file mode 100644
index 31b4746ec2..0000000000
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Content.Shared.Explosion.Components;
-using Content.Shared.Explosion.EntitySystems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Spreader;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Maps;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-/// <summary>
-/// Handles creating smoke when <see cref="SmokeOnTriggerComponent"/> is triggered.
-/// </summary>
-public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
-{
-    [Dependency] private readonly IMapManager _mapMan = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
-    [Dependency] private readonly SmokeSystem _smoke = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
-    [Dependency] private readonly SpreaderSystem _spreader = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SmokeOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(EntityUid uid, SmokeOnTriggerComponent comp, TriggerEvent args)
-    {
-        var xform = Transform(uid);
-        var mapCoords = _transform.GetMapCoordinates(uid, xform);
-        if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-            !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef) ||
-            tileRef.Tile.IsEmpty)
-        {
-            return;
-        }
-
-        if (_spreader.RequiresFloorToSpread(comp.SmokePrototype.ToString()) && tileRef.Tile.IsSpace())
-            return;
-
-        var coords = _map.MapToGrid(gridUid, mapCoords);
-        var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
-        if (!TryComp<SmokeComponent>(ent, out var smoke))
-        {
-            Log.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
-            Del(ent);
-            return;
-        }
-
-        _smoke.StartSmoke(ent, comp.Solution, comp.Duration, comp.SpreadAmount, smoke);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
deleted file mode 100644
index d06e9fa1c2..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using Content.Server.Explosion.Components;
-using Content.Shared.Examine;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Popups;
-using Content.Shared.Sticky;
-using Content.Shared.Verbs;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed partial class TriggerSystem
-{
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-
-    private void InitializeOnUse()
-    {
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, UseInHandEvent>(OnTimerUse);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, EntityStuckEvent>(OnStuck);
-        SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomTimerTriggerMapInit);
-    }
-
-    private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, ref EntityStuckEvent args)
-    {
-        if (!component.StartOnStick)
-            return;
-
-        StartTimer((uid, component), args.User);
-    }
-
-    private void OnExamined(EntityUid uid, OnUseTimerTriggerComponent component, ExaminedEvent args)
-    {
-        if (args.IsInDetailsRange && component.Examinable)
-            args.PushText(Loc.GetString("examine-trigger-timer", ("time", component.Delay)));
-    }
-
-    /// <summary>
-    ///     Add an alt-click interaction that cycles through delays.
-    /// </summary>
-    private void OnGetAltVerbs(EntityUid uid, OnUseTimerTriggerComponent component, GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
-            return;
-
-        if (component.UseVerbInstead)
-        {
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString("verb-start-detonation"),
-                Act = () => StartTimer((uid, component), args.User),
-                Priority = 2
-            });
-        }
-
-        if (component.AllowToggleStartOnStick)
-        {
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString("verb-toggle-start-on-stick"),
-                Act = () => ToggleStartOnStick(uid, args.User, component)
-            });
-        }
-
-        if (component.DelayOptions == null || component.DelayOptions.Count == 1)
-            return;
-
-        args.Verbs.Add(new AlternativeVerb()
-        {
-            Category = TimerOptions,
-            Text = Loc.GetString("verb-trigger-timer-cycle"),
-            Act = () => CycleDelay(component, args.User),
-            Priority = 1
-        });
-
-        foreach (var option in component.DelayOptions)
-        {
-            if (MathHelper.CloseTo(option, component.Delay))
-            {
-                args.Verbs.Add(new AlternativeVerb()
-                {
-                    Category = TimerOptions,
-                    Text = Loc.GetString("verb-trigger-timer-set-current", ("time", option)),
-                    Disabled = true,
-                    Priority = (int) (-100 * option)
-                });
-                continue;
-            }
-
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Category = TimerOptions,
-                Text = Loc.GetString("verb-trigger-timer-set", ("time", option)),
-                Priority = (int) (-100 * option),
-
-                Act = () =>
-                {
-                    component.Delay = option;
-                    _popupSystem.PopupEntity(Loc.GetString("popup-trigger-timer-set", ("time", option)), args.User, args.User);
-                },
-            });
-        }
-    }
-
-    private void OnRandomTimerTriggerMapInit(Entity<RandomTimerTriggerComponent> ent, ref MapInitEvent args)
-    {
-        var (_, comp) = ent;
-
-        if (!TryComp<OnUseTimerTriggerComponent>(ent, out var timerTriggerComp))
-            return;
-
-        timerTriggerComp.Delay = _random.NextFloat(comp.Min, comp.Max);
-    }
-
-    private void CycleDelay(OnUseTimerTriggerComponent component, EntityUid user)
-    {
-        if (component.DelayOptions == null || component.DelayOptions.Count == 1)
-            return;
-
-        // This is somewhat inefficient, but its good enough. This is run rarely, and the lists should be short.
-
-        component.DelayOptions.Sort();
-
-        if (component.DelayOptions[^1] <= component.Delay)
-        {
-            component.Delay = component.DelayOptions[0];
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-timer-set", ("time", component.Delay)), user, user);
-            return;
-        }
-
-        foreach (var option in component.DelayOptions)
-        {
-            if (option > component.Delay)
-            {
-                component.Delay = option;
-                _popupSystem.PopupEntity(Loc.GetString("popup-trigger-timer-set", ("time", option)), user, user);
-                return;
-            }
-        }
-    }
-
-    private void ToggleStartOnStick(EntityUid grenade, EntityUid user, OnUseTimerTriggerComponent comp)
-    {
-        if (comp.StartOnStick)
-        {
-            comp.StartOnStick = false;
-            _popupSystem.PopupEntity(Loc.GetString("popup-start-on-stick-off"), grenade, user);
-        }
-        else
-        {
-            comp.StartOnStick = true;
-            _popupSystem.PopupEntity(Loc.GetString("popup-start-on-stick-on"), grenade, user);
-        }
-    }
-
-    private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, UseInHandEvent args)
-    {
-        if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
-            return;
-
-        if (component.DoPopup)
-            _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
-
-        StartTimer((uid, component), args.User);
-
-        args.Handled = true;
-    }
-
-    public static VerbCategory TimerOptions = new("verb-categories-timer", "/Textures/Interface/VerbIcons/clock.svg.192dpi.png");
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
deleted file mode 100644
index b2f26309cf..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Content.Server.Explosion.Components;
-using Content.Shared.Trigger;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Utility;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed partial class TriggerSystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    private void InitializeProximity()
-    {
-        SubscribeLocalEvent<TriggerOnProximityComponent, StartCollideEvent>(OnProximityStartCollide);
-        SubscribeLocalEvent<TriggerOnProximityComponent, EndCollideEvent>(OnProximityEndCollide);
-        SubscribeLocalEvent<TriggerOnProximityComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<TriggerOnProximityComponent, ComponentShutdown>(OnProximityShutdown);
-        // Shouldn't need re-anchoring.
-        SubscribeLocalEvent<TriggerOnProximityComponent, AnchorStateChangedEvent>(OnProximityAnchor);
-    }
-
-    private void OnProximityAnchor(EntityUid uid, TriggerOnProximityComponent component, ref AnchorStateChangedEvent args)
-    {
-        component.Enabled = !component.RequiresAnchored ||
-                            args.Anchored;
-
-        SetProximityAppearance(uid, component);
-
-        if (!component.Enabled)
-        {
-            component.Colliding.Clear();
-        }
-        // Re-check for contacts as we cleared them.
-        else if (TryComp<PhysicsComponent>(uid, out var body))
-        {
-            _broadphase.RegenerateContacts((uid, body));
-        }
-    }
-
-    private void OnProximityShutdown(EntityUid uid, TriggerOnProximityComponent component, ComponentShutdown args)
-    {
-        component.Colliding.Clear();
-    }
-
-    private void OnMapInit(EntityUid uid, TriggerOnProximityComponent component, MapInitEvent args)
-    {
-        component.Enabled = !component.RequiresAnchored ||
-                            Transform(uid).Anchored;
-
-        SetProximityAppearance(uid, component);
-
-        if (!TryComp<PhysicsComponent>(uid, out var body))
-            return;
-
-        _fixtures.TryCreateFixture(
-            uid,
-            component.Shape,
-            TriggerOnProximityComponent.FixtureID,
-            hard: false,
-            body: body,
-            collisionLayer: component.Layer);
-    }
-
-    private void OnProximityStartCollide(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
-    {
-        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
-            return;
-
-        component.Colliding[args.OtherEntity] = args.OtherBody;
-    }
-
-    private static void OnProximityEndCollide(EntityUid uid, TriggerOnProximityComponent component, ref EndCollideEvent args)
-    {
-        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
-            return;
-
-        component.Colliding.Remove(args.OtherEntity);
-    }
-
-    private void SetProximityAppearance(EntityUid uid, TriggerOnProximityComponent component)
-    {
-        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
-        {
-            _appearance.SetData(uid, ProximityTriggerVisualState.State, component.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off, appearance);
-        }
-    }
-
-    private void Activate(EntityUid uid, EntityUid user, TriggerOnProximityComponent component)
-    {
-        DebugTools.Assert(component.Enabled);
-
-        var curTime = _timing.CurTime;
-
-        if (!component.Repeating)
-        {
-            component.Enabled = false;
-            component.Colliding.Clear();
-        }
-        else
-        {
-            component.NextTrigger = curTime + component.Cooldown;
-        }
-
-        // Queue a visual update for when the animation is complete.
-        component.NextVisualUpdate = curTime + component.AnimationDuration;
-
-        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
-        {
-            _appearance.SetData(uid, ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active, appearance);
-        }
-
-        Trigger(uid, user);
-    }
-
-    private void UpdateProximity()
-    {
-        var curTime = _timing.CurTime;
-
-        var query = EntityQueryEnumerator<TriggerOnProximityComponent>();
-        while (query.MoveNext(out var uid, out var trigger))
-        {
-            if (curTime >= trigger.NextVisualUpdate)
-            {
-                // Update the visual state once the animation is done.
-                trigger.NextVisualUpdate = TimeSpan.MaxValue;
-                SetProximityAppearance(uid, trigger);
-            }
-
-            if (!trigger.Enabled)
-                continue;
-
-            if (curTime < trigger.NextTrigger)
-                // The trigger's on cooldown.
-                continue;
-
-            // Check for anything colliding and moving fast enough.
-            foreach (var (collidingUid, colliding) in trigger.Colliding)
-            {
-                if (Deleted(collidingUid))
-                    continue;
-
-                if (colliding.LinearVelocity.Length() < trigger.TriggerSpeed)
-                    continue;
-
-                // Trigger!
-                Activate(uid, collidingUid, trigger);
-                break;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs
deleted file mode 100644
index 99e8c97d53..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.DeviceLinking.Systems;
-using Content.Server.Explosion.Components;
-using Content.Shared.DeviceLinking.Events;
-
-namespace Content.Server.Explosion.EntitySystems
-{
-    public sealed partial class TriggerSystem
-    {
-        [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
-        private void InitializeSignal()
-        {
-            SubscribeLocalEvent<TriggerOnSignalComponent,SignalReceivedEvent>(OnSignalReceived);
-            SubscribeLocalEvent<TriggerOnSignalComponent,ComponentInit>(OnInit);
-
-            SubscribeLocalEvent<TimerStartOnSignalComponent,SignalReceivedEvent>(OnTimerSignalReceived);
-            SubscribeLocalEvent<TimerStartOnSignalComponent,ComponentInit>(OnTimerSignalInit);
-        }
-
-        private void OnSignalReceived(EntityUid uid, TriggerOnSignalComponent component, ref SignalReceivedEvent args)
-        {
-            if (args.Port != component.Port)
-                return;
-
-            Trigger(uid, args.Trigger);
-        }
-        private void OnInit(EntityUid uid, TriggerOnSignalComponent component, ComponentInit args)
-        {
-            _signalSystem.EnsureSinkPorts(uid, component.Port);
-        }
-
-        private void OnTimerSignalReceived(EntityUid uid, TimerStartOnSignalComponent component, ref SignalReceivedEvent args)
-        {
-            if (args.Port != component.Port)
-                return;
-
-            StartTimer(uid, args.Trigger);
-        }
-        private void OnTimerSignalInit(EntityUid uid, TimerStartOnSignalComponent component, ComponentInit args)
-        {
-            _signalSystem.EnsureSinkPorts(uid, component.Port);
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
deleted file mode 100644
index ea10b7c69b..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Linq;
-using Content.Server.Explosion.Components;
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Events;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed partial class TriggerSystem
-{
-    private void InitializeTimedCollide()
-    {
-        SubscribeLocalEvent<TriggerOnTimedCollideComponent, StartCollideEvent>(OnTimerCollide);
-        SubscribeLocalEvent<TriggerOnTimedCollideComponent, EndCollideEvent>(OnTimerEndCollide);
-        SubscribeLocalEvent<TriggerOnTimedCollideComponent, ComponentRemove>(OnComponentRemove);
-    }
-
-    private void OnTimerCollide(EntityUid uid, TriggerOnTimedCollideComponent component, ref StartCollideEvent args)
-    {
-        //Ensures the entity trigger will have an active component
-        EnsureComp<ActiveTriggerOnTimedCollideComponent>(uid);
-        var otherUID = args.OtherEntity;
-        if (component.Colliding.ContainsKey(otherUID))
-            return;
-        component.Colliding.Add(otherUID, 0);
-    }
-
-    private void OnTimerEndCollide(EntityUid uid, TriggerOnTimedCollideComponent component, ref EndCollideEvent args)
-    {
-        var otherUID = args.OtherEntity;
-        component.Colliding.Remove(otherUID);
-
-        if (component.Colliding.Count == 0 && HasComp<ActiveTriggerOnTimedCollideComponent>(uid))
-            RemComp<ActiveTriggerOnTimedCollideComponent>(uid);
-    }
-
-    private void OnComponentRemove(EntityUid uid, TriggerOnTimedCollideComponent component, ComponentRemove args)
-    {
-        if (HasComp<ActiveTriggerOnTimedCollideComponent>(uid))
-            RemComp<ActiveTriggerOnTimedCollideComponent>(uid);
-    }
-
-    private void UpdateTimedCollide(float frameTime)
-    {
-        var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
-        while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
-        {
-            foreach (var (collidingEntity, collidingTimer) in triggerOnTimedCollide.Colliding)
-            {
-                triggerOnTimedCollide.Colliding[collidingEntity] += frameTime;
-                if (collidingTimer > triggerOnTimedCollide.Threshold)
-                {
-                    RaiseLocalEvent(uid, new TriggerEvent(uid, collidingEntity), true);
-                    triggerOnTimedCollide.Colliding[collidingEntity] -= triggerOnTimedCollide.Threshold;
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
deleted file mode 100644
index a96508e37c..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Content.Server.Explosion.Components;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Verbs;
-
-namespace Content.Server.Explosion.EntitySystems
-{
-    public sealed partial class TriggerSystem
-    {
-        private void InitializeVoice()
-        {
-            SubscribeLocalEvent<TriggerOnVoiceComponent, ComponentInit>(OnVoiceInit);
-            SubscribeLocalEvent<TriggerOnVoiceComponent, ExaminedEvent>(OnVoiceExamine);
-            SubscribeLocalEvent<TriggerOnVoiceComponent, GetVerbsEvent<AlternativeVerb>>(OnVoiceGetAltVerbs);
-            SubscribeLocalEvent<TriggerOnVoiceComponent, ListenEvent>(OnListen);
-        }
-
-        private void OnVoiceInit(EntityUid uid, TriggerOnVoiceComponent component, ComponentInit args)
-        {
-            if (component.IsListening)
-                EnsureComp<ActiveListenerComponent>(uid).Range = component.ListenRange;
-            else
-                RemCompDeferred<ActiveListenerComponent>(uid);
-        }
-
-        private void OnListen(Entity<TriggerOnVoiceComponent> ent, ref ListenEvent args)
-        {
-            var component = ent.Comp;
-            var message = args.Message.Trim();
-
-            if (component.IsRecording)
-            {
-                var ev = new ListenAttemptEvent(args.Source);
-                RaiseLocalEvent(ent, ev);
-
-                if (ev.Cancelled)
-                    return;
-
-                if (message.Length >= component.MinLength && message.Length <= component.MaxLength)
-                    FinishRecording(ent, args.Source, args.Message);
-                else if (message.Length > component.MaxLength)
-                    _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-record-failed-too-long"), ent);
-                else if (message.Length < component.MinLength)
-                    _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-record-failed-too-short"), ent);
-
-                return;
-            }
-
-            if (!string.IsNullOrWhiteSpace(component.KeyPhrase) && message.IndexOf(component.KeyPhrase, StringComparison.InvariantCultureIgnoreCase) is var index and >= 0 )
-            {
-                _adminLogger.Add(LogType.Trigger, LogImpact.Medium,
-                        $"A voice-trigger on {ToPrettyString(ent):entity} was triggered by {ToPrettyString(args.Source):speaker} speaking the key-phrase {component.KeyPhrase}.");
-                Trigger(ent, args.Source);
-
-                var messageWithoutPhrase = message.Remove(index, component.KeyPhrase.Length).Trim();
-
-                var voice = new VoiceTriggeredEvent(args.Source, message, messageWithoutPhrase);
-                RaiseLocalEvent(ent, ref voice);
-            }
-        }
-
-        private void OnVoiceGetAltVerbs(Entity<TriggerOnVoiceComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess)
-                return;
-
-            var component = ent.Comp;
-
-            var @event = args;
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString(component.IsRecording ? "verb-trigger-voice-stop" : "verb-trigger-voice-record"),
-                Act = () =>
-                {
-                    if (component.IsRecording)
-                        StopRecording(ent);
-                    else
-                        StartRecording(ent, @event.User);
-                },
-                Priority = 1
-            });
-
-            if (string.IsNullOrWhiteSpace(component.KeyPhrase))
-                return;
-
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString("verb-trigger-voice-clear"),
-                Act = () =>
-                {
-                    component.KeyPhrase = null;
-                    component.IsRecording = false;
-                    RemComp<ActiveListenerComponent>(ent);
-                }
-            });
-        }
-
-        public void StartRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid user)
-        {
-            var component = ent.Comp;
-            component.IsRecording = true;
-            EnsureComp<ActiveListenerComponent>(ent).Range = component.ListenRange;
-
-            _adminLogger.Add(LogType.Trigger, LogImpact.Low,
-                    $"A voice-trigger on {ToPrettyString(ent):entity} has started recording. User: {ToPrettyString(user):user}");
-
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-start-recording"), ent);
-        }
-
-        public void StopRecording(Entity<TriggerOnVoiceComponent> ent)
-        {
-            var component = ent.Comp;
-            component.IsRecording = false;
-            if (string.IsNullOrWhiteSpace(component.KeyPhrase))
-                RemComp<ActiveListenerComponent>(ent);
-
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-stop-recording"), ent);
-        }
-
-        public void FinishRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid source, string message)
-        {
-            var component = ent.Comp;
-            component.KeyPhrase = message;
-            component.IsRecording = false;
-
-            _adminLogger.Add(LogType.Trigger, LogImpact.Low,
-                    $"A voice-trigger on {ToPrettyString(ent):entity} has recorded a new keyphrase: '{component.KeyPhrase}'. Recorded from {ToPrettyString(source):speaker}");
-
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-recorded", ("keyphrase", component.KeyPhrase!)), ent);
-        }
-
-        private void OnVoiceExamine(EntityUid uid, TriggerOnVoiceComponent component, ExaminedEvent args)
-        {
-            if (args.IsInDetailsRange)
-            {
-                args.PushText(string.IsNullOrWhiteSpace(component.KeyPhrase)
-                    ? Loc.GetString("trigger-voice-uninitialized")
-                    : Loc.GetString("examine-trigger-voice", ("keyphrase", component.KeyPhrase)));
-            }
-        }
-    }
-}
-
-
-/// <summary>
-///    Raised when a voice trigger is activated, containing the message that triggered it.
-/// </summary>
-/// <param name="Source"> The EntityUid of the entity sending the message</param>
-/// <param name="Message"> The contents of the message</param>
-/// <param name="MessageWithoutPhrase"> The message without the phrase that triggered it.</param>
-[ByRefEvent]
-public readonly record struct VoiceTriggeredEvent(EntityUid Source, string Message, string MessageWithoutPhrase);
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
deleted file mode 100644
index ca41285972..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
-using Content.Server.Explosion.Components;
-using Content.Server.Flash;
-using Content.Server.Electrocution;
-using Content.Server.Pinpointer;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Flash.Components;
-using Content.Server.Radio.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Database;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Implants.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Payload.Components;
-using Content.Shared.Radio;
-using Content.Shared.Slippery;
-using Content.Shared.StepTrigger.Systems;
-using Content.Shared.Trigger;
-using Content.Shared.Weapons.Ranged.Events;
-using Content.Shared.Whitelist;
-using JetBrains.Annotations;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Player;
-using Content.Shared.Coordinates;
-using Content.Shared.Projectiles;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Explosion.EntitySystems
-{
-    /// <summary>
-    /// Raised whenever something is Triggered on the entity.
-    /// </summary>
-    public sealed class TriggerEvent : HandledEntityEventArgs
-    {
-        public EntityUid Triggered { get; }
-        public EntityUid? User { get; }
-
-        public TriggerEvent(EntityUid triggered, EntityUid? user = null)
-        {
-            Triggered = triggered;
-            User = user;
-        }
-    }
-
-    /// <summary>
-    /// Raised before a trigger is activated.
-    /// </summary>
-    [ByRefEvent]
-    public record struct BeforeTriggerEvent(EntityUid Triggered, EntityUid? User, bool Cancelled = false);
-
-    /// <summary>
-    /// Raised when timer trigger becomes active.
-    /// </summary>
-    [ByRefEvent]
-    public readonly record struct ActiveTimerTriggerEvent(EntityUid Triggered, EntityUid? User);
-
-    [UsedImplicitly]
-    public sealed partial class TriggerSystem : EntitySystem
-    {
-        [Dependency] private readonly ExplosionSystem _explosions = default!;
-        [Dependency] private readonly FixtureSystem _fixtures = default!;
-        [Dependency] private readonly FlashSystem _flashSystem = default!;
-        [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly BodySystem _body = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-        [Dependency] private readonly NavMapSystem _navMap = default!;
-        [Dependency] private readonly RadioSystem _radioSystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-        [Dependency] private readonly InventorySystem _inventory = default!;
-        [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
-        [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            InitializeProximity();
-            InitializeOnUse();
-            InitializeSignal();
-            InitializeTimedCollide();
-            InitializeVoice();
-            InitializeMobstate();
-
-            SubscribeLocalEvent<TriggerOnSpawnComponent, MapInitEvent>(OnSpawnTriggered);
-            SubscribeLocalEvent<StartTimerOnShootComponent, ProjectileShotEvent>(StartTimerOnShoot); // Sunrise-Edit
-            SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);
-            SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
-            SubscribeLocalEvent<TriggerOnUseComponent, UseInHandEvent>(OnUse);
-            SubscribeLocalEvent<TriggerImplantActionComponent, ActivateImplantEvent>(OnImplantTrigger);
-            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
-            SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
-            SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
-            SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
-
-            SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(OnSpawnTrigger);
-            SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteTrigger);
-            SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(HandleExplodeTrigger);
-            SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(HandleFlashTrigger);
-            SubscribeLocalEvent<GibOnTriggerComponent, TriggerEvent>(HandleGibTrigger);
-
-            SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(OnAnchorTrigger);
-            SubscribeLocalEvent<SoundOnTriggerComponent, TriggerEvent>(OnSoundTrigger);
-            SubscribeLocalEvent<ShockOnTriggerComponent, TriggerEvent>(HandleShockTrigger);
-            SubscribeLocalEvent<RattleComponent, TriggerEvent>(HandleRattleTrigger);
-
-            SubscribeLocalEvent<TriggerWhitelistComponent, BeforeTriggerEvent>(HandleWhitelist);
-        }
-
-        private void HandleWhitelist(Entity<TriggerWhitelistComponent> ent, ref BeforeTriggerEvent args)
-        {
-            args.Cancelled = !_whitelist.CheckBoth(args.User, ent.Comp.Blacklist, ent.Comp.Whitelist);
-        }
-
-        private void OnSoundTrigger(EntityUid uid, SoundOnTriggerComponent component, TriggerEvent args)
-        {
-            if (component.RemoveOnTrigger) // if the component gets removed when it's triggered
-            {
-                var xform = Transform(uid);
-                _audio.PlayPvs(component.Sound, xform.Coordinates); // play the sound at its last known coordinates
-            }
-            else // if the component doesn't get removed when triggered
-            {
-                _audio.PlayPvs(component.Sound, uid); // have the sound follow the entity itself
-            }
-        }
-
-        private void HandleShockTrigger(Entity<ShockOnTriggerComponent> shockOnTrigger, ref TriggerEvent args)
-        {
-            if (!_container.TryGetContainingContainer(shockOnTrigger.Owner, out var container))
-                return;
-
-            var containerEnt = container.Owner;
-            var curTime = _timing.CurTime;
-
-            if (curTime < shockOnTrigger.Comp.NextTrigger)
-            {
-                // The trigger's on cooldown.
-                return;
-            }
-
-            _electrocution.TryDoElectrocution(containerEnt, null, shockOnTrigger.Comp.Damage, shockOnTrigger.Comp.Duration, true, ignoreInsulation: true);
-            shockOnTrigger.Comp.NextTrigger = curTime + shockOnTrigger.Comp.Cooldown;
-        }
-
-        private void OnAnchorTrigger(EntityUid uid, AnchorOnTriggerComponent component, TriggerEvent args)
-        {
-            var xform = Transform(uid);
-
-            if (xform.Anchored)
-                return;
-
-            _transformSystem.AnchorEntity(uid, xform);
-
-            if (component.RemoveOnTrigger)
-                RemCompDeferred<AnchorOnTriggerComponent>(uid);
-        }
-
-        private void OnSpawnTrigger(Entity<SpawnOnTriggerComponent> ent, ref TriggerEvent args)
-        {
-            var xform = Transform(ent);
-
-            if (ent.Comp.mapCoords)
-            {
-                var mapCoords = _transformSystem.GetMapCoordinates(ent, xform);
-                Spawn(ent.Comp.Proto, mapCoords);
-            }
-            else
-            {
-                var coords = xform.Coordinates;
-                if (!coords.IsValid(EntityManager))
-                    return;
-                Spawn(ent.Comp.Proto, coords);
-
-            }
-        }
-
-        private void HandleExplodeTrigger(EntityUid uid, ExplodeOnTriggerComponent component, TriggerEvent args)
-        {
-            _explosions.TriggerExplosive(uid, user: args.User);
-            args.Handled = true;
-        }
-
-        private void HandleFlashTrigger(EntityUid uid, FlashOnTriggerComponent component, TriggerEvent args)
-        {
-            // TODO Make flash durations sane ffs.
-            _flashSystem.FlashArea(uid, args.User, component.Range, component.Duration * 1000f, probability: component.Probability);
-            args.Handled = true;
-        }
-
-        private void HandleDeleteTrigger(EntityUid uid, DeleteOnTriggerComponent component, TriggerEvent args)
-        {
-            EntityManager.QueueDeleteEntity(uid);
-            args.Handled = true;
-        }
-
-        private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, TriggerEvent args)
-        {
-            if (!TryComp(uid, out TransformComponent? xform))
-                return;
-            if (component.DeleteItems)
-            {
-                var items = _inventory.GetHandOrInventoryEntities(xform.ParentUid);
-                foreach (var item in items)
-                {
-                    Del(item);
-                }
-            }
-            _body.GibBody(xform.ParentUid, true);
-            args.Handled = true;
-        }
-
-
-        private void HandleRattleTrigger(EntityUid uid, RattleComponent component, TriggerEvent args)
-        {
-            if (!TryComp<SubdermalImplantComponent>(uid, out var implanted))
-                return;
-
-            if (implanted.ImplantedEntity == null)
-                return;
-
-            // Gets location of the implant
-            var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(uid));
-            var critMessage = Loc.GetString(component.CritMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText));
-            var deathMessage = Loc.GetString(component.DeathMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText));
-
-            if (!TryComp<MobStateComponent>(implanted.ImplantedEntity, out var mobstate))
-                return;
-
-            // Sends a message to the radio channel specified by the implant
-            if (mobstate.CurrentState == MobState.Critical)
-                _radioSystem.SendRadioMessage(uid, critMessage, _prototypeManager.Index<RadioChannelPrototype>(component.RadioChannel), uid);
-            if (mobstate.CurrentState == MobState.Dead)
-                _radioSystem.SendRadioMessage(uid, deathMessage, _prototypeManager.Index<RadioChannelPrototype>(component.RadioChannel), uid);
-
-            args.Handled = true;
-        }
-
-        private void OnTriggerCollide(EntityUid uid, TriggerOnCollideComponent component, ref StartCollideEvent args)
-        {
-            if (args.OurFixtureId == component.FixtureID && (!component.IgnoreOtherNonHard || args.OtherFixture.Hard))
-                Trigger(uid, args.OtherEntity);
-        }
-
-        private void OnSpawnTriggered(EntityUid uid, TriggerOnSpawnComponent component, MapInitEvent args)
-        {
-            Trigger(uid);
-        }
-
-        // Sunrise-Start
-        private void StartTimerOnShoot(EntityUid uid, StartTimerOnShootComponent component, ProjectileShotEvent args)
-        {
-            if (TryComp<ProjectileComponent>(uid, out var projectile))
-                StartTimer(uid, projectile.Shooter);
-        }
-        // Sunrise-End
-
-        private void OnActivate(EntityUid uid, TriggerOnActivateComponent component, ActivateInWorldEvent args)
-        {
-            if (args.Handled || !args.Complex)
-                return;
-
-            Trigger(uid, args.User);
-            args.Handled = true;
-        }
-
-        private void OnUse(Entity<TriggerOnUseComponent> ent, ref UseInHandEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            Trigger(ent.Owner, args.User);
-            args.Handled = true;
-        }
-
-        private void OnImplantTrigger(EntityUid uid, TriggerImplantActionComponent component, ActivateImplantEvent args)
-        {
-            args.Handled = Trigger(uid);
-        }
-
-        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredOffEvent args)
-        {
-            Trigger(uid, args.Tripper);
-        }
-
-        private void OnSlipTriggered(EntityUid uid, TriggerOnSlipComponent component, ref SlipEvent args)
-        {
-            Trigger(uid, args.Slipped);
-        }
-
-        private void OnEmptyTriggered(EntityUid uid, TriggerWhenEmptyComponent component, ref OnEmptyGunShotEvent args)
-        {
-            Trigger(uid, args.EmptyGun);
-        }
-
-        private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
-        {
-            ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
-        }
-
-        public bool Trigger(EntityUid trigger, EntityUid? user = null)
-        {
-            var beforeTriggerEvent = new BeforeTriggerEvent(trigger, user);
-            RaiseLocalEvent(trigger, ref beforeTriggerEvent);
-            if (beforeTriggerEvent.Cancelled)
-                return false;
-
-            var triggerEvent = new TriggerEvent(trigger, user);
-            EntityManager.EventBus.RaiseLocalEvent(trigger, triggerEvent, true);
-            return triggerEvent.Handled;
-        }
-
-        public void TryDelay(EntityUid uid, float amount, ActiveTimerTriggerComponent? comp = null)
-        {
-            if (!Resolve(uid, ref comp, false))
-                return;
-
-            comp.TimeRemaining += amount;
-        }
-
-        /// <summary>
-        /// Start the timer for triggering the device.
-        /// </summary>
-        public void StartTimer(Entity<OnUseTimerTriggerComponent?> ent, EntityUid? user)
-        {
-            if (!Resolve(ent, ref ent.Comp, false))
-                return;
-
-            var comp = ent.Comp;
-            HandleTimerTrigger(ent, user, comp.Delay, comp.BeepInterval, comp.InitialBeepDelay, comp.BeepSound);
-        }
-
-        public void HandleTimerTrigger(EntityUid uid, EntityUid? user, float delay, float beepInterval, float? initialBeepDelay, SoundSpecifier? beepSound)
-        {
-            if (delay <= 0)
-            {
-                RemComp<ActiveTimerTriggerComponent>(uid);
-                Trigger(uid, user);
-                return;
-            }
-
-            if (HasComp<ActiveTimerTriggerComponent>(uid))
-                return;
-
-            if (user != null)
-            {
-                // Check if entity is bomb/mod. grenade/etc
-                if (_container.TryGetContainer(uid, "payload", out BaseContainer? container) &&
-                    container.ContainedEntities.Count > 0 &&
-                    TryComp(container.ContainedEntities[0], out ChemicalPayloadComponent? chemicalPayloadComponent))
-                {
-                    // If a beaker is missing, the entity won't explode, so no reason to log it
-                    if (chemicalPayloadComponent?.BeakerSlotA.Item is not { } beakerA ||
-                        chemicalPayloadComponent?.BeakerSlotB.Item is not { } beakerB ||
-                        !TryComp(beakerA, out SolutionContainerManagerComponent? containerA) ||
-                        !TryComp(beakerB, out SolutionContainerManagerComponent? containerB) ||
-                        !TryComp(beakerA, out FitsInDispenserComponent? fitsA) ||
-                        !TryComp(beakerB, out FitsInDispenserComponent? fitsB) ||
-                        !_solutionContainerSystem.TryGetSolution((beakerA, containerA), fitsA.Solution, out _, out var solutionA) ||
-                        !_solutionContainerSystem.TryGetSolution((beakerB, containerB), fitsB.Solution, out _, out var solutionB))
-                        return;
-
-                    _adminLogger.Add(LogType.Trigger,
-                        $"{ToPrettyString(user.Value):user} started a {delay} second timer trigger on entity {ToPrettyString(uid):timer}, which contains {SharedSolutionContainerSystem.ToPrettyString(solutionA)} in one beaker and {SharedSolutionContainerSystem.ToPrettyString(solutionB)} in the other.");
-                }
-                else
-                {
-                    _adminLogger.Add(LogType.Trigger,
-                        $"{ToPrettyString(user.Value):user} started a {delay} second timer trigger on entity {ToPrettyString(uid):timer}");
-                }
-
-            }
-            else
-            {
-                _adminLogger.Add(LogType.Trigger,
-                    $"{delay} second timer trigger started on entity {ToPrettyString(uid):timer}");
-            }
-
-            var active = AddComp<ActiveTimerTriggerComponent>(uid);
-            active.TimeRemaining = delay;
-            active.User = user;
-            active.BeepSound = beepSound;
-            active.BeepInterval = beepInterval;
-            active.TimeUntilBeep = initialBeepDelay == null ? active.BeepInterval : initialBeepDelay.Value;
-
-            var ev = new ActiveTimerTriggerEvent(uid, user);
-            RaiseLocalEvent(uid, ref ev);
-
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-                _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Primed, appearance);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            UpdateProximity();
-            UpdateTimer(frameTime);
-            UpdateTimedCollide(frameTime);
-            UpdateRepeat();
-        }
-
-        private void UpdateTimer(float frameTime)
-        {
-            HashSet<EntityUid> toRemove = new();
-            var query = EntityQueryEnumerator<ActiveTimerTriggerComponent>();
-            while (query.MoveNext(out var uid, out var timer))
-            {
-                timer.TimeRemaining -= frameTime;
-                timer.TimeUntilBeep -= frameTime;
-
-                if (timer.TimeRemaining <= 0)
-                {
-                    Trigger(uid, timer.User);
-                    toRemove.Add(uid);
-                    continue;
-                }
-
-                if (timer.BeepSound == null || timer.TimeUntilBeep > 0)
-                    continue;
-
-                timer.TimeUntilBeep += timer.BeepInterval;
-                _audio.PlayPvs(timer.BeepSound, uid, timer.BeepSound.Params);
-            }
-
-            foreach (var uid in toRemove)
-            {
-                RemComp<ActiveTimerTriggerComponent>(uid);
-
-                // In case this is a re-usable grenade, un-prime it.
-                if (TryComp<AppearanceComponent>(uid, out var appearance))
-                    _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
-            }
-        }
-
-        private void UpdateRepeat()
-        {
-            var now = _timing.CurTime;
-            var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
-            while (query.MoveNext(out var uid, out var comp))
-            {
-                if (comp.NextTrigger > now)
-                    continue;
-
-                comp.NextTrigger = now + comp.Delay;
-                Trigger(uid);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
deleted file mode 100644
index cdab2883f5..0000000000
--- a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Robust.Shared.Timing;
-using Robust.Shared.Serialization.Manager;
-using Content.Server.Explosion.Components.OnTrigger;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed class TwoStageTriggerSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly TriggerSystem _triggerSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<TwoStageTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(EntityUid uid, TwoStageTriggerComponent component, TriggerEvent args)
-    {
-        if (component.Triggered)
-            return;
-
-        component.Triggered = true;
-        component.NextTriggerTime = _timing.CurTime + component.TriggerDelay;
-    }
-
-    private void LoadComponents(EntityUid uid, TwoStageTriggerComponent component)
-    {
-        foreach (var (name, entry) in component.SecondStageComponents)
-        {
-            var comp = (Component) Factory.GetComponent(name);
-            var temp = (object)comp;
-
-            if (EntityManager.TryGetComponent(uid, entry.Component.GetType(), out var c))
-                RemComp(uid, c);
-
-            _serializationManager.CopyTo(entry.Component, ref temp);
-            EntityManager.AddComponent(uid, comp);
-        }
-        component.ComponentsIsLoaded = true;
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var enumerator = EntityQueryEnumerator<TwoStageTriggerComponent>();
-        while (enumerator.MoveNext(out var uid, out var component))
-        {
-            if (!component.Triggered)
-                continue;
-
-            if (!component.ComponentsIsLoaded)
-                LoadComponents(uid, component);
-
-            if (_timing.CurTime < component.NextTriggerTime)
-                continue;
-
-            component.NextTriggerTime = null;
-            _triggerSystem.Trigger(uid);
-        }
-    }
-}
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index a2b8db9ad6..4a9ea23076 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -604,8 +604,8 @@ public sealed class FaxSystem : EntitySystem
         var printout = component.PrintingQueue.Dequeue();
 
         var entityToSpawn = printout.PrototypeId.Length == 0 ? component.PrintPaperId.ToString() : printout.PrototypeId;
-        var coordinates = _transform.GetMapCoordinates(uid); // sunrise-edit
-        var printed = EntityManager.SpawnEntity(entityToSpawn, coordinates);
+        var printed = Spawn(entityToSpawn, Transform(uid).Coordinates);
+
         if (TryComp<PaperComponent>(printed, out var paper))
         {
             _paperSystem.SetContent((printed, paper), printout.Content);
diff --git a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
deleted file mode 100644
index ef33454295..0000000000
--- a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Flash.Components;
-
-[RegisterComponent, Access(typeof(DamagedByFlashingSystem))]
-public sealed partial class DamagedByFlashingComponent : Component
-{
-    /// <summary>
-    /// damage from flashing
-    /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier FlashDamage = new();
-}
diff --git a/Content.Server/Flash/Components/FlashImmunityComponent.cs b/Content.Server/Flash/Components/FlashImmunityComponent.cs
deleted file mode 100644
index a982a9059f..0000000000
--- a/Content.Server/Flash/Components/FlashImmunityComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Server.Flash.Components;
-
-/// <summary>
-///     Makes the entity immune to being flashed.
-///     When given to clothes in the "head", "eyes" or "mask" slot it protects the wearer.
-/// </summary>
-[RegisterComponent, Access(typeof(FlashSystem))]
-public sealed partial class FlashImmunityComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("enabled")]
-    public bool Enabled { get; set; } = true;
-}
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index 30c6491f62..14549c54d9 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -1,257 +1,5 @@
-using System.Linq;
-using Content.Server.Flash.Components;
-using Content.Shared.Flash.Components;
-using Content.Server.Light.EntitySystems;
-using Content.Server.Popups;
-using Content.Server.Stunnable;
-using Content.Shared.Charges.Components;
-using Content.Shared.Charges.Systems;
-using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
-using Content.Shared.Tag;
-using Content.Shared.Traits.Assorted;
-using Content.Shared.Weapons.Melee.Events;
-using Content.Shared.StatusEffect;
-using Content.Shared.Examine;
-using Robust.Server.Audio;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Random;
-using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
-using Robust.Shared.Prototypes;
 
-namespace Content.Server.Flash
-{
-    internal sealed class FlashSystem : SharedFlashSystem
-    {
-        [Dependency] private readonly AppearanceSystem _appearance = default!;
-        [Dependency] private readonly AudioSystem _audio = default!;
-        [Dependency] private readonly SharedChargesSystem _sharedCharges = default!;
-        [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
-        [Dependency] private readonly InventorySystem _inventory = default!;
-        [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly StunSystem _stun = default!;
-        [Dependency] private readonly TagSystem _tag = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
+namespace Content.Server.Flash;
 
-        private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<FlashImmunityComponent, ExaminedEvent>(OnExamine);
-            SubscribeLocalEvent<FlashComponent, MeleeHitEvent>(OnFlashMeleeHit);
-            // ran before toggling light for extra-bright lantern
-            SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand, before: new[] { typeof(HandheldLightSystem) });
-            SubscribeLocalEvent<InventoryComponent, FlashAttemptEvent>(OnInventoryFlashAttempt);
-            SubscribeLocalEvent<FlashImmunityComponent, FlashAttemptEvent>(OnFlashImmunityFlashAttempt);
-            SubscribeLocalEvent<PermanentBlindnessComponent, FlashAttemptEvent>(OnPermanentBlindnessFlashAttempt);
-            SubscribeLocalEvent<TemporaryBlindnessComponent, FlashAttemptEvent>(OnTemporaryBlindnessFlashAttempt);
-        }
-        
-        private void OnExamine(Entity<FlashImmunityComponent> ent, ref ExaminedEvent args)
-
-        {
-            args.PushMarkup(Loc.GetString("flash-protection"));
-        }
-        
-        private void OnFlashMeleeHit(EntityUid uid, FlashComponent comp, MeleeHitEvent args)
-        {
-            if (!args.IsHit ||
-                !args.HitEntities.Any() ||
-                !UseFlash(uid, comp, args.User))
-            {
-                return;
-            }
-
-            args.Handled = true;
-            foreach (var e in args.HitEntities)
-            {
-                Flash(e, args.User, uid, comp.FlashDuration, comp.SlowTo, melee: true, stunDuration: comp.MeleeStunDuration);
-            }
-        }
-
-        private void OnFlashUseInHand(EntityUid uid, FlashComponent comp, UseInHandEvent args)
-        {
-            if (args.Handled || !UseFlash(uid, comp, args.User))
-                return;
-
-            args.Handled = true;
-            FlashArea(uid, args.User, comp.Range, comp.AoeFlashDuration, comp.SlowTo, true, comp.Probability);
-        }
-
-        private bool UseFlash(EntityUid uid, FlashComponent comp, EntityUid user)
-        {
-            if (comp.Flashing)
-                return false;
-
-            TryComp<LimitedChargesComponent>(uid, out var charges);
-            if (_sharedCharges.IsEmpty((uid, charges)))
-                return false;
-
-            _sharedCharges.TryUseCharge((uid, charges));
-            _audio.PlayPvs(comp.Sound, uid);
-            comp.Flashing = true;
-            _appearance.SetData(uid, FlashVisuals.Flashing, true);
-
-            if (_sharedCharges.IsEmpty((uid, charges)))
-            {
-                _appearance.SetData(uid, FlashVisuals.Burnt, true);
-                _tag.AddTag(uid, TrashTag);
-                _popup.PopupEntity(Loc.GetString("flash-component-becomes-empty"), user);
-            }
-
-            uid.SpawnTimer(400, () =>
-            {
-                _appearance.SetData(uid, FlashVisuals.Flashing, false);
-                comp.Flashing = false;
-            });
-
-            return true;
-        }
-
-        public void Flash(EntityUid target,
-            EntityUid? user,
-            EntityUid? used,
-            float flashDuration,
-            float slowTo,
-            bool displayPopup = true,
-            bool melee = false,
-            TimeSpan? stunDuration = null)
-        {
-            var attempt = new FlashAttemptEvent(target, user, used);
-            RaiseLocalEvent(target, attempt, true);
-
-            if (attempt.Cancelled)
-                return;
-
-            // don't paralyze, slowdown or convert to rev if the target is immune to flashes
-            if (!_statusEffectsSystem.TryAddStatusEffect<FlashedComponent>(target, FlashedKey, TimeSpan.FromSeconds(flashDuration / 1000f), true))
-                return;
-
-            if (stunDuration != null)
-            {
-                _stun.TryParalyze(target, stunDuration.Value, true);
-            }
-            else
-            {
-                _stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration / 1000f), true,
-                slowTo, slowTo);
-            }
-
-            if (displayPopup && user != null && target != user && Exists(user.Value))
-            {
-                _popup.PopupEntity(Loc.GetString("flash-component-user-blinds-you",
-                    ("user", Identity.Entity(user.Value, EntityManager))), target, target);
-            }
-
-            if (melee)
-            {
-                var ev = new AfterFlashedEvent(target, user, used);
-                if (user != null)
-                    RaiseLocalEvent(user.Value, ref ev);
-                if (used != null)
-                    RaiseLocalEvent(used.Value, ref ev);
-            }
-        }
-
-        public override void FlashArea(Entity<FlashComponent?> source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null)
-        {
-            var transform = Transform(source);
-            var mapPosition = _transform.GetMapCoordinates(transform);
-            var statusEffectsQuery = GetEntityQuery<StatusEffectsComponent>();
-            var damagedByFlashingQuery = GetEntityQuery<DamagedByFlashingComponent>();
-
-            foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
-            {
-                if (!_random.Prob(probability))
-                    continue;
-
-                // Is the entity affected by the flash either through status effects or by taking damage?
-                if (!statusEffectsQuery.HasComponent(entity) && !damagedByFlashingQuery.HasComponent(entity))
-                    continue;
-
-                // Check for entites in view
-                // put damagedByFlashingComponent in the predicate because shadow anomalies block vision.
-                if (!_examine.InRangeUnOccluded(entity, mapPosition, range, predicate: (e) => damagedByFlashingQuery.HasComponent(e)))
-                    continue;
-
-                // They shouldn't have flash removed in between right?
-                Flash(entity, user, source, duration, slowTo, displayPopup);
-            }
-
-            _audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
-        }
-
-        private void OnInventoryFlashAttempt(EntityUid uid, InventoryComponent component, FlashAttemptEvent args)
-        {
-            foreach (var slot in new[] { "head", "eyes", "mask" })
-            {
-                if (args.Cancelled)
-                    break;
-                if (_inventory.TryGetSlotEntity(uid, slot, out var item, component))
-                    RaiseLocalEvent(item.Value, args, true);
-            }
-        }
-
-        private void OnFlashImmunityFlashAttempt(EntityUid uid, FlashImmunityComponent component, FlashAttemptEvent args)
-        {
-            if (component.Enabled)
-                args.Cancel();
-        }
-
-        private void OnPermanentBlindnessFlashAttempt(EntityUid uid, PermanentBlindnessComponent component, FlashAttemptEvent args)
-        {
-            // check for total blindness
-            if (component.Blindness == 0)
-                args.Cancel();
-        }
-
-        private void OnTemporaryBlindnessFlashAttempt(EntityUid uid, TemporaryBlindnessComponent component, FlashAttemptEvent args)
-        {
-            args.Cancel();
-        }
-    }
-
-    /// <summary>
-    ///     Called before a flash is used to check if the attempt is cancelled by blindness, items or FlashImmunityComponent.
-    ///     Raised on the target hit by the flash, the user of the flash and the flash used.
-    /// </summary>
-    public sealed class FlashAttemptEvent : CancellableEntityEventArgs
-    {
-        public readonly EntityUid Target;
-        public readonly EntityUid? User;
-        public readonly EntityUid? Used;
-
-        public FlashAttemptEvent(EntityUid target, EntityUid? user, EntityUid? used)
-        {
-            Target = target;
-            User = user;
-            Used = used;
-        }
-    }
-    /// <summary>
-    ///     Called after a flash is used via melee on another person to check for rev conversion.
-    ///     Raised on the target hit by the flash, the user of the flash and the flash used.
-    /// </summary>
-    [ByRefEvent]
-    public readonly struct AfterFlashedEvent
-    {
-        public readonly EntityUid Target;
-        public readonly EntityUid? User;
-        public readonly EntityUid? Used;
-
-        public AfterFlashedEvent(EntityUid target, EntityUid? user, EntityUid? used)
-        {
-            Target = target;
-            User = user;
-            Used = used;
-        }
-    }
-}
+public sealed class FlashSystem : SharedFlashSystem;
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index 8e10367bb8..c7348b0856 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -1,461 +1,6 @@
-using System.Linq;
-using System.Numerics;
-using Content.Server.Popups;
-using Content.Shared._Sunrise.Footprints;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
-using Content.Shared.Fluids.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Timing;
-using Content.Shared.Weapons.Melee;
-using Robust.Server.Audio;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Fluids.EntitySystems;
 
 /// <inheritdoc/>
-public sealed class AbsorbentSystem : SharedAbsorbentSystem
-{
-    private static readonly EntProtoId Sparkles = "PuddleSparkle";
-
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly PopupSystem _popups = default!;
-    [Dependency] private readonly PuddleSystem _puddleSystem = default!;
-    [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly MapSystem _mapSystem = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!; // Sunrise-edit
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<AbsorbentComponent, ComponentInit>(OnAbsorbentInit);
-        SubscribeLocalEvent<AbsorbentComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<AbsorbentComponent, UserActivateInWorldEvent>(OnActivateInWorld);
-        SubscribeLocalEvent<AbsorbentComponent, SolutionContainerChangedEvent>(OnAbsorbentSolutionChange);
-    }
-
-    private void OnAbsorbentInit(EntityUid uid, AbsorbentComponent component, ComponentInit args)
-    {
-        // TODO: I know dirty on init but no prediction moment.
-        UpdateAbsorbent(uid, component);
-    }
-
-    private void OnAbsorbentSolutionChange(EntityUid uid, AbsorbentComponent component, ref SolutionContainerChangedEvent args)
-    {
-        UpdateAbsorbent(uid, component);
-    }
-
-    private void UpdateAbsorbent(EntityUid uid, AbsorbentComponent component)
-    {
-        if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out _, out var solution))
-            return;
-
-        var oldProgress = component.Progress.ShallowClone();
-        component.Progress.Clear();
-
-        var mopReagent = solution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(solution));
-        if (mopReagent > FixedPoint2.Zero)
-        {
-            component.Progress[solution.GetColorWithOnly(_prototype, _puddleSystem.GetAbsorbentReagents(solution))] = mopReagent.Float();
-        }
-
-        var otherColor = solution.GetColorWithout(_prototype, _puddleSystem.GetAbsorbentReagents(solution));
-        var other = (solution.Volume - mopReagent).Float();
-
-        if (other > 0f)
-        {
-            component.Progress[otherColor] = other;
-        }
-
-        var remainder = solution.AvailableVolume;
-
-        if (remainder > FixedPoint2.Zero)
-        {
-            component.Progress[Color.DarkGray] = remainder.Float();
-        }
-
-        if (component.Progress.Equals(oldProgress))
-            return;
-
-        Dirty(uid, component);
-    }
-
-    private void OnActivateInWorld(EntityUid uid, AbsorbentComponent component, UserActivateInWorldEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        Mop(uid, args.Target, uid, component);
-        args.Handled = true;
-    }
-
-    private void OnAfterInteract(EntityUid uid, AbsorbentComponent component, AfterInteractEvent args)
-    {
-        if (!args.CanReach || args.Handled)
-            return;
-
-        // Sunrise-Start
-        if (args.Target != null &&
-            (HasComp<PuddleComponent>(args.Target) ||
-             HasComp<RefillableSolutionComponent>(args.Target)) &&
-             !HasComp<FootprintComponent>(args.Target))
-        {
-            Mop(args.User, args.Target.Value, args.Used, component);
-            args.Handled = true;
-            return;
-        }
-
-        var coordinates = args.ClickLocation;
-        var footPrints = new HashSet<Entity<FootprintComponent>>();
-
-        var gridUid = _transform.GetGrid(coordinates);
-        if (!TryComp<MapGridComponent>(gridUid, out var grid))
-            return;
-
-        var tileCoordinates = _mapSystem.CoordinatesToTile(gridUid.Value, grid, coordinates);
-        var tileRef = _mapSystem.GetTileRef(gridUid.Value, grid, tileCoordinates);
-        var entities = _lookup.GetLocalEntitiesIntersecting(tileRef, 0);
-
-        foreach (var entity in entities)
-        {
-            if (TryComp<FootprintComponent>(entity, out var footprint))
-            {
-                footPrints.Add((entity, footprint));
-            }
-        }
-
-        if (footPrints.Count > 0)
-        {
-            if (!_solutionContainerSystem.TryGetSolution(args.Used, component.SolutionName, out var absorberSoln))
-                return;
-
-            var tileCenterPos = _mapSystem.GridTileToLocal(gridUid.Value, grid, tileRef.GridIndices);
-            CleanFootprints(args.User, args.Used, component, absorberSoln.Value, footPrints, tileCenterPos);
-            args.Handled = true;
-            return;
-        }
-        // Sunrise-End
-
-        args.Handled = true;
-    }
-
-    // Sunrise-Start
-    public void CleanFootprints(EntityUid user, EntityUid used, AbsorbentComponent absorber,
-        Entity<SolutionComponent> absorberSoln, HashSet<Entity<FootprintComponent>> footPrints,
-        EntityCoordinates targetCoords)
-    {
-        var soundPlayed = false;
-
-        foreach (var (footstepUid, comp) in footPrints)
-        {
-            if (!_solutionContainerSystem.ResolveSolution(footstepUid, comp.ContainerName, ref comp.SolutionContainer, out var targetStepSolution) || targetStepSolution.Volume <= 0)
-                continue;
-
-            if (_puddleSystem.CanFullyEvaporate(targetStepSolution))
-                continue; // no spam
-
-            var absorberSolution = absorberSoln.Comp.Solution;
-            var available = absorberSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(absorberSolution));
-
-            // No material
-            if (available == FixedPoint2.Zero)
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user);
-                return;
-            }
-
-            var transferMax = absorber.PickupAmount;
-            var transferAmount = FixedPoint2.Min(transferMax, available);
-
-            var puddleSplit = targetStepSolution.SplitSolutionWithout(transferAmount, _puddleSystem.GetAbsorbentReagents(targetStepSolution));
-            var absorberSplit = absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume, _puddleSystem.GetAbsorbentReagents(absorberSolution));
-
-            var gridUid = targetCoords.GetGridUid(EntityManager);
-            if (TryComp<MapGridComponent>(gridUid, out var mapGrid))
-            {
-                var tileRef = _mapSystem.GetTileRef(gridUid.Value, mapGrid, targetCoords);
-                _puddleSystem.DoTileReactions(tileRef, absorberSplit);
-            }
-
-            _solutionContainerSystem.AddSolution(comp.SolutionContainer.Value, absorberSplit);
-            _solutionContainerSystem.AddSolution(absorberSoln, puddleSplit);
-
-            if (!soundPlayed)
-            {
-                soundPlayed = true; // to prevent sound spam
-                _audio.PlayPvs(absorber.PickupSound, footstepUid);
-            }
-
-            // Без этой хуйни некоторые лужи будут пустыми и не будут удаляться
-            var ev = new SolutionContainerChangedEvent(targetStepSolution, comp.ContainerName);
-            RaiseLocalEvent(footstepUid, ref ev);
-
-            // Sunrise-Start
-            var absorberEv = new AbsorberFootPrintEvent(user);
-            RaiseLocalEvent(user, ref absorberEv);
-            // Sunrise-End
-        }
-
-        var userXform = Transform(user);
-        var localPos = Vector2.Transform(targetCoords.Position, _transform.GetWorldMatrix(userXform));
-        localPos = userXform.LocalRotation.RotateVec(localPos);
-
-        _melee.DoLunge(user, used, Angle.Zero, localPos, null, false);
-    }
-    // Sunrise-End
-
-    public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentComponent component)
-    {
-        if (!_solutionContainerSystem.TryGetSolution(used, component.SolutionName, out var absorberSoln))
-            return;
-
-        if (TryComp<UseDelayComponent>(used, out var useDelay)
-            && _useDelay.IsDelayed((used, useDelay)))
-            return;
-
-        // If it's a puddle try to grab from
-        if (!TryPuddleInteract(user, used, target, component, useDelay, absorberSoln.Value) && component.UseAbsorberSolution)
-        {
-            // If it's refillable try to transfer
-            if (!TryRefillableInteract(user, used, target, component, useDelay, absorberSoln.Value))
-                return;
-        }
-    }
-
-    /// <summary>
-    ///     Logic for an absorbing entity interacting with a refillable.
-    /// </summary>
-    private bool TryRefillableInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent component, UseDelayComponent? useDelay, Entity<SolutionComponent> absorbentSoln)
-    {
-        if (!TryComp(target, out RefillableSolutionComponent? refillable))
-            return false;
-
-        if (!_solutionContainerSystem.TryGetRefillableSolution((target, refillable, null), out var refillableSoln, out var refillableSolution))
-            return false;
-
-        if (refillableSolution.Volume <= 0)
-        {
-            // Target empty - only transfer absorbent contents into refillable
-            if (!TryTransferFromAbsorbentToRefillable(user, used, target, component, absorbentSoln, refillableSoln.Value))
-                return false;
-        }
-        else
-        {
-            // Target non-empty - do a two-way transfer
-            if (!TryTwoWayAbsorbentRefillableTransfer(user, used, target, component, absorbentSoln, refillableSoln.Value))
-                return false;
-        }
-
-        _audio.PlayPvs(component.TransferSound, target);
-        if (useDelay != null)
-            _useDelay.TryResetDelay((used, useDelay));
-        return true;
-    }
-
-    /// <summary>
-    ///     Logic for an transferring solution from absorber to an empty refillable.
-    /// </summary>
-    private bool TryTransferFromAbsorbentToRefillable(
-        EntityUid user,
-        EntityUid used,
-        EntityUid target,
-        AbsorbentComponent component,
-        Entity<SolutionComponent> absorbentSoln,
-        Entity<SolutionComponent> refillableSoln)
-    {
-        var absorbentSolution = absorbentSoln.Comp.Solution;
-        if (absorbentSolution.Volume <= 0)
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-target-container-empty", ("target", target)), user, user);
-            return false;
-        }
-
-        var refillableSolution = refillableSoln.Comp.Solution;
-        var transferAmount = component.PickupAmount < refillableSolution.AvailableVolume ?
-            component.PickupAmount :
-            refillableSolution.AvailableVolume;
-
-        if (transferAmount <= 0)
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", used)), used, user);
-            return false;
-        }
-
-        // Prioritize transferring non-evaporatives if absorbent has any
-        var contaminants = _solutionContainerSystem.SplitSolutionWithout(absorbentSoln, transferAmount, _puddleSystem.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
-        if (contaminants.Volume > 0)
-        {
-            _solutionContainerSystem.TryAddSolution(refillableSoln, contaminants);
-        }
-        else
-        {
-            var evaporatives = _solutionContainerSystem.SplitSolution(absorbentSoln, transferAmount);
-            _solutionContainerSystem.TryAddSolution(refillableSoln, evaporatives);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Logic for an transferring contaminants to a non-empty refillable & reabsorbing water if any available.
-    /// </summary>
-    private bool TryTwoWayAbsorbentRefillableTransfer(
-        EntityUid user,
-        EntityUid used,
-        EntityUid target,
-        AbsorbentComponent component,
-        Entity<SolutionComponent> absorbentSoln,
-        Entity<SolutionComponent> refillableSoln)
-    {
-        var contaminantsFromAbsorbent = _solutionContainerSystem.SplitSolutionWithout(absorbentSoln, component.PickupAmount, _puddleSystem.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
-
-        var absorbentSolution = absorbentSoln.Comp.Solution;
-        if (contaminantsFromAbsorbent.Volume == FixedPoint2.Zero && absorbentSolution.AvailableVolume == FixedPoint2.Zero)
-        {
-            // Nothing to transfer to refillable and no room to absorb anything extra
-            _popups.PopupEntity(Loc.GetString("mopping-system-puddle-space", ("used", used)), user, user);
-
-            // We can return cleanly because nothing was split from absorbent solution
-            return false;
-        }
-
-        var waterPulled = component.PickupAmount < absorbentSolution.AvailableVolume ?
-            component.PickupAmount :
-            absorbentSolution.AvailableVolume;
-
-        var refillableSolution = refillableSoln.Comp.Solution;
-        var waterFromRefillable = refillableSolution.SplitSolutionWithOnly(waterPulled, _puddleSystem.GetAbsorbentReagents(refillableSoln.Comp.Solution));
-        _solutionContainerSystem.UpdateChemicals(refillableSoln);
-
-        if (waterFromRefillable.Volume == FixedPoint2.Zero && contaminantsFromAbsorbent.Volume == FixedPoint2.Zero)
-        {
-            // Nothing to transfer in either direction
-            _popups.PopupEntity(Loc.GetString("mopping-system-target-container-empty-water", ("target", target)), user, user);
-
-            // We can return cleanly because nothing was split from refillable solution
-            return false;
-        }
-
-        var anyTransferOccurred = false;
-
-        if (waterFromRefillable.Volume > FixedPoint2.Zero)
-        {
-            // transfer water to absorbent
-            _solutionContainerSystem.TryAddSolution(absorbentSoln, waterFromRefillable);
-            anyTransferOccurred = true;
-        }
-
-        if (contaminantsFromAbsorbent.Volume > 0)
-        {
-            if (refillableSolution.AvailableVolume <= 0)
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user);
-            }
-            else
-            {
-                // transfer as much contaminants to refillable as will fit
-                var contaminantsForRefillable = contaminantsFromAbsorbent.SplitSolution(refillableSolution.AvailableVolume);
-                _solutionContainerSystem.TryAddSolution(refillableSoln, contaminantsForRefillable);
-                anyTransferOccurred = true;
-            }
-
-            // absorb everything that did not fit in the refillable back by the absorbent
-            _solutionContainerSystem.TryAddSolution(absorbentSoln, contaminantsFromAbsorbent);
-        }
-
-        return anyTransferOccurred;
-    }
-
-    /// <summary>
-    ///     Logic for an absorbing entity interacting with a puddle.
-    /// </summary>
-    private bool TryPuddleInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent absorber, UseDelayComponent? useDelay, Entity<SolutionComponent> absorberSoln)
-    {
-        if (!TryComp(target, out PuddleComponent? puddle))
-            return false;
-
-        if (!_solutionContainerSystem.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution) || puddleSolution.Volume <= 0)
-            return false;
-
-        // Check if the puddle has any non-evaporative reagents
-        if (_puddleSystem.CanFullyEvaporate(puddleSolution))
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-puddle-evaporate", ("target", target)), user, user);
-            return true;
-        }
-
-        Solution puddleSplit;
-        var isRemoved = false;
-        if (absorber.UseAbsorberSolution)
-        {
-            // Check if we have any evaporative reagents on our absorber to transfer
-            var absorberSolution = absorberSoln.Comp.Solution;
-            var available = absorberSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(absorberSolution));
-
-            // No material
-            if (available == FixedPoint2.Zero)
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user);
-                return true;
-            }
-
-            var transferMax = absorber.PickupAmount;
-            var transferAmount = available > transferMax ? transferMax : available;
-
-            puddleSplit = puddleSolution.SplitSolutionWithout(transferAmount, _puddleSystem.GetAbsorbentReagents(puddleSolution));
-            var absorberSplit = absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume, _puddleSystem.GetAbsorbentReagents(absorberSolution));
-
-            // Do tile reactions first
-            var transform = Transform(target);
-            var gridUid = transform.GridUid;
-            if (TryComp(gridUid, out MapGridComponent? mapGrid))
-            {
-                var tileRef = _mapSystem.GetTileRef(gridUid.Value, mapGrid, transform.Coordinates);
-                _puddleSystem.DoTileReactions(tileRef, absorberSplit);
-            }
-            _solutionContainerSystem.AddSolution(puddle.Solution.Value, absorberSplit);
-        }
-        else
-        {
-            puddleSplit = puddleSolution.SplitSolutionWithout(absorber.PickupAmount, _puddleSystem.GetAbsorbentReagents(puddleSolution));
-            // Despawn if we're done
-            if (puddleSolution.Volume == FixedPoint2.Zero)
-            {
-                // Spawn a *sparkle*
-                Spawn(Sparkles, GetEntityQuery<TransformComponent>().GetComponent(target).Coordinates);
-                QueueDel(target);
-                isRemoved = true;
-            }
-        }
-
-        _solutionContainerSystem.AddSolution(absorberSoln, puddleSplit);
-
-        _audio.PlayPvs(absorber.PickupSound, isRemoved ? used : target);
-        if (useDelay != null)
-            _useDelay.TryResetDelay((used, useDelay));
-
-        var userXform = Transform(user);
-        var targetPos = _transform.GetWorldPosition(target);
-        var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
-        localPos = userXform.LocalRotation.RotateVec(localPos);
-
-        _melee.DoLunge(user, used, Angle.Zero, localPos, null, false);
-
-        // Sunrise-Start
-        var ev = new AbsorberPudleEvent(user);
-        RaiseLocalEvent(user, ref ev);
-        // Sunrise-End
-
-        return true;
-    }
-}
+public sealed class AbsorbentSystem : SharedAbsorbentSystem;
diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
index 974d6f1ec1..84718add5f 100644
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
@@ -174,7 +174,7 @@ public sealed class DrainSystem : SharedDrainSystem
                     // but queuedelete should be pretty safe.
                     if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, puddle.Comp.SolutionName, ref puddle.Comp.Solution, out var puddleSolution))
                     {
-                        EntityManager.QueueDeleteEntity(puddle);
+                        QueueDel(puddle);
                         continue;
                     }
 
diff --git a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs
index 88acf4b703..61e7d108a0 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs
@@ -55,7 +55,7 @@ public sealed class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOverlaySyst
             if (session.AttachedEntity is not { Valid: true } entity)
                 continue;
 
-            var transform = EntityManager.GetComponent<TransformComponent>(entity);
+            var transform = Comp<TransformComponent>(entity);
 
 
             var worldBounds = Box2.CenteredAround(_transform.GetWorldPosition(transform),
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
index f92504e74c..245ab8308f 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
@@ -46,6 +46,7 @@ public sealed partial class PuddleSystem
             if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
                 continue;
 
+            // Yes, this means that 50u water + 50u holy water evaporates twice as fast as 100u water.
             foreach ((string evaporatingReagent, FixedPoint2 evaporatingSpeed) in GetEvaporationSpeeds(puddleSolution))
             {
                 var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds * evaporatingSpeed;
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 296b397146..880a4395b4 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -69,7 +69,8 @@ public sealed partial class PuddleSystem
         if (totalSplit == 0)
             return;
 
-        args.Handled = true;
+        // Optionally allow further melee handling occur
+        args.Handled = entity.Comp.PreventMelee;
 
         // First update the hit count so anything that is not reactive wont count towards the total!
         foreach (var hit in args.HitEntities)
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 6e89dc281a..6d0ed83c86 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -47,11 +47,9 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ReactiveSystem _reactive = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
@@ -59,17 +57,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [Dependency] private readonly SpeedModifierContactsSystem _speedModContacts = default!;
     [Dependency] private readonly TileFrictionController _tile = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string Blood = "Blood";
-
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string Slime = "Slime";
-
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string CopperBlood = "CopperBlood";
-
-    private static string[] _standoutReagents = [Blood, Slime, CopperBlood];
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     // Using local deletion queue instead of the standard queue so that we can easily "undelete" if a puddle
     // loses & then gains reagents in a single tick.
@@ -91,7 +79,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<PuddleComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<PuddleComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
         SubscribeLocalEvent<PuddleComponent, SpreadNeighborsEvent>(OnPuddleSpread);
         SubscribeLocalEvent<PuddleComponent, SlipEvent>(OnPuddleSlip);
 
@@ -324,11 +311,13 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         TickEvaporation();
     }
 
-    private void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
+    protected override void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
     {
         if (args.SolutionId != entity.Comp.SolutionName)
             return;
 
+        base.OnSolutionUpdate(entity, ref args);
+
         if (args.Solution.Volume <= 0)
         {
             _deletionQueue.Add(entity);
@@ -343,46 +332,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
             UpdateSlow(entity, args.Solution);
         // Sunrise-End
         UpdateEvaporation(entity, args.Solution);
-        UpdateAppearance(entity, entity.Comp);
-    }
-
-    private void UpdateAppearance(EntityUid uid, PuddleComponent? puddleComponent = null,
-        AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref puddleComponent, ref appearance, false))
-        {
-            return;
-        }
-
-        var volume = FixedPoint2.Zero;
-        Color color = Color.White;
-
-        if (_solutionContainerSystem.ResolveSolution(uid, puddleComponent.SolutionName, ref puddleComponent.Solution,
-                out var solution))
-        {
-            volume = solution.Volume / puddleComponent.OverflowVolume;
-
-            // Make blood stand out more
-            // Kinda EH
-            // Could potentially do alpha per-solution but future problem.
-
-            color = solution.GetColorWithout(_prototypeManager, _standoutReagents);
-            color = color.WithAlpha(0.7f);
-
-            foreach (var standout in _standoutReagents)
-            {
-                var quantity = solution.GetTotalPrototypeQuantity(standout);
-                if (quantity <= FixedPoint2.Zero)
-                    continue;
-
-                var interpolateValue = quantity.Float() / solution.Volume.Float();
-                color = Color.InterpolateBetween(color,
-                    _prototypeManager.Index<ReagentPrototype>(standout).SubstanceColor, interpolateValue);
-            }
-        }
-
-        _appearance.SetData(uid, PuddleVisuals.CurrentVolume, volume.Float(), appearance);
-        _appearance.SetData(uid, PuddleVisuals.SolutionColor, color, appearance);
     }
 
     private void UpdateSlip(Entity<PuddleComponent> entity, Solution solution)
@@ -393,6 +342,8 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         // Ensure we actually have the component
         EnsureComp<TileFrictionModifierComponent>(entity);
 
+        EnsureComp<SlipperyComponent>(entity, out var slipComp);
+
         // This is the base amount of reagent needed before a puddle can be considered slippery. Is defined based on
         // the sprite threshold for a puddle larger than 5 pixels.
         var smallPuddleThreshold = FixedPoint2.New(entity.Comp.OverflowVolume.Float() * LowThreshold);
@@ -411,17 +362,21 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         var launchMult = FixedPoint2.Zero;
         // A cumulative weighted amount of stun times from slippery reagents
         var stunTimer = TimeSpan.Zero;
+        // A cumulative weighted amount of knockdown times from slippery reagents
+        var knockdownTimer = TimeSpan.Zero;
 
         // Check if the puddle is big enough to slip in to avoid doing unnecessary logic
         if (solution.Volume <= smallPuddleThreshold)
         {
             _stepTrigger.SetActive(entity, false, comp);
             _tile.SetModifier(entity, 1f);
+            slipComp.SlipData.SlipFriction = 1f;
+            slipComp.AffectsSliding = false;
+            Dirty(entity, slipComp);
             return;
         }
 
-        if (!TryComp<SlipperyComponent>(entity, out var slipComp))
-            return;
+        slipComp.AffectsSliding = true;
 
         foreach (var (reagent, quantity) in solution.Contents)
         {
@@ -441,7 +396,8 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
             // Aggregate launch speed based on quantity
             launchMult += reagentProto.SlipData.LaunchForwardsMultiplier * quantity;
             // Aggregate stun times based on quantity
-            stunTimer += reagentProto.SlipData.ParalyzeTime * (float)quantity;
+            stunTimer += reagentProto.SlipData.StunTime * (float)quantity;
+            knockdownTimer += reagentProto.SlipData.KnockdownTime * (float)quantity;
 
             if (reagentProto.SlipData.SuperSlippery)
                 superSlipperyUnits += quantity;
@@ -460,14 +416,15 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         if (slipperyUnits > 0)
         {
             slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult/slipperyUnits);
-            slipComp.SlipData.ParalyzeTime = (stunTimer/(float)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
         slipComp.SlipData.SuperSlippery = superSlipperyUnits >= smallPuddleThreshold;
 
         // Lower tile friction based on how slippery it is, lets items slide across a puddle of lube
-        slipComp.SlipData.SlipFriction = (float)(puddleFriction/solution.Volume);
+        slipComp.SlipData.SlipFriction = (float)(puddleFriction / solution.Volume);
         _tile.SetModifier(entity, slipComp.SlipData.SlipFriction);
 
         Dirty(entity, slipComp);
@@ -690,7 +647,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         }
 
         // If space return early, let that spill go out into the void
-        if (tileRef.Tile.IsEmpty || tileRef.IsSpace(_tileDefMan))
+        if (tileRef.Tile.IsEmpty || _turf.IsSpace(tileRef))
         {
             puddleUid = EntityUid.Invalid;
             return false;
@@ -745,7 +702,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         }
 
         var coords = _map.GridTileToLocal(gridId, mapGrid, tileRef.GridIndices);
-        puddleUid = EntityManager.SpawnEntity("Puddle", coords);
+        puddleUid = Spawn("Puddle", coords);
         EnsureComp<PuddleComponent>(puddleUid);
         if (TryAddSolution(puddleUid, solution, sound))
         {
@@ -757,20 +714,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
     #endregion
 
-    public void DoTileReactions(TileRef tileRef, Solution solution)
-    {
-        for (var i = solution.Contents.Count - 1; i >= 0; i--)
-        {
-            var (reagent, quantity) = solution.Contents[i];
-            var proto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
-            var removed = proto.ReactionTile(tileRef, quantity, EntityManager, reagent.Data);
-            if (removed <= FixedPoint2.Zero)
-                continue;
-
-            solution.RemoveReagent(reagent, removed);
-        }
-    }
-
     /// <summary>
     /// Tries to get the relevant puddle entity for a tile.
     /// </summary>
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index dfbad1bbe9..13695caff1 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.EntityEffects.Effects;
 using Content.Server.Spreader;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -288,7 +288,7 @@ public sealed class SmokeSystem : EntitySystem
         if (blockIngestion)
             return;
 
-        if (_blood.TryAddToChemicals(entity, transferSolution, bloodstream))
+        if (_blood.TryAddToChemicals((entity, bloodstream), transferSolution))
         {
             // Log solution addition by smoke
             _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):target} ingested smoke {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index f0eb12c34d..87c19c688d 100644
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -69,7 +69,7 @@ namespace Content.Server.Forensics
             if (args.Handled || args.Cancelled)
                 return;
 
-            if (!EntityManager.TryGetComponent(uid, out ForensicScannerComponent? scanner))
+            if (!TryComp(uid, out ForensicScannerComponent? scanner))
                 return;
 
             if (args.Args.Target != null)
@@ -196,7 +196,7 @@ namespace Content.Server.Forensics
             }
 
             // Spawn a piece of paper.
-            var printed = EntityManager.SpawnEntity(component.MachineOutput, Transform(uid).Coordinates);
+            var printed = Spawn(component.MachineOutput, Transform(uid).Coordinates);
             _handsSystem.PickupOrDrop(args.Actor, printed, checkActionBlocker: false);
 
             if (!TryComp<PaperComponent>(printed, out var paperComp))
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index ec4683460b..cc74c1d141 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.DoAfter;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics.Components;
 using Content.Server.Popups;
+using Content.Shared.Body.Events;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Chemistry.Components;
@@ -12,6 +12,7 @@ using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
 using Content.Shared.Forensics.Components;
+using Content.Shared.Forensics.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
@@ -23,7 +24,7 @@ using Content.Shared.Hands.Components;
 
 namespace Content.Server.Forensics
 {
-    public sealed class ForensicsSystem : EntitySystem
+    public sealed class ForensicsSystem : SharedForensicsSystem
     {
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
@@ -317,12 +318,7 @@ namespace Content.Server.Forensics
         }
 
         #region Public API
-
-        /// <summary>
-        /// Give the entity a new, random DNA string and call an event to notify other systems like the bloodstream that it has been changed.
-        /// Does nothing if it does not have the DnaComponent.
-        /// </summary>
-        public void RandomizeDNA(Entity<DnaComponent?> ent)
+        public override void RandomizeDNA(Entity<DnaComponent?> ent)
         {
             if (!Resolve(ent, ref ent.Comp, false))
                 return;
@@ -334,11 +330,7 @@ namespace Content.Server.Forensics
             RaiseLocalEvent(ent.Owner, ref ev);
         }
 
-        /// <summary>
-        /// Give the entity a new, random fingerprint string.
-        /// Does nothing if it does not have the FingerprintComponent.
-        /// </summary>
-        public void RandomizeFingerprint(Entity<FingerprintComponent?> ent)
+        public override void RandomizeFingerprint(Entity<FingerprintComponent?> ent)
         {
             if (!Resolve(ent, ref ent.Comp, false))
                 return;
diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
index d453da81f4..7731d91057 100644
--- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
@@ -9,51 +9,50 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking.Commands
 {
-    [AdminCommand(AdminFlags.Host)] // SUNRISE-EDIT
-    sealed class ForceMapCommand : IConsoleCommand
+    [AdminCommand(AdminFlags.Host)]
+    public sealed class ForceMapCommand : LocalizedCommands
     {
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IGameMapManager _gameMapManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        public string Command => "forcemap";
-        public string Description => Loc.GetString("forcemap-command-description");
-        public string Help => Loc.GetString("forcemap-command-help");
+        public override string Command => "forcemap";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 1)
             {
-                shell.WriteLine(Loc.GetString("forcemap-command-need-one-argument"));
+                shell.WriteLine(Loc.GetString(Loc.GetString($"shell-need-exactly-one-argument")));
                 return;
             }
 
-            var gameMap = IoCManager.Resolve<IGameMapManager>();
             var name = args[0];
 
             // An empty string clears the forced map
-            if (!string.IsNullOrEmpty(name) && !gameMap.CheckMapExists(name))
+            if (!string.IsNullOrEmpty(name) && !_gameMapManager.CheckMapExists(name))
             {
-                shell.WriteLine(Loc.GetString("forcemap-command-map-not-found", ("map", name)));
+                shell.WriteLine(Loc.GetString("cmd-forcemap-map-not-found", ("map", name)));
                 return;
             }
 
             _configurationManager.SetCVar(CCVars.GameMap, name);
 
             if (string.IsNullOrEmpty(name))
-                shell.WriteLine(Loc.GetString("forcemap-command-cleared"));
+                shell.WriteLine(Loc.GetString("cmd-forcemap-cleared"));
             else
-                shell.WriteLine(Loc.GetString("forcemap-command-success", ("map", name)));
+                shell.WriteLine(Loc.GetString("cmd-forcemap-success", ("map", name)));
         }
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             if (args.Length == 1)
             {
-                var options = IoCManager.Resolve<IPrototypeManager>()
+                var options = _prototypeManager
                     .EnumeratePrototypes<GameMapPrototype>()
                     .Select(p => new CompletionOption(p.ID, p.MapName))
                     .OrderBy(p => p.Value);
 
-                return CompletionResult.FromHintOptions(options, Loc.GetString("forcemap-command-arg-map"));
+                return CompletionResult.FromHintOptions(options, Loc.GetString($"cmd-forcemap-hint"));
             }
 
             return CompletionResult.Empty;
diff --git a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
index d7346f78ad..d14dfa5058 100644
--- a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
@@ -8,51 +8,49 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Host)]
-    sealed class ForcePresetCommand : IConsoleCommand
+    public sealed class ForcePresetCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly GameTicker _ticker = default!;
 
-        public string Command => "forcepreset";
-        public string Description => "Forces a specific game preset to start for the current lobby.";
-        public string Help => $"Usage: {Command} <preset>";
+        public override string Command => "forcepreset";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var ticker = _e.System<GameTicker>();
-            if (ticker.RunLevel != GameRunLevel.PreRoundLobby)
+            if (_ticker.RunLevel != GameRunLevel.PreRoundLobby)
             {
-                shell.WriteLine("This can only be executed while the game is in the pre-round lobby.");
+                shell.WriteLine(Loc.GetString($"cmd-forcepreset-preround-lobby-only"));
                 return;
             }
 
             if (args.Length != 1)
             {
-                shell.WriteLine("Need exactly one argument.");
+                shell.WriteLine(Loc.GetString($"shell-need-exactly-one-argument"));
                 return;
             }
 
             var name = args[0];
-            if (!ticker.TryFindGamePreset(name, out var type))
+            if (!_ticker.TryFindGamePreset(name, out var type))
             {
-                shell.WriteLine($"No preset exists with name {name}.");
+                shell.WriteLine(Loc.GetString($"cmd-forcepreset-no-preset-found", ("preset", name)));
                 return;
             }
 
-            ticker.SetGamePreset(type, true);
-            shell.WriteLine($"Forced the game to start with preset {name}.");
-            ticker.UpdateInfoText();
+            _ticker.SetGamePreset(type, true);
+            shell.WriteLine(Loc.GetString($"cmd-forcepreset-success", ("preset", name)));
+            _ticker.UpdateInfoText();
         }
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             if (args.Length == 1)
             {
-                var options = IoCManager.Resolve<IPrototypeManager>()
+                var options = _prototypeManager
                     .EnumeratePrototypes<GamePresetPrototype>()
                     .OrderBy(p => p.ID)
                     .Select(p => p.ID);
 
-                return CompletionResult.FromHintOptions(options, "<preset>");
+                return CompletionResult.FromHintOptions(options, Loc.GetString($"cmd-forcepreset-hint"));
             }
 
             return CompletionResult.Empty;
diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
index b5984d260d..98c1b91e08 100644
--- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
+++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
@@ -8,40 +8,35 @@ using Robust.Shared.Console;
 namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Round)]
-    public sealed class GoLobbyCommand : IConsoleCommand
+    public sealed class GoLobbyCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly IConfigurationManager _configManager = default!;
+        [Dependency] private readonly GameTicker _gameTicker = default!;
 
-        public string Command => "golobby";
-        public string Description => "Enables the lobby and restarts the round.";
-        public string Help => $"Usage: {Command} / {Command} <preset>";
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "golobby";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             GamePresetPrototype? preset = null;
             var presetName = string.Join(" ", args);
 
-            var ticker = _e.System<GameTicker>();
-
             if (args.Length > 0)
             {
-                if (!ticker.TryFindGamePreset(presetName, out preset))
+                if (!_gameTicker.TryFindGamePreset(presetName, out preset))
                 {
-                    shell.WriteLine($"No preset found with name {presetName}");
+                    shell.WriteLine(Loc.GetString($"cmd-forcepreset-no-preset-found", ("preset", presetName)));
                     return;
                 }
             }
 
-            var config = IoCManager.Resolve<IConfigurationManager>();
-            config.SetCVar(CCVars.GameLobbyEnabled, true);
+            _configManager.SetCVar(CCVars.GameLobbyEnabled, true);
 
-            ticker.RestartRound();
+            _gameTicker.RestartRound();
 
             if (preset != null)
-            {
-                ticker.SetGamePreset(preset);
-            }
+                _gameTicker.SetGamePreset(preset);
 
-            shell.WriteLine($"Enabling the lobby and restarting the round.{(preset == null ? "" : $"\nPreset set to {presetName}")}");
+            shell.WriteLine(Loc.GetString(preset == null ? "cmd-golobby-success" : "cmd-golobby-success-with-preset", ("preset", presetName)));
         }
     }
 }
diff --git a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
index f6e94eb93f..813b395c29 100644
--- a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
+++ b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
@@ -7,31 +7,27 @@ using Robust.Shared.Console;
 namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Round)]
-    sealed class ToggleDisallowLateJoinCommand : IConsoleCommand
+    public sealed class ToggleDisallowLateJoinCommand : LocalizedCommands
     {
-        public string Command => "toggledisallowlatejoin";
-        public string Description => "Allows or disallows latejoining during mid-game.";
-        public string Help => $"Usage: {Command} <disallow>";
+        [Dependency] private readonly IConfigurationManager _configManager = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "toggledisallowlatejoin";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 1)
             {
-                shell.WriteLine("Need exactly one argument.");
+                shell.WriteLine(Loc.GetString($"shell-need-exactly-one-argument"));
                 return;
             }
 
-            var cfgMan = IoCManager.Resolve<IConfigurationManager>();
-
             if (bool.TryParse(args[0], out var result))
             {
-                cfgMan.SetCVar(CCVars.GameDisallowLateJoins, bool.Parse(args[0]));
-                shell.WriteLine(result ? "Late joining has been disabled." : "Late joining has been enabled.");
+                _configManager.SetCVar(CCVars.GameDisallowLateJoins, bool.Parse(args[0]));
+                shell.WriteLine(Loc.GetString(result ? "cmd-toggledisallowlatejoin-disabled" : "cmd-toggledisallowlatejoin-enabled"));
             }
             else
-            {
-                shell.WriteLine("Invalid argument.");
-            }
+                shell.WriteLine(Loc.GetString($"shell-invalid-bool"));
         }
     }
 }
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index db69ea501d..99e84c6cac 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -47,11 +47,8 @@ namespace Content.Server.GameTicking
         [Dependency] private readonly ArrivalsSystem _arrivals = default!;
         [Dependency] private readonly NewLifeSystem _newLifeSystem = default!; // Sunrise-Edit
 
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string ObserverPrototypeName = "MobObserver";
-
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string AdminObserverPrototypeName = "AdminObserver";
+        public static readonly EntProtoId ObserverPrototypeName = "MobObserver";
+        public static readonly EntProtoId AdminObserverPrototypeName = "AdminObserver";
 
         /// <summary>
         /// How many players have joined the round through normal methods.
@@ -348,7 +345,7 @@ namespace Content.Server.GameTicking
 
             if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}"))
             {
-                EntityManager.AddComponent<OwOAccentComponent>(mob);
+                AddComp<OwOAccentComponent>(mob);
             }
 
             _stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
@@ -469,7 +466,7 @@ namespace Content.Server.GameTicking
         public EntityCoordinates GetObserverSpawnPoint()
         {
             _possiblePositions.Clear();
-            var spawnPointQuery = EntityManager.EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+            var spawnPointQuery = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
             while (spawnPointQuery.MoveNext(out var uid, out var point, out var transform))
             {
                 if (point.SpawnType != SpawnPointType.Observer
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index fa8314cd27..55bf51db02 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -93,7 +93,7 @@ namespace Content.Server.GameTicking
             InitializePlayer();
             InitializeLobbyBackground();
             InitializeGamePreset();
-            DebugTools.Assert(_prototypeManager.Index<JobPrototype>(FallbackOverflowJob).Name == FallbackOverflowJobName,
+            DebugTools.Assert(_prototypeManager.Index(FallbackOverflowJob).Name == FallbackOverflowJobName,
                 "Overflow role does not have the correct name!");
             InitializeGameRules();
             InitializeReplays();
diff --git a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
index ca0e01c4a1..125aef4286 100644
--- a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
+++ b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs
@@ -1,8 +1,6 @@
-
 using Content.Server.Maps;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.GameTicking.Presets
 {
@@ -38,8 +36,8 @@ namespace Content.Server.GameTicking.Presets
         public bool Hide;
         // Sunrise-End
 
-        [DataField("rules", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-        public IReadOnlyList<string> Rules { get; private set; } = Array.Empty<string>();
+        [DataField]
+        public IReadOnlyList<EntProtoId> Rules { get; private set; } = Array.Empty<EntProtoId>();
 
         /// <summary>
         /// If specified, the gamemode will only be run with these maps.
diff --git a/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
index e28a0bc35f..f1e8e41258 100644
--- a/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class ParadoxCloneRuleComponent : Component
     ///     Cloning settings to be used.
     /// </summary>
     [DataField]
-    public ProtoId<CloningSettingsPrototype> Settings = "Antag";
+    public ProtoId<CloningSettingsPrototype> Settings = "ParadoxCloningSettings";
 
     /// <summary>
     ///     Visual effect spawned when gibbing at round end.
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 2e97a72f3b..9ae8c5ff83 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Server.Administration.Commands;
+using Content.Server.Clothing.Systems;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Server.Mind;
@@ -23,6 +23,7 @@ public sealed class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRuleComponen
 {
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly OutfitSystem _outfitSystem = default!;
     [Dependency] private readonly PointSystem _point = default!;
     [Dependency] private readonly RespawnRuleSystem _respawn = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;
@@ -55,7 +56,7 @@ public sealed class DeathMatchRuleSystem : GameRuleSystem<DeathMatchRuleComponen
             var mob = mobMaybe!.Value;
 
             _mind.TransferTo(newMind, mob);
-            SetOutfitCommand.SetOutfit(mob, dm.Gear, EntityManager);
+            _outfitSystem.SetOutfit(mob, dm.Gear);
             EnsureComp<KillTrackerComponent>(mob);
             _respawn.AddToTracker(ev.Player.UserId, (uid, tracker));
 
diff --git a/Content.Server/GameTicking/Rules/DragonRuleSystem.cs b/Content.Server/GameTicking/Rules/DragonRuleSystem.cs
index de13218568..964b248beb 100644
--- a/Content.Server/GameTicking/Rules/DragonRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DragonRuleSystem.cs
@@ -1,11 +1,8 @@
 using Content.Server.Antag;
-using Content.Server.Dragon;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Roles;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
-using Content.Shared.CharacterInfo;
 using Content.Shared.Localizations;
 using Robust.Server.GameObjects;
 
@@ -56,10 +53,9 @@ public sealed class DragonRuleSystem : GameRuleSystem<DragonRuleComponent>
 
         var dragonXform = Transform(dragon);
 
-        var station = _station.GetStationInMap(dragonXform.MapID);
         EntityUid? stationGrid = null;
-        if (TryComp<StationDataComponent>(station, out var stationData))
-            stationGrid = _station.GetLargestGrid(stationData);
+        if (_station.GetStationInMap(dragonXform.MapID) is { } station)
+            stationGrid = _station.GetLargestGrid(station);
 
         if (stationGrid is not null)
         {
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index 33ee91f8a5..cd93eae502 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -1,14 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Random.Helpers;
-using Robust.Server.GameObjects;
+using Content.Shared.Station.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index c97e64ed2a..6549795ae1 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -24,10 +24,12 @@ using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Station.Components;
 using Content.Server.Traitor.Uplink;
 using Content.Shared.FixedPoint;
 using Content.Shared.Roles;
 using Content.Shared.Store.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -42,11 +44,8 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly UplinkSystem _uplinkSystem = default!;
 
-    [ValidatePrototypeId<CurrencyPrototype>]
-    private const string TelecrystalCurrencyPrototype = "Telecrystal";
-
-    [ValidatePrototypeId<TagPrototype>]
-    private const string NukeOpsUplinkTagPrototype = "NukeOpsUplink";
+    private static readonly ProtoId<CurrencyPrototype> TelecrystalCurrencyPrototype = "Telecrystal";
+    private static readonly ProtoId<TagPrototype> NukeOpsUplinkTagPrototype = "NukeOpsUplink";
 
     // Sunrise-Start
     [ValidatePrototypeId<AntagPrototype>]
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index f12b41a510..1cc1d649d6 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -2,7 +2,6 @@ using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Antag;
 using Content.Server.EUI;
-using Content.Server.Flash;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Popups;
@@ -14,6 +13,7 @@ using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
 using Content.Server.AlertLevel; // Sunrise-Edit
 using Content.Shared.Database;
+using Content.Shared.Flash;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
@@ -165,6 +165,9 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
     /// </summary>
     private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref AfterFlashedEvent ev)
     {
+        if (uid != ev.User || !ev.Melee)
+            return;
+
         var alwaysConvertible = HasComp<AlwaysRevolutionaryConvertibleComponent>(ev.Target);
 
         if (!_mind.TryGetMind(ev.Target, out var mindId, out var mind) && !alwaysConvertible)
@@ -268,7 +271,7 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
                     continue;
 
                 _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.Entity(uid, EntityManager))), uid);
                 _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(uid)} was deconverted due to all Head Revolutionaries dying.");
diff --git a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
index 570889155b..66f0d1f22c 100644
--- a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
@@ -1,11 +1,10 @@
-using System.Linq;
-using Content.Server.GameTicking.Rules.Components;
+using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 using Content.Shared.Storage;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index bfe98de862..0a2882aa3c 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -125,19 +125,19 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
         if (traitorRole is not null)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
-            AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
-            Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
+            EnsureComp<RoleBriefingComponent>(traitorRole.Value.Owner, out var briefingComp);
+            briefingComp.Briefing = briefing;
         }
         else
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - did not get traitor briefing");
         }
 
-        // Send codewords to only the traitor client
         var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found
 
-        RoleCodewordComponent codewordComp = EnsureComp<RoleCodewordComponent>(mindId);
-        _roleCodewordSystem.SetRoleCodewords(codewordComp, "traitor", factionCodewords.ToList(), color);
+        // The mind entity is stored in nullspace with a PVS override for the owner, so only they can see the codewords.
+        var codewordComp = EnsureComp<RoleCodewordComponent>(mindId);
+        _roleCodewordSystem.SetRoleCodewords((mindId, codewordComp), "traitor", factionCodewords.ToList(), color);
 
         // Change the faction
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Change faction");
diff --git a/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs
index 00b2546e78..1a5b97c327 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/BaseEntityReplaceVariationPassSystem.cs
@@ -58,7 +58,7 @@ public abstract class BaseEntityReplaceVariationPassSystem<TEntComp, TGameRuleCo
             Transform(newEnt).LocalRotation = rot;
         }
 
-        Log.Debug($"Entity replacement took {stopwatch.Elapsed} with {Stations.GetTileCount(args.Station)} tiles");
+        Log.Debug($"Entity replacement took {stopwatch.Elapsed} with {Stations.GetTileCount(args.Station.AsNullable())} tiles");
     }
 
     private void QueueReplace(Entity<TransformComponent> ent, List<EntitySpawnEntry> replacements)
diff --git a/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs
index 7247bd98aa..462c89e016 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs
@@ -9,7 +9,7 @@ public sealed class EntitySpawnVariationPassSystem : VariationPassSystem<EntityS
 {
     protected override void ApplyVariation(Entity<EntitySpawnVariationPassComponent> ent, ref StationVariationPassEvent args)
     {
-        var totalTiles = Stations.GetTileCount(args.Station);
+        var totalTiles = Stations.GetTileCount(args.Station.AsNullable());
 
         var dirtyMod = Random.NextGaussian(ent.Comp.TilesPerEntityAverage, ent.Comp.TilesPerEntityStdDev);
         var trashTiles = Math.Max((int) (totalTiles * (1 / dirtyMod)), 0);
diff --git a/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs
index 41cdbd87f8..2895416a7f 100644
--- a/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs
+++ b/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs
@@ -15,7 +15,7 @@ public sealed class PuddleMessVariationPassSystem : VariationPassSystem<PuddleMe
 
     protected override void ApplyVariation(Entity<PuddleMessVariationPassComponent> ent, ref StationVariationPassEvent args)
     {
-        var totalTiles = Stations.GetTileCount(args.Station);
+        var totalTiles = Stations.GetTileCount(args.Station.AsNullable());
 
         if (!_proto.TryIndex(ent.Comp.RandomPuddleSolutionFill, out var proto))
             return;
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index a38940c667..9fab98446a 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -4,7 +4,6 @@ using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Popups;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Zombies;
 using Content.Shared.GameTicking.Components;
@@ -190,7 +189,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
         {
             foreach (var station in _station.GetStationsSet())
             {
-                if (TryComp<StationDataComponent>(station, out var data) && _station.GetLargestGrid(data) is { } grid)
+                if (_station.GetLargestGrid(station) is { } grid)
                     stationGrids.Add(grid);
             }
         }
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 83471cdbc1..a88cf6b428 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -36,8 +36,9 @@ public sealed class GatewayGeneratorSystem : EntitySystem
     [Dependency] private readonly SharedSalvageSystem _salvage = default!;
     [Dependency] private readonly TileSystem _tile = default!;
 
-    [ValidatePrototypeId<LocalizedDatasetPrototype>]
-    private const string PlanetNames = "NamesBorer";
+    private static readonly ProtoId<LocalizedDatasetPrototype> PlanetNames = "NamesBorer";
+    private static readonly ProtoId<BiomeTemplatePrototype> BiomeTemplate = "Continental";
+    private static readonly ProtoId<DungeonConfigPrototype> DungeonConfig = "Experiment";
 
     // TODO:
     // Fix shader some more
@@ -101,7 +102,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         var random = new Random(seed);
         var mapUid = _maps.CreateMap();
 
-        var gatewayName = _salvage.GetFTLName(_protoManager.Index<LocalizedDatasetPrototype>(PlanetNames), seed);
+        var gatewayName = _salvage.GetFTLName(_protoManager.Index(PlanetNames), seed);
         _metadata.SetEntityName(mapUid, gatewayName);
 
         var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset));
@@ -111,7 +112,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         };
         AddComp(mapUid, restricted);
 
-        _biome.EnsurePlanet(mapUid, _protoManager.Index<BiomeTemplatePrototype>("Continental"), seed);
+        _biome.EnsurePlanet(mapUid, _protoManager.Index(BiomeTemplate), seed);
 
         var grid = Comp<MapGridComponent>(mapUid);
 
@@ -183,7 +184,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         var dungeonRotation = _dungeon.GetDungeonRotation(seed);
         var dungeonPosition = (origin + dungeonRotation.RotateVec(new Vector2i(0, dungeonDistance))).Floored();
 
-        _dungeon.GenerateDungeon(_protoManager.Index<DungeonConfigPrototype>("Experiment"), args.MapUid, grid, dungeonPosition, seed);
+        _dungeon.GenerateDungeon(_protoManager.Index(DungeonConfig), args.MapUid, grid, dungeonPosition, seed);
 
         // TODO: Dungeon mobs + loot.
 
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 4d7e392385..8644ea868e 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -9,7 +9,6 @@ using Content.Server.GameTicking;
 using Content.Server.Ghost.Components;
 using Content.Server.Mind;
 using Content.Server.Roles.Jobs;
-using Content.Server.Warps;
 using Content.Shared.Actions;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
@@ -36,7 +35,6 @@ using Content.Shared.Storage.Components;
 using Content.Shared.Tag;
 using Content.Shared.Warps;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
@@ -82,6 +80,7 @@ namespace Content.Server.Ghost
         private EntityQuery<PhysicsComponent> _physicsQuery;
 
         private static readonly ProtoId<TagPrototype> AllowGhostShownByEventTag = "AllowGhostShownByEvent";
+        private static readonly ProtoId<DamageTypePrototype> AsphyxiationDamageType = "Asphyxiation";
 
         private readonly Dictionary<ICommonSession, AcceptGhostEui> _openAcceptUis = new();
 
@@ -565,9 +564,9 @@ namespace Content.Server.Ghost
             if (playerEntity != null && viaCommand)
             {
                 if (forced)
-                    _adminLog.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} was forced to ghost via command");
+                    _adminLog.Add(LogType.Mind, $"{ToPrettyString(playerEntity.Value):player} was forced to ghost via command");
                 else
-                    _adminLog.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command");
+                    _adminLog.Add(LogType.Mind, $"{ToPrettyString(playerEntity.Value):player} is attempting to ghost via command");
             }
 
             var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal);
@@ -633,14 +632,14 @@ namespace Content.Server.Ghost
                         dealtDamage = playerDeadThreshold - damageable.TotalDamage;
                     }
 
-                    DamageSpecifier damage = new(_prototypeManager.Index<DamageTypePrototype>("Asphyxiation"), dealtDamage);
+                    DamageSpecifier damage = new(_prototypeManager.Index(AsphyxiationDamageType), dealtDamage);
 
                     _damageable.TryChangeDamage(playerEntity, damage, true, useVariance: false, useModifier: false); // Sunrise-Edit
                 }
             }
 
             if (playerEntity != null)
-                _adminLog.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}");
+                _adminLog.Add(LogType.Mind, $"{ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}");
 
             var ghost = SpawnGhost((mindId, mind), position, canReturn);
             // Sunrise-Start
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index c42ca8ba18..46e5052506 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -6,7 +6,6 @@ using Content.Server.Ghost.Roles.Components;
 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;
@@ -140,8 +139,8 @@ public sealed class GhostRoleSystem : EntitySystem
             return;
         // Sunrise-End
 
-        if ((session.AttachedEntity is not { Valid: true } attached ||
-             !EntityManager.HasComponent<GhostComponent>(attached)) && status != PlayerGameStatus.NotReadyToPlay) // Sunrise-Edit
+        if (session.AttachedEntity is not { Valid: true } attached ||
+            !HasComp<GhostComponent>(attached))
             return;
 
         if (_openUis.ContainsKey(session))
@@ -554,8 +553,13 @@ public sealed class GhostRoleSystem : EntitySystem
 
         DebugTools.AssertNotNull(player.ContentData());
 
+        // After taking a ghost role, the player cannot return to the original body, so wipe the player's current mind
+        // unless it is a visiting mind
+        if(_mindSystem.TryGetMind(player.UserId, out _, out var mind) && !mind.IsVisitingEntity)
+            _mindSystem.WipeMind(player);
+
         var newMind = _mindSystem.CreateMind(player.UserId,
-            EntityManager.GetComponent<MetaDataComponent>(mob).EntityName);
+            Comp<MetaDataComponent>(mob).EntityName);
 
         _mindSystem.SetUserId(newMind, player.UserId);
         _mindSystem.TransferTo(newMind, mob);
@@ -744,7 +748,7 @@ public sealed class GhostRoleSystem : EntitySystem
         RaiseLocalEvent(mob, spawnedEvent);
 
         if (ghostRole.MakeSentient)
-            MakeSentientCommand.MakeSentient(mob, EntityManager, ghostRole.AllowMovement, ghostRole.AllowSpeech);
+            _mindSystem.MakeSentient(mob, ghostRole.AllowMovement, ghostRole.AllowSpeech);
 
         EnsureComp<MindContainerComponent>(mob);
 
@@ -791,7 +795,7 @@ public sealed class GhostRoleSystem : EntitySystem
         }
 
         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/GhostKick/GhostKickManager.cs b/Content.Server/GhostKick/GhostKickManager.cs
index 40d21d79d2..61d8cf9b32 100644
--- a/Content.Server/GhostKick/GhostKickManager.cs
+++ b/Content.Server/GhostKick/GhostKickManager.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GhostKick;
 
 // Handles logic for "ghost kicking".
 // Basically we boot the client off the server without telling them, so the game shits itself.
-// Hilariously isn't it?
+// Hilarious, isn't it?
 
 public sealed class GhostKickManager
 {
@@ -45,32 +45,30 @@ public sealed class GhostKickManager
 }
 
 [AdminCommand(AdminFlags.Moderator)]
-public sealed class GhostKickCommand : IConsoleCommand
+public sealed class GhostKickCommand : LocalizedEntityCommands
 {
-    public string Command => "ghostkick";
-    public string Description => "Kick a client from the server as if their network just dropped.";
-    public string Help => "Usage: ghostkick <Player> [Reason]";
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly GhostKickManager _ghostKick = default!;
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "ghostkick";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length < 1)
         {
-            shell.WriteError("Need at least one argument");
+            shell.WriteError(Loc.GetString($"shell-need-exactly-one-argument"));
             return;
         }
 
         var playerName = args[0];
-        var reason = args.Length > 1 ? args[1] : "Ghost kicked by console";
+        var reason = args.Length > 1 ? args[1] : Loc.GetString($"cmd-ghostkick-default-reason");
 
-        var players = IoCManager.Resolve<IPlayerManager>();
-        var ghostKick = IoCManager.Resolve<GhostKickManager>();
-
-        if (!players.TryGetSessionByUsername(playerName, out var player))
+        if (!_playerManager.TryGetSessionByUsername(playerName, out var player))
         {
-            shell.WriteError($"Unable to find player: '{playerName}'.");
+            shell.WriteError(Loc.GetString($"shell-target-player-does-not-exist"));
             return;
         }
 
-        ghostKick.DoDisconnect(player.Channel, reason);
+        _ghostKick.DoDisconnect(player.Channel, reason);
     }
 }
diff --git a/Content.Server/GhostKick/GhostKickUserOnTriggerComponent.cs b/Content.Server/GhostKick/GhostKickUserOnTriggerComponent.cs
deleted file mode 100644
index 11fb0156a4..0000000000
--- a/Content.Server/GhostKick/GhostKickUserOnTriggerComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.GhostKick;
-
-[RegisterComponent]
-public sealed partial class GhostKickUserOnTriggerComponent : Component
-{
-
-}
diff --git a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs b/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
deleted file mode 100644
index 2a5d9065fa..0000000000
--- a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Player;
-
-namespace Content.Server.GhostKick;
-
-public sealed class GhostKickUserOnTriggerSystem : EntitySystem
-{
-    [Dependency] private readonly GhostKickManager _ghostKickManager = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<GhostKickUserOnTriggerComponent, TriggerEvent>(HandleMineTriggered);
-    }
-
-    private void HandleMineTriggered(EntityUid uid, GhostKickUserOnTriggerComponent userOnTriggerComponent, TriggerEvent args)
-    {
-        if (!TryComp(args.User, out ActorComponent? actor))
-            return;
-
-        _ghostKickManager.DoDisconnect(
-            actor.PlayerSession.Channel,
-            "Tripped over a kick mine, crashed through the fourth wall");
-
-        args.Handled = true;
-    }
-}
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 357046be56..0f7b6ce3f9 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -1,5 +1,4 @@
 using System.Numerics;
-using Content.Server.Inventory;
 using Content.Server.Stack;
 using Content.Server.Stunnable;
 using Content.Shared.ActionBlocker;
@@ -10,9 +9,7 @@ using Content.Shared.Explosion;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
-using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Stacks;
 using Content.Shared.Standing;
@@ -24,7 +21,6 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Hands.Systems
 {
@@ -87,10 +83,9 @@ namespace Content.Server.Hands.Systems
             if (ent.Comp.DisableExplosionRecursion)
                 return;
 
-            foreach (var hand in ent.Comp.Hands.Values)
+            foreach (var held in EnumerateHeld(ent.AsNullable()))
             {
-                if (hand.HeldEntity is { } uid)
-                    args.Contents.Add(uid);
+                args.Contents.Add(held);
             }
         }
 
@@ -112,7 +107,7 @@ namespace Content.Server.Hands.Systems
             args.Handled = true; // no shove/stun.
         }
 
-        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
+        private void HandleBodyPartAdded(Entity<HandsComponent> ent, ref BodyPartAddedEvent args)
         {
             if (args.Part.Comp.PartType != BodyPartType.Hand)
                 return;
@@ -127,7 +122,7 @@ namespace Content.Server.Hands.Systems
                 _ => throw new ArgumentOutOfRangeException(nameof(args.Part.Comp.Symmetry))
             };
 
-            AddHand(uid, args.Slot, location);
+            AddHand(ent.AsNullable(), args.Slot, location);
         }
 
         private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args)
@@ -155,17 +150,17 @@ namespace Content.Server.Hands.Systems
         {
             if (ContainerSystem.IsEntityInContainer(player) ||
                 !TryComp(player, out HandsComponent? hands) ||
-                hands.ActiveHandEntity is not { } throwEnt ||
-                !_actionBlockerSystem.CanThrow(player, throwEnt))
+                !TryGetActiveItem((player, hands), out var throwEnt) ||
+                !_actionBlockerSystem.CanThrow(player, throwEnt.Value))
                 return false;
 
             if (_timing.CurTime < hands.NextThrowTime)
                 return false;
             hands.NextThrowTime = _timing.CurTime + hands.ThrowCooldown;
 
-            if (EntityManager.TryGetComponent(throwEnt, out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually)
+            if (TryComp(throwEnt, out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually)
             {
-                var splitStack = _stackSystem.Split(throwEnt, 1, EntityManager.GetComponent<TransformComponent>(player).Coordinates, stack);
+                var splitStack = _stackSystem.Split(throwEnt.Value, 1, Comp<TransformComponent>(player).Coordinates, stack);
 
                 if (splitStack is not {Valid: true})
                     return false;
@@ -185,14 +180,14 @@ namespace Content.Server.Hands.Systems
 
             // Let other systems change the thrown entity (useful for virtual items)
             // or the throw strength.
-            var ev = new BeforeThrowEvent(throwEnt, direction, throwSpeed, player);
+            var ev = new BeforeThrowEvent(throwEnt.Value, direction, throwSpeed, player);
             RaiseLocalEvent(player, ref ev);
 
             if (ev.Cancelled)
                 return true;
 
             // This can grief the above event so we raise it afterwards
-            if (IsHolding(player, throwEnt, out _, hands) && !TryDrop(player, throwEnt, handsComp: hands))
+            if (IsHolding((player, hands), throwEnt, out _) && !TryDrop(player, throwEnt.Value))
                 return false;
 
             _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowSpeed, ev.PlayerUid, compensateFriction: !HasComp<LandAtCursorComponent>(ev.ItemUid));
@@ -207,20 +202,20 @@ namespace Content.Server.Hands.Systems
             var spreadMaxAngle = Angle.FromDegrees(DropHeldItemsSpread);
 
             var fellEvent = new FellDownEvent(entity);
-            RaiseLocalEvent(entity, fellEvent, false);
+            RaiseLocalEvent(entity, fellEvent);
 
-            foreach (var hand in entity.Comp.Hands.Values)
+            foreach (var hand in entity.Comp.Hands.Keys)
             {
-                if (hand.HeldEntity is not EntityUid held)
+                if (!TryGetHeldItem(entity.AsNullable(), hand, out var heldEntity))
                     continue;
 
                 var throwAttempt = new FellDownThrowAttemptEvent(entity);
-                RaiseLocalEvent(hand.HeldEntity.Value, ref throwAttempt);
+                RaiseLocalEvent(heldEntity.Value, ref throwAttempt);
 
                 if (throwAttempt.Cancelled)
                     continue;
 
-                if (!TryDrop(entity, hand, null, checkActionBlocker: false, handsComp: entity.Comp))
+                if (!TryDrop(entity.AsNullable(), hand, checkActionBlocker: false))
                     continue;
 
                 // Rotate the item's throw vector a bit for each item
@@ -231,12 +226,12 @@ namespace Content.Server.Hands.Systems
                 itemVelocity *= _random.NextFloat(1f);
                 // Heavier objects don't get thrown as far
                 // If the item doesn't have a physics component, it isn't going to get thrown anyway, but we'll assume infinite mass
-                itemVelocity *= _physicsQuery.TryComp(held, out var heldPhysics) ? heldPhysics.InvMass : 0;
+                itemVelocity *= _physicsQuery.TryComp(heldEntity, out var heldPhysics) ? heldPhysics.InvMass : 0;
                 // Throw at half the holder's intentional throw speed and
                 // vary the speed a little to make it look more interesting
                 var throwSpeed = entity.Comp.BaseThrowspeed * _random.NextFloat(0.45f, 0.55f);
 
-                _throwingSystem.TryThrow(held,
+                _throwingSystem.TryThrow(heldEntity.Value,
                     itemVelocity,
                     throwSpeed,
                     entity,
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index f2bd0e05ad..884fb3ae71 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Speech.Components;
 using Content.Server.Telephone;
 using Content.Shared.Access.Systems;
 using Content.Shared.Audio;
@@ -12,6 +11,7 @@ using Content.Shared.Labels.Components;
 using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
@@ -560,7 +560,7 @@ public sealed class HolopadSystem : SharedHolopadSystem
             entity.Comp.User = (user.Value, holopadUser);
         }
 
-        // Add the new user to PVS and sync their appearance with any 
+        // Add the new user to PVS and sync their appearance with any
         // holopads connected to the one they are using
         _pvs.AddGlobalOverride(user.Value);
         SyncHolopadHologramAppearanceWithTarget(entity, entity.Comp.User);
diff --git a/Content.Server/Holosign/HolosignSystem.cs b/Content.Server/Holosign/HolosignSystem.cs
index b63a545989..58ed77ecf8 100644
--- a/Content.Server/Holosign/HolosignSystem.cs
+++ b/Content.Server/Holosign/HolosignSystem.cs
@@ -51,7 +51,7 @@ public sealed class HolosignSystem : EntitySystem
 
         // places the holographic sign at the click location, snapped to grid.
         // overlapping of the same holo on one tile remains allowed to allow holofan refreshes
-        var holoUid = EntityManager.SpawnEntity(component.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
+        var holoUid = Spawn(component.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
         var xform = Transform(holoUid);
         if (!xform.Anchored)
             _transform.AnchorEntity(holoUid, xform); // anchor to prevent any tempering with (don't know what could even interact with it)
diff --git a/Content.Server/HotPotato/HotPotatoSystem.cs b/Content.Server/HotPotato/HotPotatoSystem.cs
index 115a7b6cb7..554fe098b0 100644
--- a/Content.Server/HotPotato/HotPotatoSystem.cs
+++ b/Content.Server/HotPotato/HotPotatoSystem.cs
@@ -1,61 +1,5 @@
-using Content.Server.Audio;
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.HotPotato;
-using Content.Shared.Popups;
-using Content.Shared.Weapons.Melee.Events;
 
 namespace Content.Server.HotPotato;
 
-public sealed class HotPotatoSystem : SharedHotPotatoSystem
-{
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly AmbientSoundSystem _ambientSound = default!;
-    [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<HotPotatoComponent, ActiveTimerTriggerEvent>(OnActiveTimer);
-        SubscribeLocalEvent<HotPotatoComponent, MeleeHitEvent>(OnMeleeHit);
-    }
-
-    private void OnActiveTimer(EntityUid uid, HotPotatoComponent comp, ref ActiveTimerTriggerEvent args)
-    {
-        EnsureComp<ActiveHotPotatoComponent>(uid);
-        comp.CanTransfer = false;
-        _ambientSound.SetAmbience(uid, true);
-        _damageOnHolding.SetEnabled(uid, true);
-        Dirty(uid, comp);
-    }
-
-    private void OnMeleeHit(EntityUid uid, HotPotatoComponent comp, MeleeHitEvent args)
-    {
-        if (!HasComp<ActiveHotPotatoComponent>(uid))
-            return;
-
-        comp.CanTransfer = true;
-        foreach (var hitEntity in args.HitEntities)
-        {
-            if (!TryComp<HandsComponent>(hitEntity, out var hands))
-                continue;
-
-            if (!_hands.IsHolding(hitEntity, uid, out _, hands) && _hands.TryForcePickupAnyHand(hitEntity, uid, handsComp: hands))
-            {
-                _popup.PopupEntity(Loc.GetString("hot-potato-passed",
-                    ("from", args.User), ("to", hitEntity)), uid, PopupType.Medium);
-                break;
-            }
-
-            _popup.PopupEntity(Loc.GetString("hot-potato-failed",
-                ("to", hitEntity)), uid, PopupType.Medium);
-
-            break;
-        }
-        comp.CanTransfer = false;
-        Dirty(uid, comp);
-    }
-}
+public sealed class HotPotatoSystem : SharedHotPotatoSystem;
diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
index 109a3a77b5..4d5f06c91c 100644
--- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
+++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
@@ -54,8 +54,8 @@ public sealed class RandomHumanoidSystem : EntitySystem
             foreach (var entry in prototype.Components.Values)
             {
                 var comp = (Component)_serialization.CreateCopy(entry.Component, notNullableOverride: true);
-                EntityManager.RemoveComponent(humanoid, comp.GetType());
-                EntityManager.AddComponent(humanoid, comp);
+                RemComp(humanoid, comp.GetType());
+                AddComp(humanoid, comp);
             }
         }
 
diff --git a/Content.Server/IgnitionSource/IgniteOnTriggerComponent.cs b/Content.Server/IgnitionSource/IgniteOnTriggerComponent.cs
deleted file mode 100644
index 939198c45e..0000000000
--- a/Content.Server/IgnitionSource/IgniteOnTriggerComponent.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.IgnitionSource;
-
-/// <summary>
-/// Ignites for a certain length of time when triggered.
-/// Requires <see cref="Shared.IgnitionSourceComponent"/> along with triggering components.
-/// </summary>
-[RegisterComponent, Access(typeof(IgniteOnTriggerSystem))]
-public sealed partial class IgniteOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Once ignited, the time it will unignite at.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan IgnitedUntil = TimeSpan.Zero;
-
-    /// <summary>
-    /// How long the ignition source is active for after triggering.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan IgnitedTime = TimeSpan.FromSeconds(0.5);
-
-    /// <summary>
-    /// Sound to play when igniting.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier IgniteSound = new SoundCollectionSpecifier("WelderOn");
-}
diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
index d881f90341..bcbcfda9af 100644
--- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
@@ -35,7 +35,7 @@ public sealed class ImmovableRodSystem : EntitySystem
         base.Update(frameTime);
 
         // we are deliberately including paused entities. rod hungers for all
-        foreach (var (rod, trans) in EntityManager.EntityQuery<ImmovableRodComponent, TransformComponent>(true))
+        foreach (var (rod, trans) in EntityQuery<ImmovableRodComponent, TransformComponent>(true))
         {
             if (!rod.DestroyTiles)
                 continue;
@@ -58,7 +58,7 @@ public sealed class ImmovableRodSystem : EntitySystem
 
     private void OnMapInit(EntityUid uid, ImmovableRodComponent component, MapInitEvent args)
     {
-        if (EntityManager.TryGetComponent(uid, out PhysicsComponent? phys))
+        if (TryComp(uid, out PhysicsComponent? phys))
         {
             _physics.SetLinearDamping(uid, phys, 0f);
             _physics.SetFriction(uid, phys, 0f);
diff --git a/Content.Server/Implants/Components/AutoImplantComponent.cs b/Content.Server/Implants/Components/AutoImplantComponent.cs
index e082354d8b..48cfabf58f 100644
--- a/Content.Server/Implants/Components/AutoImplantComponent.cs
+++ b/Content.Server/Implants/Components/AutoImplantComponent.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.Implants.Components;
 
@@ -12,6 +11,6 @@ public sealed partial class AutoImplantComponent : Component
     /// <summary>
     /// List of implants to inject.
     /// </summary>
-    [DataField("implants", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> Implants = new();
+    [DataField(required: true)]
+    public List<EntProtoId> Implants = new();
 }
diff --git a/Content.Server/Implants/Components/ScramImplantComponent.cs b/Content.Server/Implants/Components/ScramImplantComponent.cs
deleted file mode 100644
index 582bab8d44..0000000000
--- a/Content.Server/Implants/Components/ScramImplantComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Server.Implants;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Implants.Components;
-
-/// <summary>
-/// Randomly teleports entity when triggered.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ScramImplantComponent : Component
-{
-    /// <summary>
-    /// Up to how far to teleport the user
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float TeleportRange = 100f; // Sunrise-Edit
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float MinTeleportDistance = 25f; // Sunrise-Edit
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
-}
diff --git a/Content.Server/Implants/ImplantedSystem.cs b/Content.Server/Implants/ImplantedSystem.cs
index cb6ce12a35..c5d1d63519 100644
--- a/Content.Server/Implants/ImplantedSystem.cs
+++ b/Content.Server/Implants/ImplantedSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Components;
+using Content.Shared.Body.Events;
 using Content.Shared.Implants.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index ef1b15feee..f0530358a6 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -1,69 +1,21 @@
-using System.Linq;
-using Content.Server.Cuffs;
-using Content.Server.Forensics;
-using Content.Server.Humanoid;
-using Content.Server.Implants.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
-using Content.Shared.Cuffs.Components;
-using Content.Shared.Forensics;
-using Content.Shared.Forensics.Components;
-using Content.Shared.Humanoid;
 using Content.Shared.Implants;
-using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Physics;
 using Content.Shared.Popups;
-using Content.Shared.Preferences;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Random;
-using System.Numerics;
-using Content.Server.Body.Components;
-using Content.Shared.Maps;
-using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Movement.Pulling.Systems;
-using Content.Server.IdentityManagement;
-using Content.Shared.DetailExaminable;
 using Content.Shared.Store.Components;
-using Robust.Server.Containers;
-using Robust.Shared.Collections;
-using Robust.Shared.Map.Components;
 
 namespace Content.Server.Implants;
 
 public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
 {
-    [Dependency] private readonly CuffableSystem _cuffable = default!;
-    [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly StoreSystem _store = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
-    [Dependency] private readonly PullingSystem _pullingSystem = default!;
-    [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
-    [Dependency] private readonly IdentitySystem _identity = default!;
-
-    private EntityQuery<PhysicsComponent> _physicsQuery;
-    private HashSet<Entity<MapGridComponent>> _targetGrids = [];
-
     public override void Initialize()
     {
         base.Initialize();
 
-        _physicsQuery = GetEntityQuery<PhysicsComponent>();
-
-        SubscribeLocalEvent<SubdermalImplantComponent, UseFreedomImplantEvent>(OnFreedomImplant);
         SubscribeLocalEvent<StoreComponent, ImplantRelayEvent<AfterInteractUsingEvent>>(OnStoreRelay);
-        SubscribeLocalEvent<SubdermalImplantComponent, ActivateImplantEvent>(OnActivateImplantEvent);
-        SubscribeLocalEvent<SubdermalImplantComponent, UseScramImplantEvent>(OnScramImplant);
-        SubscribeLocalEvent<SubdermalImplantComponent, UseDnaScramblerImplantEvent>(OnDnaScramblerImplant);
     }
 
     private void OnStoreRelay(EntityUid uid, StoreComponent store, ImplantRelayEvent<AfterInteractUsingEvent> implantRelay)
@@ -88,161 +40,4 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
         var msg = Loc.GetString("store-currency-inserted-implant", ("used", args.Used));
         _popup.PopupEntity(msg, args.User, args.User);
     }
-
-    private void OnFreedomImplant(EntityUid uid, SubdermalImplantComponent component, UseFreedomImplantEvent args)
-    {
-        if (!TryComp<CuffableComponent>(component.ImplantedEntity, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1)
-            return;
-
-        _cuffable.Uncuff(component.ImplantedEntity.Value, cuffs.LastAddedCuffs, cuffs.LastAddedCuffs);
-        args.Handled = true;
-    }
-
-    private void OnActivateImplantEvent(EntityUid uid, SubdermalImplantComponent component, ActivateImplantEvent args)
-    {
-        args.Handled = true;
-    }
-
-    private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component, UseScramImplantEvent args)
-    {
-        if (component.ImplantedEntity is not { } ent)
-            return;
-
-        if (!TryComp<ScramImplantComponent>(uid, out var implant))
-            return;
-
-        // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
-        // This can for example happen when the user is cuffed and being pulled.
-        if (TryComp<PullableComponent>(ent, out var pull) && _pullingSystem.IsPulled(ent, pull))
-            _pullingSystem.TryStopPull(ent, pull);
-
-        // Check if the user is pulling anything, and drop it if so
-        if (TryComp<PullerComponent>(ent, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))
-            _pullingSystem.TryStopPull(puller.Pulling.Value, pullable);
-
-        var xform = Transform(ent);
-        var targetCoords = SelectRandomTileInRange(xform, implant.TeleportRange, implant.MinTeleportDistance); // Sunrise-Edit
-
-        if (targetCoords != null)
-        {
-            _xform.SetCoordinates(ent, targetCoords.Value);
-            _audio.PlayPvs(implant.TeleportSound, ent);
-            args.Handled = true;
-        }
-    }
-
-    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float range, float minDistance) // Sunrise-Edit
-    {
-        var userCoords = _xform.ToMapCoordinates(userXform.Coordinates);
-        _targetGrids.Clear();
-        _lookupSystem.GetEntitiesInRange(userCoords, range, _targetGrids);
-        Entity<MapGridComponent>? targetGrid = null;
-
-        if (_targetGrids.Count == 0)
-            return null;
-
-        // Give preference to the grid the entity is currently on.
-        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
-        // In reality the probability is higher and depends on the number of grids.
-        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
-        {
-            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
-            if (_random.Prob(0.5f))
-            {
-                _targetGrids.Remove(userGrid);
-                targetGrid = userGrid;
-            }
-        }
-
-        if (targetGrid == null)
-            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
-
-        EntityCoordinates? targetCoords = null;
-
-        do
-        {
-            var valid = false;
-            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
-            var tilesInRange = _mapSystem.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
-            var tileList = new ValueList<Vector2i>();
-
-            while (tilesInRange.MoveNext(out var tile))
-            {
-                // Sunrise-Start
-                if (!tile.IsSpace())
-                    tileList.Add(tile.GridIndices);
-                // Sunrise-End
-            }
-
-            while (tileList.Count != 0)
-            {
-                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
-                valid = true;
-
-                // Sunrise-Start
-                var tileWorldPos = _mapSystem.GridTileToWorldPos(targetGrid.Value, targetGrid.Value.Comp, tile);
-
-                var distanceSquared = (tileWorldPos - userCoords.Position).Length();
-                if (distanceSquared < minDistance)
-                {
-                    valid = false;
-                    continue;
-                }
-                // Sunrise-End
-
-                foreach (var entity in _mapSystem.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp, tile))
-                {
-                    if (!_physicsQuery.TryGetComponent(entity, out var body))
-                        continue;
-
-                    if (body.BodyType != BodyType.Static ||
-                        !body.Hard ||
-                        (body.CollisionLayer & (int) CollisionGroup.MobMask) == 0)
-                        continue;
-
-                    valid = false;
-                    break;
-                }
-
-                if (valid)
-                {
-                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
-                        _mapSystem.TileCenterToVector(targetGrid.Value, tile));
-                    break;
-                }
-            }
-
-            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
-                break;
-
-            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
-        } while (true);
-
-        return targetCoords;
-    }
-
-    private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent component, UseDnaScramblerImplantEvent args)
-    {
-        if (component.ImplantedEntity is not { } ent)
-            return;
-
-        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoid))
-        {
-            var newProfile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
-            _humanoidAppearance.LoadProfile(ent, newProfile, humanoid);
-            _metaData.SetEntityName(ent, newProfile.Name, raiseEvents: false); // raising events would update ID card, station record, etc.
-
-            // If the entity has the respecive components, then scramble the dna and fingerprint strings
-            _forensicsSystem.RandomizeDNA(ent);
-            _forensicsSystem.RandomizeFingerprint(ent);
-
-            RemComp<DetailExaminableComponent>(ent); // remove MRP+ custom description if one exists
-            _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event
-            _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), ent, ent);
-        }
-
-        args.Handled = true;
-        // Sunrise-Edit
-        //QueueDel(uid);
-    }
 }
diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
index eb3fb08db0..c6cc585270 100644
--- a/Content.Server/Info/ShowRulesCommand.cs
+++ b/Content.Server/Info/ShowRulesCommand.cs
@@ -10,55 +10,46 @@ using Robust.Shared.Network;
 namespace Content.Server.Info;
 
 [AdminCommand(AdminFlags.Admin)]
-public sealed class ShowRulesCommand : IConsoleCommand
+public sealed class ShowRulesCommand : LocalizedCommands
 {
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
 
-    public string Command => "showrules";
-    public string Description => "Opens the rules popup for the specified player.";
-    public string Help => "showrules <username> [seconds]";
-    public async void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "showrules";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        string target;
-        float seconds;
-
-        switch (args.Length)
+        if (args.Length is < 1 or > 2)
         {
-            case 1:
-            {
-                target = args[0];
-                seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
-                break;
-            }
-            case 2:
-            {
-                if (!float.TryParse(args[1], out seconds))
-                {
-                    shell.WriteError($"{args[1]} is not a valid amount of seconds.\n{Help}");
-                    return;
-                }
-
-                target = args[0];
-                break;
-            }
-            default:
-            {
-                shell.WriteLine(Help);
-                return;
-            }
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
         }
 
+        var seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
 
-        if (!_player.TryGetSessionByUsername(target, out var player))
+        if (args.Length == 2 && !float.TryParse(args[1], out seconds))
         {
-            shell.WriteError("Unable to find a player with that name.");
-           return;
+            shell.WriteError(Loc.GetString("cmd-showrules-invalid-seconds", ("seconds", args[1])));
+            return;
+        }
+
+        if (!_player.TryGetSessionByUsername(args[0], out var player))
+        {
+            shell.WriteError(Loc.GetString("shell-target-player-does-not-exist"));
+            return;
         }
 
         var coreRules = _configuration.GetCVar(CCVars.RulesFile);
-        var message = new SendRulesInformationMessage { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true};
+        var message = new SendRulesInformationMessage
+            { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true };
         _net.ServerSendMessage(message, player.Channel);
     }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        return args.Length == 1
+            ? CompletionResult.FromOptions(CompletionHelper.SessionNames(players: _player))
+            : CompletionResult.Empty;
+    }
 }
diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
index a347d7ea41..56b64576ca 100644
--- a/Content.Server/Instruments/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -156,6 +156,15 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
             return;
         }
 
+
+        foreach (var t in msg.Tracks)
+        {
+            // Remove any control characters that may be part of the midi file so they don't end up in the admin logs.
+            t?.SanitizeFields();
+            // Truncate any track names too long.
+            t?.TruncateFields(_cfg.GetCVar(CCVars.MidiMaxChannelNameLength));
+        }
+
         var tracksString = string.Join("\n",
             msg.Tracks
             .Where(t => t != null)
@@ -166,12 +175,6 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
             LogImpact.Low,
             $"{ToPrettyString(args.SenderSession.AttachedEntity)} set the midi channels for {ToPrettyString(uid)} to {tracksString}");
 
-        // Truncate any track names too long.
-        foreach (var t in msg.Tracks)
-        {
-            t?.TruncateFields(_cfg.GetCVar(CCVars.MidiMaxChannelNameLength));
-        }
-
         activeInstrument.Tracks = msg.Tracks;
 
         Dirty(uid, activeInstrument);
@@ -268,20 +271,20 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
 
     public (NetEntity, string)[] GetBands(EntityUid uid)
     {
-        var metadataQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
+        var metadataQuery = GetEntityQuery<MetaDataComponent>();
 
         if (Deleted(uid))
             return Array.Empty<(NetEntity, string)>();
 
         var list = new ValueList<(NetEntity, string)>();
-        var instrumentQuery = EntityManager.GetEntityQuery<InstrumentComponent>();
+        var instrumentQuery = GetEntityQuery<InstrumentComponent>();
 
         if (!TryComp(uid, out InstrumentComponent? originInstrument)
             || originInstrument.InstrumentPlayer is not {} originPlayer)
             return Array.Empty<(NetEntity, string)>();
 
         // It's probably faster to get all possible active instruments than all entities in range
-        var activeEnumerator = EntityManager.EntityQueryEnumerator<ActiveInstrumentComponent>();
+        var activeEnumerator = EntityQueryEnumerator<ActiveInstrumentComponent>();
         while (activeEnumerator.MoveNext(out var entity, out _))
         {
             if (entity == uid)
@@ -424,8 +427,8 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
             _bandRequestQueue.Clear();
         }
 
-        var activeQuery = EntityManager.GetEntityQuery<ActiveInstrumentComponent>();
-        var transformQuery = EntityManager.GetEntityQuery<TransformComponent>();
+        var activeQuery = GetEntityQuery<ActiveInstrumentComponent>();
+        var transformQuery = GetEntityQuery<TransformComponent>();
 
         var query = AllEntityQuery<ActiveInstrumentComponent, InstrumentComponent>();
         while (query.MoveNext(out var uid, out _, out var instrument))
@@ -458,7 +461,7 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
             {
                 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/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs
index e8999a7d18..6db649a5e7 100644
--- a/Content.Server/Interaction/TilePryCommand.cs
+++ b/Content.Server/Interaction/TilePryCommand.cs
@@ -5,19 +5,21 @@ using Content.Shared.Maps;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Interaction;
 
 [AdminCommand(AdminFlags.Debug)]
-public sealed class TilePryCommand : IConsoleCommand
+public sealed class TilePryCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _entities = default!;
+    [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
-    public string Command => "tilepry";
-    public string Description => "Pries up all tiles in a radius around the user.";
-    public string Help => $"Usage: {Command} <radius>";
+    private readonly string _platingId = "Plating";
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "tilepry";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var player = shell.Player;
         if (player?.AttachedEntity is not { } attached)
@@ -33,39 +35,38 @@ public sealed class TilePryCommand : IConsoleCommand
 
         if (!int.TryParse(args[0], out var radius))
         {
-            shell.WriteError($"{args[0]} isn't a valid integer.");
+            shell.WriteError(Loc.GetString($"cmd-tilepry-arg-must-be-number", ("arg", args[0])));
             return;
         }
 
         if (radius < 0)
         {
-            shell.WriteError("Radius must be positive.");
+            shell.WriteError(Loc.GetString($"cmd-tilepry-radius-must-be-positive"));
             return;
         }
 
-        var mapSystem = _entities.System<SharedMapSystem>();
-        var xform = _entities.GetComponent<TransformComponent>(attached);
+        var xform = EntityManager.GetComponent<TransformComponent>(attached);
 
         var playerGrid = xform.GridUid;
 
-        if (!_entities.TryGetComponent<MapGridComponent>(playerGrid, out var mapGrid))
+        if (!EntityManager.TryGetComponent<MapGridComponent>(playerGrid, out var mapGrid))
             return;
 
         var playerPosition = xform.Coordinates;
-        var tileDefinitionManager = IoCManager.Resolve<ITileDefinitionManager>();
 
         for (var i = -radius; i <= radius; i++)
         {
             for (var j = -radius; j <= radius; j++)
             {
-                var tile = mapSystem.GetTileRef(playerGrid.Value, mapGrid, playerPosition.Offset(new Vector2(i, j)));
-                var coordinates = mapSystem.GridTileToLocal(playerGrid.Value, mapGrid, tile.GridIndices);
-                var tileDef = (ContentTileDefinition)tileDefinitionManager[tile.Tile.TypeId];
+                var tile = _mapSystem.GetTileRef(playerGrid.Value, mapGrid, playerPosition.Offset(new Vector2(i, j)));
+                var coordinates = _mapSystem.GridTileToLocal(playerGrid.Value, mapGrid, tile.GridIndices);
+                var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId];
 
-                if (!tileDef.CanCrowbar) continue;
+                if (!tileDef.CanCrowbar)
+                    continue;
 
-                var plating = tileDefinitionManager["Plating"];
-                mapSystem.SetTile(playerGrid.Value, mapGrid, coordinates, new Tile(plating.TileId));
+                var plating = _tileDefinitionManager[_platingId];
+                _mapSystem.SetTile(playerGrid.Value, mapGrid, coordinates, new Tile(plating.TileId));
             }
         }
     }
diff --git a/Content.Server/Jobs/AddImplantSpecial.cs b/Content.Server/Jobs/AddImplantSpecial.cs
index 83193e7056..3967a08d9e 100644
--- a/Content.Server/Jobs/AddImplantSpecial.cs
+++ b/Content.Server/Jobs/AddImplantSpecial.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
 namespace Content.Server.Jobs;
 
@@ -12,8 +11,8 @@ namespace Content.Server.Jobs;
 [UsedImplicitly]
 public sealed partial class AddImplantSpecial : JobSpecial
 {
-    [DataField("implants", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<EntityPrototype>))]
-    public HashSet<String> Implants { get; private set; } = new();
+    [DataField]
+    public HashSet<EntProtoId> Implants { get; private set; } = new();
 
     public override void AfterEquip(EntityUid mob)
     {
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 6d36f7457b..f5c8c4d0d8 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -70,8 +70,7 @@ namespace Content.Server.Kitchen.EntitySystems
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedSuicideSystem _suicide = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        private const string MalfunctionSpark = "Spark";
+        private static readonly EntProtoId MalfunctionSpark = "Spark";
 
         private static readonly ProtoId<TagPrototype> MetalTag = "Metal";
         private static readonly ProtoId<TagPrototype> PlasticTag = "Plastic";
@@ -137,7 +136,7 @@ namespace Content.Server.Kitchen.EntitySystems
 
         private void OnActiveMicrowaveRemove(Entity<ActiveMicrowaveComponent> ent, ref EntRemovedFromContainerMessage args)
         {
-            EntityManager.RemoveComponentDeferred<ActivelyMicrowavedComponent>(args.Entity);
+            RemCompDeferred<ActivelyMicrowavedComponent>(args.Entity);
         }
 
         // Stop items from transforming through constructiongraphs while being microwaved.
@@ -749,7 +748,7 @@ namespace Content.Server.Kitchen.EntitySystems
             if (!HasContents(ent.Comp) || HasComp<ActiveMicrowaveComponent>(ent))
                 return;
 
-            _container.Remove(EntityManager.GetEntity(args.EntityID), ent.Comp.Storage);
+            _container.Remove(GetEntity(args.EntityID), ent.Comp.Storage);
             UpdateUserInterfaceState(ent, ent.Comp);
         }
 
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index 4b4e16b5db..0275e4d1a7 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -38,7 +38,7 @@ public sealed class SharpSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(UtensilSystem)]);
+        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(IngestionSystem)]);
         SubscribeLocalEvent<SharpComponent, SharpDoAfterEvent>(OnDoAfter);
 
         SubscribeLocalEvent<ButcherableComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
@@ -117,27 +117,26 @@ public sealed class SharpSystem : EntitySystem
             popupEnt = Spawn(proto, coords.Offset(_robustRandom.NextVector2(0.25f)));
         }
 
-        var hasBody = TryComp<BodyComponent>(args.Args.Target.Value, out var body);
-
         // only show a big popup when butchering living things.
-        var popupType = PopupType.Small;
-        if (hasBody)
-            popupType = PopupType.LargeCaution;
+        // Meant to differentiate cutting up clothes and cutting up your boss.
+        var popupType = HasComp<MobStateComponent>(args.Args.Target.Value)
+            ? PopupType.LargeCaution
+            : PopupType.Small;
 
         _popupSystem.PopupEntity(Loc.GetString("butcherable-knife-butchered-success", ("target", args.Args.Target.Value), ("knife", Identity.Entity(uid, EntityManager))),
-            popupEnt, args.Args.User, popupType);
-
-        if (hasBody)
-            _bodySystem.GibBody(args.Args.Target.Value, body: body);
+            popupEnt,
+            args.Args.User,
+            popupType);
 
+        _bodySystem.GibBody(args.Args.Target.Value); // does nothing if ent can't be gibbed
         _destructibleSystem.DestroyEntity(args.Args.Target.Value);
 
         args.Handled = true;
 
         _adminLogger.Add(LogType.Gib,
-            $"{EntityManager.ToPrettyString(args.User):user} " +
-            $"has butchered {EntityManager.ToPrettyString(args.Target):target} " +
-            $"with {EntityManager.ToPrettyString(args.Used):knife}");
+            $"{ToPrettyString(args.User):user} " +
+            $"has butchered {ToPrettyString(args.Target):target} " +
+            $"with {ToPrettyString(args.Used):knife}");
     }
 
     private void OnGetInteractionVerbs(EntityUid uid, ButcherableComponent component, GetVerbsEvent<InteractionVerb> args)
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 57d25ef8ab..fdea8e9c65 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Armable;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.LandMines;
 using Content.Shared.Popups;
 using Content.Shared.StepTrigger.Systems;
+using Content.Shared.Trigger.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.LandMines;
@@ -28,15 +28,15 @@ public sealed class LandMineSystem : EntitySystem
     /// </summary>
     private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
     {
-      if (!string.IsNullOrEmpty(component.TriggerText))
-      {
-          _popupSystem.PopupCoordinates(
-              Loc.GetString(component.TriggerText, ("mine", uid)),
-              Transform(uid).Coordinates,
-              args.Tripper,
-              PopupType.LargeCaution);
-      }
-      _audioSystem.PlayPvs(component.Sound, uid);
+        if (!string.IsNullOrEmpty(component.TriggerText))
+        {
+            _popupSystem.PopupCoordinates(
+                Loc.GetString(component.TriggerText, ("mine", uid)),
+                Transform(uid).Coordinates,
+                args.Tripper,
+                PopupType.LargeCaution);
+        }
+        _audioSystem.PlayPvs(component.Sound, uid);
     }
 
     /// <summary>
@@ -44,7 +44,8 @@ public sealed class LandMineSystem : EntitySystem
     /// </summary>
     private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
     {
-        _trigger.Trigger(uid, args.Tripper);
+        // TODO: Adjust to the new trigger system
+        _trigger.Trigger(uid, args.Tripper, TriggerSystem.DefaultTriggerKey);
     }
 
     /// <summary>
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 27be9f1989..4599fa31ae 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -184,7 +184,7 @@ namespace Content.Server.Lathe
 
                 _materialStorage.TryChangeMaterialAmount(uid, mat, adjustedAmount);
             }
-            component.Queue.Add(recipe);
+            component.Queue.Enqueue(recipe);
 
             return true;
         }
@@ -196,8 +196,8 @@ namespace Content.Server.Lathe
             if (component.CurrentRecipe != null || component.Queue.Count <= 0 || !this.IsPowered(uid, EntityManager))
                 return false;
 
-            var recipe = component.Queue.First();
-            component.Queue.RemoveAt(0);
+            var recipeProto = component.Queue.Dequeue();
+            var recipe = _proto.Index(recipeProto);
 
             var time = _reagentSpeed.ApplySpeed(uid, recipe.CompleteTime) * component.TimeMultiplier;
 
@@ -227,14 +227,15 @@ namespace Content.Server.Lathe
 
             if (comp.CurrentRecipe != null)
             {
-                if (comp.CurrentRecipe.Result is { } resultProto)
+                var currentRecipe = _proto.Index(comp.CurrentRecipe.Value);
+                if (currentRecipe.Result is { } resultProto)
                 {
                     var result = Spawn(resultProto, Transform(uid).Coordinates);
                     EnsureComp<DontSellComponent>(result); // Sunrise-Edit
                     _stack.TryMergeToContacts(result);
                 }
 
-                if (comp.CurrentRecipe.ResultReagents is { } resultReagents &&
+                if (currentRecipe.ResultReagents is { } resultReagents &&
                     comp.ReagentOutputSlotId is { } slotId)
                 {
                     var toAdd = new Solution(
@@ -271,9 +272,11 @@ namespace Content.Server.Lathe
             if (!Resolve(uid, ref component))
                 return;
 
-            var producing = component.CurrentRecipe ?? component.Queue.FirstOrDefault();
+            var producing = component.CurrentRecipe;
+            if (producing == null && component.Queue.TryPeek(out var next))
+                producing = next;
 
-            var state = new LatheUpdateState(GetAvailableRecipes(uid, component), component.Queue, producing);
+            var state = new LatheUpdateState(GetAvailableRecipes(uid, component), component.Queue.ToArray(), producing);
             _uiSys.SetUiState(uid, LatheUiKey.Key, state);
         }
 
diff --git a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
index 393f564b2f..f643bec73f 100644
--- a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
@@ -209,7 +209,7 @@ namespace Content.Server.Light.EntitySystems
 
             component.CurrentState = ExpendableLightState.BrandNew;
             component.StateExpiryTime = (float)component.GlowDuration.TotalSeconds;
-            EntityManager.EnsureComponent<PointLightComponent>(uid);
+            EnsureComp<PointLightComponent>(uid);
         }
 
         private void OnExpLightUse(Entity<ExpendableLightComponent> ent, ref UseInHandEvent args)
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
index b98ba15623..b5b9f20432 100644
--- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -76,7 +76,7 @@ namespace Content.Server.Light.EntitySystems
             // TODO: Use ContainerFill dog
             if (light.HasLampOnSpawn != null)
             {
-                var entity = EntityManager.SpawnEntity(light.HasLampOnSpawn, EntityManager.GetComponent<TransformComponent>(uid).Coordinates);
+                var entity = Spawn(light.HasLampOnSpawn, Comp<TransformComponent>(uid).Coordinates);
                 _containerSystem.Insert(entity, light.LightBulbContainer);
             }
             // need this to update visualizers
@@ -134,7 +134,7 @@ namespace Content.Server.Light.EntitySystems
                 return false;
 
             // check if bulb fits
-            if (!EntityManager.TryGetComponent(bulbUid, out LightBulbComponent? lightBulb))
+            if (!TryComp(bulbUid, out LightBulbComponent? lightBulb))
                 return false;
             if (lightBulb.Type != light.BulbType)
                 return false;
@@ -226,7 +226,7 @@ namespace Content.Server.Light.EntitySystems
 
             // check bulb state
             var bulbUid = GetBulb(uid, light);
-            if (bulbUid == null || !EntityManager.TryGetComponent(bulbUid.Value, out LightBulbComponent? lightBulb))
+            if (bulbUid == null || !TryComp(bulbUid.Value, out LightBulbComponent? lightBulb))
                 return false;
             if (lightBulb.State == LightBulbState.Broken)
                 return false;
@@ -252,7 +252,7 @@ namespace Content.Server.Light.EntitySystems
 
             // check if light has bulb
             var bulbUid = GetBulb(uid, light);
-            if (bulbUid == null || !EntityManager.TryGetComponent(bulbUid.Value, out LightBulbComponent? lightBulb))
+            if (bulbUid == null || !TryComp(bulbUid.Value, out LightBulbComponent? lightBulb))
             {
                 SetLight(uid, false, light: light);
                 powerReceiver.Load = 0;
@@ -348,7 +348,7 @@ namespace Content.Server.Light.EntitySystems
 
             light.IsBlinking = isNowBlinking;
 
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            if (!TryComp(uid, out AppearanceComponent? appearance))
                 return;
 
             _appearance.SetData(uid, PoweredLightVisuals.Blinking, isNowBlinking, appearance);
@@ -384,7 +384,7 @@ namespace Content.Server.Light.EntitySystems
             light.CurrentLit = value;
             _ambientSystem.SetAmbience(uid, value);
 
-            if (EntityManager.TryGetComponent(uid, out PointLightComponent? pointLight))
+            if (TryComp(uid, out PointLightComponent? pointLight))
             {
                 _pointLight.SetEnabled(uid, value, pointLight);
 
diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index 37302999ed..0fd00fca24 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -137,13 +137,13 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
         if (component.Target is not { } target)
             return;
 
-                // Check if the target getting their hair altered has any clothes that hides their hair
+        // Check if the target getting their hair altered has any clothes that hides their hair
         if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
         {
             _popup.PopupEntity(
                 component.Target == message.Actor
                     ? Loc.GetString("magic-mirror-blocked-by-hat-self")
-                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))),
                 message.Actor,
                 message.Actor,
                 PopupType.Medium);
@@ -222,7 +222,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
             _popup.PopupEntity(
                 component.Target == message.Actor
                     ? Loc.GetString("magic-mirror-blocked-by-hat-self")
-                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))),
                 message.Actor,
                 message.Actor,
                 PopupType.Medium);
@@ -301,7 +301,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
             _popup.PopupEntity(
                 component.Target == message.Actor
                     ? Loc.GetString("magic-mirror-blocked-by-hat-self")
-                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))),
                 message.Actor,
                 message.Actor,
                 PopupType.Medium);
diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs
index 7482ef811f..8081b8e45f 100644
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@@ -13,24 +13,24 @@ using Robust.Shared.Utility;
 namespace Content.Server.Mapping
 {
     [AdminCommand(AdminFlags.Server | AdminFlags.Mapping)]
-    sealed class MappingCommand : IConsoleCommand
+    public sealed class MappingCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entities = default!;
+        [Dependency] private readonly IResourceManager _resourceMgr = default!;
+        [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+        [Dependency] private readonly MappingSystem _mappingSystem = default!;
+        [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
 
-        public string Command => "mapping";
-        public string Description => Loc.GetString("cmd-mapping-desc");
-        public string Help => Loc.GetString("cmd-mapping-help");
+        public override string Command => "mapping";
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             switch (args.Length)
             {
                 case 1:
                     return CompletionResult.FromHint(Loc.GetString("cmd-hint-mapping-id"));
                 case 2:
-                    var res = IoCManager.Resolve<IResourceManager>();
-                    var opts = CompletionHelper.UserFilePath(args[1], res.UserData)
-                        .Concat(CompletionHelper.ContentFilePath(args[1], res));
+                    var opts = CompletionHelper.UserFilePath(args[1], _resourceMgr.UserData)
+                        .Concat(CompletionHelper.ContentFilePath(args[1], _resourceMgr));
                     return CompletionResult.FromHintOptions(opts, Loc.GetString("cmd-hint-mapping-path"));
                 case 3:
                     return CompletionResult.FromHintOptions(["false", "true"], Loc.GetString("cmd-mapping-hint-grid"));
@@ -38,7 +38,7 @@ namespace Content.Server.Mapping
             return CompletionResult.Empty;
         }
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (shell.Player is not { } player)
             {
@@ -65,7 +65,7 @@ namespace Content.Server.Mapping
 
             MapId mapId;
             string? toLoad = null;
-            var mapSys = _entities.System<SharedMapSystem>();
+
             Entity<MapGridComponent>? grid = null;
 
             // Get the map ID to use
@@ -86,7 +86,7 @@ namespace Content.Server.Mapping
                     return;
                 }
 
-                if (mapSys.MapExists(mapId))
+                if (_mapSystem.MapExists(mapId))
                 {
                     shell.WriteError(Loc.GetString("cmd-mapping-exists", ("mapId", mapId)));
                     return;
@@ -95,26 +95,25 @@ namespace Content.Server.Mapping
                 // either load a map or create a new one.
                 if (args.Length <= 1)
                 {
-                    mapSys.CreateMap(mapId, runMapInit: false);
+                    _mapSystem.CreateMap(mapId, runMapInit: false);
                 }
                 else
                 {
                     var path = new ResPath(args[1]);
                     toLoad = path.FilenameWithoutExtension;
                     var opts = new DeserializationOptions {StoreYamlUids = true};
-                    var loader = _entities.System<MapLoaderSystem>();
 
                     if (isGrid == true)
                     {
-                        mapSys.CreateMap(mapId, runMapInit: false);
-                        if (!loader.TryLoadGrid(mapId, path, out grid, opts))
+                        _mapSystem.CreateMap(mapId, runMapInit: false);
+                        if (!_mapLoader.TryLoadGrid(mapId, path, out grid, opts))
                         {
                             shell.WriteError(Loc.GetString("cmd-mapping-error"));
-                            mapSys.DeleteMap(mapId);
+                            _mapSystem.DeleteMap(mapId);
                             return;
                         }
                     }
-                    else if (!loader.TryLoadMapWithId(mapId, path, out _, out _, opts))
+                    else if (!_mapLoader.TryLoadMapWithId(mapId, path, out _, out _, opts))
                     {
                         if (isGrid == false)
                         {
@@ -125,31 +124,29 @@ namespace Content.Server.Mapping
                         // isGrid was not specified and loading it as a map failed, so we fall back to trying to load
                         // the file as a grid
                         shell.WriteLine(Loc.GetString("cmd-mapping-try-grid"));
-                        mapSys.CreateMap(mapId, runMapInit: false);
-                        if (!loader.TryLoadGrid(mapId, path, out grid, opts))
+                        _mapSystem.CreateMap(mapId, runMapInit: false);
+                        if (!_mapLoader.TryLoadGrid(mapId, path, out grid, opts))
                         {
                             shell.WriteError(Loc.GetString("cmd-mapping-error"));
-                            mapSys.DeleteMap(mapId);
+                            _mapSystem.DeleteMap(mapId);
                             return;
                         }
                     }
                 }
 
                 // was the map actually created or did it fail somehow?
-                if (!mapSys.MapExists(mapId))
+                if (!_mapSystem.MapExists(mapId))
                 {
                     shell.WriteError(Loc.GetString("cmd-mapping-error"));
                     return;
                 }
             }
             else
-            {
-                mapSys.CreateMap(out mapId, runMapInit: false);
-            }
+                _mapSystem.CreateMap(out mapId, runMapInit: false);
 
             // map successfully created. run misc helpful mapping commands
             if (player.AttachedEntity is { Valid: true } playerEntity &&
-                _entities.GetComponent<MetaDataComponent>(playerEntity).EntityPrototype?.ID != GameTicker.AdminObserverPrototypeName)
+                (EntityManager.GetComponent<MetaDataComponent>(playerEntity).EntityPrototype is not { } proto || proto != GameTicker.AdminObserverPrototypeName))
             {
                 shell.ExecuteCommand("aghost");
             }
@@ -158,15 +155,14 @@ namespace Content.Server.Mapping
             shell.ExecuteCommand("changecvar events.enabled false");
             shell.ExecuteCommand("changecvar shuttle.auto_call_time 0");
 
-            var auto = _entities.System<MappingSystem>();
             if (grid != null)
-                auto.ToggleAutosave(grid.Value.Owner, toLoad ?? "NEWGRID");
+                _mappingSystem.ToggleAutosave(grid.Value.Owner, toLoad ?? "NEWGRID");
             else
-                auto.ToggleAutosave(mapId, toLoad ?? "NEWMAP");
+                _mappingSystem.ToggleAutosave(mapId, toLoad ?? "NEWMAP");
 
             shell.ExecuteCommand($"tp 0 0 {mapId}");
             shell.RemoteExecuteCommand("mappingclientsidesetup");
-            DebugTools.Assert(mapSys.IsPaused(mapId));
+            DebugTools.Assert(_mapSystem.IsPaused(mapId));
 
             if (args.Length != 2)
                 shell.WriteLine(Loc.GetString("cmd-mapping-success", ("mapId", mapId)));
diff --git a/Content.Server/Maps/GameMapPrototype.cs b/Content.Server/Maps/GameMapPrototype.cs
index f0f40fe06d..df9046652b 100644
--- a/Content.Server/Maps/GameMapPrototype.cs
+++ b/Content.Server/Maps/GameMapPrototype.cs
@@ -1,9 +1,8 @@
-using Content.Server.Station;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Diagnostics;
-using System.Numerics;
+using Content.Shared.Station;
 
 namespace Content.Server.Maps;
 
diff --git a/Content.Server/Maps/GridDraggingCommand.cs b/Content.Server/Maps/GridDraggingCommand.cs
index 897b9c08ef..8050a65ec5 100644
--- a/Content.Server/Maps/GridDraggingCommand.cs
+++ b/Content.Server/Maps/GridDraggingCommand.cs
@@ -9,25 +9,21 @@ namespace Content.Server.Maps;
 /// Toggles GridDragging on the system.
 /// </summary>
 [AdminCommand(AdminFlags.Fun)]
-public sealed class GridDraggingCommand : IConsoleCommand
+public sealed class GridDraggingCommand : LocalizedEntityCommands
 {
-    public string Command => SharedGridDraggingSystem.CommandName;
-    public string Description => $"Allows someone with permissions to drag grids around.";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    [Dependency] private readonly GridDraggingSystem _grid = default!;
+
+    public override string Command => SharedGridDraggingSystem.CommandName;
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (shell.Player == null)
         {
-            shell.WriteError("shell-server-cannot");
+            shell.WriteError("shell-only-players-can-run-this-command");
             return;
         }
 
-        var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<GridDraggingSystem>();
-        system.Toggle(shell.Player);
-
-        if (system.IsEnabled(shell.Player))
-            shell.WriteLine("Grid dragging toggled on");
-        else
-            shell.WriteLine("Grid dragging toggled off");
+        _grid.Toggle(shell.Player);
+        shell.WriteLine(Loc.GetString($"cmd-griddrag-status", ("status", _grid.IsEnabled(shell.Player))));
     }
 }
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index d3cd94f656..16a7243815 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -133,7 +133,7 @@ public sealed class NewsSystem : SharedNewsSystem
             _adminLogger.Add(
                 LogType.Chat, LogImpact.Medium,
                 $"{ToPrettyString(msg.Actor):actor} deleted news article {article.Title} by {article.Author}: {article.Content}"
-                );
+            );
 
             articles.RemoveAt(msg.ArticleNum);
             _audio.PlayPvs(ent.Comp.ConfirmSound, ent);
@@ -164,9 +164,6 @@ public sealed class NewsSystem : SharedNewsSystem
         if (!ent.Comp.PublishEnabled)
             return;
 
-        if (!TryGetArticles(ent, out var articles))
-            return;
-
         if (!CanUse(msg.Actor, ent.Owner))
             return;
 
@@ -180,42 +177,80 @@ public sealed class NewsSystem : SharedNewsSystem
         var title = msg.Title.Trim();
         var content = msg.Content.Trim();
 
-        var article = new NewsArticle
+        if (TryAddNews(ent, title, content, out var article, authorName, msg.Actor))
+        {
+            _audio.PlayPvs(ent.Comp.ConfirmSound, ent);
+
+            _chatManager.SendAdminAnnouncement(Loc.GetString("news-publish-admin-announcement",
+                                                             ("actor", msg.Actor),
+                                                             ("title", article.Value.Title),
+                                                             ("author", article.Value.Author ?? Loc.GetString("news-read-ui-no-author"))
+            ));
+        }
+    }
+
+    /// <summary>
+    /// Set the alert level based on the station's entity ID.
+    /// </summary>
+    /// <param name="uid">Entity on the station to which news will be added.</param>
+    /// <param name="title">Title of the news article.</param>
+    /// <param name="content">Content of the news article.</param>
+    /// <param name="author">Author of the news article.</param>
+    /// <param name="actor">Entity which caused the news article to publish. Used for admin logs.</param>
+    public bool TryAddNews(EntityUid uid, string title, string content, [NotNullWhen(true)] out NewsArticle? article, string? author = null, EntityUid? actor = null)
+    {
+        if (!TryGetArticles(uid, out var articles))
+        {
+            article = null;
+            return false;
+        }
+
+        article = new NewsArticle
         {
             Title = title.Length <= MaxTitleLength ? title : $"{title[..MaxTitleLength]}...",
             Content = content.Length <= MaxContentLength ? content : $"{content[..MaxContentLength]}...",
-            Author = authorName,
+            Author = author,
             ShareTime = _ticker.RoundDuration()
         };
 
-        _audio.PlayPvs(ent.Comp.ConfirmSound, ent);
+        articles.Add(article.Value);
 
-        _adminLogger.Add(
-            LogType.Chat,
-            LogImpact.Medium,
-            $"{ToPrettyString(msg.Actor):actor} created news article {article.Title} by {article.Author}: {article.Content}"
-            );
+        if (actor != null)
+        {
+            _adminLogger.Add(
+                LogType.Chat,
+                LogImpact.Medium,
+                $"{ToPrettyString(actor):actor} created news article {article.Value.Title} by {article.Value.Author}: {article.Value.Content}");
+        }
+        else
+        {
+            _adminLogger.Add(
+                LogType.Chat,
+                LogImpact.Medium,
+                $"Created news article {article.Value.Title} by {article.Value.Author}: {article.Value.Content}");
+        }
 
-        _chatManager.SendAdminAnnouncement(Loc.GetString("news-publish-admin-announcement",
-            ("actor", msg.Actor),
-            ("title", article.Title),
-            ("author", article.Author ?? Loc.GetString("news-read-ui-no-author"))
-            ));
-
-        articles.Add(article);
-
-        var args = new NewsArticlePublishedEvent(article);
+        var args = new NewsArticlePublishedEvent(article.Value);
         var query = EntityQueryEnumerator<NewsReaderCartridgeComponent>();
+
         while (query.MoveNext(out var readerUid, out _))
         {
             RaiseLocalEvent(readerUid, ref args);
         }
 
         if (_webhookSendDuringRound)
-            Task.Run(async () => await SendArticleToDiscordWebhook(article));
+            AddNewsSendWebhook(article.Value);
 
         UpdateWriterDevices();
+
+        return true;
     }
+
+    private async void AddNewsSendWebhook(NewsArticle article)
+    {
+        await Task.Run(async () => await SendArticleToDiscordWebhook(article));
+    }
+
     #endregion
 
     #region Reader Event Handlers
@@ -369,7 +404,7 @@ public sealed class NewsSystem : SharedNewsSystem
         if (_webhookSendDuringRound)
             return;
 
-        var query = EntityManager.EntityQueryEnumerator<StationNewsComponent>();
+        var query = EntityQueryEnumerator<StationNewsComponent>();
 
         while (query.MoveNext(out _, out var comp))
         {
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 60b1a99e31..7de0d630e0 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Ghost;
 using Content.Server.Popups;
-using Content.Server.Repairable;
 using Content.Server.Stack;
 using Content.Server.Wires;
 using Content.Shared.Body.Systems;
@@ -19,6 +18,8 @@ using Content.Shared.Materials;
 using Content.Shared.Mind;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Power;
+using Content.Shared.Repairable;
+using Content.Shared.Stacks;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -214,9 +215,12 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
         if (!Resolve(item, ref composition, false))
             return;
 
+        // If more of these checks are needed, use an event instead
+        var modifier = CompOrNull<StackComponent>(item)?.Count ?? 1.0f;
+
         foreach (var (material, amount) in composition.MaterialComposition)
         {
-            var outputAmount = (int) (amount * efficiency);
+            var outputAmount = (int) (amount * efficiency * modifier);
             _materialStorage.TryChangeMaterialAmount(reclaimer, material, outputAmount, storage);
         }
 
diff --git a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
index 33d5c1ac14..25d08c7a50 100644
--- a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
+++ b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Materials.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Robust.Server.Audio;
@@ -15,6 +16,7 @@ public sealed class ProduceMaterialExtractorSystem : EntitySystem
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -62,7 +64,16 @@ public sealed class ProduceMaterialExtractorSystem : EntitySystem
         var matAmount = solution.Value.Comp.Solution.Contents
             .Where(r => ent.Comp.ExtractionReagents.Contains(r.Reagent.Prototype))
             .Sum(r => r.Quantity.Float());
-        _materialStorage.TryChangeMaterialAmount(ent, ent.Comp.ExtractedMaterial, (int) matAmount);
+
+        var changed = (int)matAmount;
+
+        if (changed == 0)
+        {
+            _popup.PopupEntity(Loc.GetString("material-extractor-comp-wrongreagent", ("used", args.Used)), args.User, args.User);
+            return;
+        }
+
+        _materialStorage.TryChangeMaterialAmount(ent, ent.Comp.ExtractedMaterial, changed);
 
         QueueDel(used);
 
diff --git a/Content.Server/Mech/Systems/MechAssemblySystem.cs b/Content.Server/Mech/Systems/MechAssemblySystem.cs
index 4b408343b7..bfd88d53b9 100644
--- a/Content.Server/Mech/Systems/MechAssemblySystem.cs
+++ b/Content.Server/Mech/Systems/MechAssemblySystem.cs
@@ -62,6 +62,6 @@ public sealed class MechAssemblySystem : EntitySystem
                 return;
         }
         Spawn(component.FinishedPrototype, Transform(uid).Coordinates);
-        EntityManager.DeleteEntity(uid);
+        Del(uid);
     }
 }
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index f6b751c398..e029071574 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -1,11 +1,11 @@
 using System.Numerics;
-using Content.Server.Body.Components;
 using Content.Server.Botany.Components;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
 using Content.Server.Power.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Audio;
+using Content.Shared.Body.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Climbing.Events;
@@ -17,9 +17,9 @@ using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Jittering;
+using Content.Shared.Materials;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
-using Content.Shared.Materials;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
@@ -54,8 +54,7 @@ namespace Content.Server.Medical.BiomassReclaimer
         [Dependency] private readonly SharedMindSystem _minds = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
 
-        [ValidatePrototypeId<MaterialPrototype>]
-        public const string BiomassPrototype = "Biomass";
+        public static readonly ProtoId<MaterialPrototype> BiomassPrototype = "Biomass";
 
         public override void Update(float frameTime)
         {
diff --git a/Content.Server/Medical/CryoPodEjectLockWireAction.cs b/Content.Server/Medical/CryoPodEjectLockWireAction.cs
index 6fbf9eb250..d9bd2b3250 100644
--- a/Content.Server/Medical/CryoPodEjectLockWireAction.cs
+++ b/Content.Server/Medical/CryoPodEjectLockWireAction.cs
@@ -1,4 +1,3 @@
-using Content.Server.Medical.Components;
 using Content.Server.Wires;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.Wires;
@@ -8,7 +7,7 @@ namespace Content.Server.Medical;
 /// <summary>
 /// Causes a failure in the cryo pod ejection system when cut. A crowbar will be needed to pry open the pod.
 /// </summary>
-public sealed partial class CryoPodEjectLockWireAction: ComponentWireAction<CryoPodComponent>
+public sealed partial class CryoPodEjectLockWireAction : ComponentWireAction<CryoPodComponent>
 {
     public override Color Color { get; set; } = Color.Red;
     public override string Name { get; set; } = "wire-name-lock";
@@ -18,7 +17,10 @@ public sealed partial class CryoPodEjectLockWireAction: ComponentWireAction<Cryo
     public override bool Cut(EntityUid user, Wire wire, CryoPodComponent cryoPodComponent)
     {
         if (!cryoPodComponent.PermaLocked)
+        {
             cryoPodComponent.Locked = true;
+            EntityManager.Dirty(wire.Owner, cryoPodComponent);
+        }
 
         return true;
     }
@@ -26,7 +28,10 @@ public sealed partial class CryoPodEjectLockWireAction: ComponentWireAction<Cryo
     public override bool Mend(EntityUid user, Wire wire, CryoPodComponent cryoPodComponent)
     {
         if (!cryoPodComponent.PermaLocked)
+        {
             cryoPodComponent.Locked = false;
+            EntityManager.Dirty(wire.Owner, cryoPodComponent);
+        }
 
         return true;
     }
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 8dd0330a27..20dc114918 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -1,38 +1,18 @@
-using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Medical.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Climbing.Systems;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.DragDrop;
-using Content.Shared.Emag.Systems;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.MedicalScanner;
-using Content.Shared.Power;
-using Content.Shared.Tools;
-using Content.Shared.Tools.Systems;
 using Content.Shared.UserInterface;
-using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Medical;
 
@@ -40,147 +20,20 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
     [Dependency] private readonly GasCanisterSystem _gasCanisterSystem = default!;
-    [Dependency] private readonly ClimbSystem _climbSystem = default!;
-    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
-    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
-
-    private static readonly ProtoId<ToolQualityPrototype> PryingQuality = "Prying";
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
-        SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<CryoPodComponent, CryoPodDragFinished>(OnDragFinished);
-        SubscribeLocalEvent<CryoPodComponent, CryoPodPryFinished>(OnCryoPodPryFinished);
-
-        SubscribeLocalEvent<CryoPodComponent, AtmosDeviceUpdateEvent>(OnCryoPodUpdateAtmosphere);
-        SubscribeLocalEvent<CryoPodComponent, DragDropTargetEvent>(HandleDragDropOn);
-        SubscribeLocalEvent<CryoPodComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<CryoPodComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<CryoPodComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
-        SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
         SubscribeLocalEvent<CryoPodComponent, AfterActivatableUIOpenEvent>(OnActivateUI);
+        SubscribeLocalEvent<CryoPodComponent, AtmosDeviceUpdateEvent>(OnCryoPodUpdateAtmosphere);
+        SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
         SubscribeLocalEvent<CryoPodComponent, EntRemovedFromContainerMessage>(OnEjected);
     }
 
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var curTime = _gameTiming.CurTime;
-        var bloodStreamQuery = GetEntityQuery<BloodstreamComponent>();
-        var metaDataQuery = GetEntityQuery<MetaDataComponent>();
-        var itemSlotsQuery = GetEntityQuery<ItemSlotsComponent>();
-        var fitsInDispenserQuery = GetEntityQuery<FitsInDispenserComponent>();
-        var solutionContainerManagerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
-        var query = EntityQueryEnumerator<ActiveCryoPodComponent, CryoPodComponent>();
-
-        while (query.MoveNext(out var uid, out _, out var cryoPod))
-        {
-            metaDataQuery.TryGetComponent(uid, out var metaDataComponent);
-            if (curTime < cryoPod.NextInjectionTime + _metaDataSystem.GetPauseTime(uid, metaDataComponent))
-                continue;
-            cryoPod.NextInjectionTime = curTime + TimeSpan.FromSeconds(cryoPod.BeakerTransferTime);
-
-            if (!itemSlotsQuery.TryGetComponent(uid, out var itemSlotsComponent))
-            {
-                continue;
-            }
-            var container = _itemSlotsSystem.GetItemOrNull(uid, cryoPod.SolutionContainerName, itemSlotsComponent);
-            var patient = cryoPod.BodyContainer.ContainedEntity;
-            if (container != null
-                && container.Value.Valid
-                && patient != null
-                && fitsInDispenserQuery.TryGetComponent(container, out var fitsInDispenserComponent)
-                && solutionContainerManagerQuery.TryGetComponent(container,
-                    out var solutionContainerManagerComponent)
-                && _solutionContainerSystem.TryGetFitsInDispenser((container.Value, fitsInDispenserComponent, solutionContainerManagerComponent),
-                    out var containerSolution, out _))
-            {
-                if (!bloodStreamQuery.TryGetComponent(patient, out var bloodstream))
-                {
-                    continue;
-                }
-
-                var solutionToInject = _solutionContainerSystem.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
-                _bloodstreamSystem.TryAddToChemicals(patient.Value, solutionToInject, bloodstream);
-                _reactiveSystem.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
-            }
-        }
-    }
-
-    public override EntityUid? EjectBody(EntityUid uid, CryoPodComponent? cryoPodComponent)
-    {
-        if (!Resolve(uid, ref cryoPodComponent))
-            return null;
-        if (cryoPodComponent.BodyContainer.ContainedEntity is not { Valid: true } contained)
-            return null;
-        base.EjectBody(uid, cryoPodComponent);
-        _climbSystem.ForciblySetClimbing(contained, uid);
-        return contained;
-    }
-
-    #region Interaction
-
-    private void HandleDragDropOn(Entity<CryoPodComponent> entity, ref DragDropTargetEvent args)
-    {
-        if (entity.Comp.BodyContainer.ContainedEntity != null)
-            return;
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.EntryDelay, new CryoPodDragFinished(), entity, target: args.Dragged, used: entity)
-        {
-            BreakOnDamage = true,
-            BreakOnMove = true,
-            NeedHand = false,
-        };
-        _doAfterSystem.TryStartDoAfter(doAfterArgs);
-        args.Handled = true;
-    }
-
-    private void OnDragFinished(Entity<CryoPodComponent> entity, ref CryoPodDragFinished args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        if (InsertBody(entity.Owner, args.Args.Target.Value, entity.Comp))
-        {
-            if (!TryComp(entity.Owner, out CryoPodAirComponent? cryoPodAir))
-                _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                    $"{ToPrettyString(args.User)} inserted {ToPrettyString(args.Args.Target.Value)} into {ToPrettyString(entity.Owner)}");
-
-            _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                $"{ToPrettyString(args.User)} inserted {ToPrettyString(args.Args.Target.Value)} into {ToPrettyString(entity.Owner)} which contains gas: {cryoPodAir!.Air.ToPrettyString():gasMix}");
-        }
-        args.Handled = true;
-    }
-
-    private void OnActivateUIAttempt(Entity<CryoPodComponent> entity, ref ActivatableUIOpenAttemptEvent args)
-    {
-        if (args.Cancelled)
-        {
-            return;
-        }
-
-        var containedEntity = entity.Comp.BodyContainer.ContainedEntity;
-        if (containedEntity == null || containedEntity == args.User || !HasComp<ActiveCryoPodComponent>(entity))
-        {
-            args.Cancel();
-        }
-    }
-
     private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableUIOpenEvent args)
     {
         if (!entity.Comp.BodyContainer.ContainedEntity.HasValue)
@@ -210,54 +63,6 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
         ));
     }
 
-    private void OnInteractUsing(Entity<CryoPodComponent> entity, ref InteractUsingEvent args)
-    {
-        if (args.Handled || !entity.Comp.Locked || entity.Comp.BodyContainer.ContainedEntity == null)
-            return;
-
-        args.Handled = _toolSystem.UseTool(args.Used, args.User, entity.Owner, entity.Comp.PryDelay, PryingQuality, new CryoPodPryFinished());
-    }
-
-    private void OnExamined(Entity<CryoPodComponent> entity, ref ExaminedEvent args)
-    {
-        var container = _itemSlotsSystem.GetItemOrNull(entity.Owner, entity.Comp.SolutionContainerName);
-        if (args.IsInDetailsRange && container != null && _solutionContainerSystem.TryGetFitsInDispenser(container.Value, out _, out var containerSolution))
-        {
-            using (args.PushGroup(nameof(CryoPodComponent)))
-            {
-                args.PushMarkup(Loc.GetString("cryo-pod-examine", ("beaker", Name(container.Value))));
-                if (containerSolution.Volume == 0)
-                {
-                    args.PushMarkup(Loc.GetString("cryo-pod-empty-beaker"));
-                }
-            }
-        }
-    }
-
-    private void OnPowerChanged(Entity<CryoPodComponent> entity, ref PowerChangedEvent args)
-    {
-        // Needed to avoid adding/removing components on a deleted entity
-        if (Terminating(entity))
-        {
-            return;
-        }
-
-        if (args.Powered)
-        {
-            EnsureComp<ActiveCryoPodComponent>(entity);
-        }
-        else
-        {
-            RemComp<ActiveCryoPodComponent>(entity);
-            _uiSystem.CloseUi(entity.Owner, HealthAnalyzerUiKey.Key);
-        }
-        UpdateAppearance(entity.Owner, entity.Comp);
-    }
-
-    #endregion
-
-    #region Atmos handler
-
     private void OnCryoPodUpdateAtmosphere(Entity<CryoPodComponent> entity, ref AtmosDeviceUpdateEvent args)
     {
         if (!_nodeContainer.TryGetNode(entity.Owner, entity.Comp.PortName, out PortablePipeNode? portNode))
@@ -302,6 +107,4 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
         // if body is ejected - no need to display health-analyzer
         _uiSystem.CloseUi(cryoPod.Owner, HealthAnalyzerUiKey.Key);
     }
-
-    #endregion
 }
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 39c425a682..4b39dbcd63 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,8 +1,9 @@
+using Content.Server.Medical.Components;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.AbstractAnalyzer;
 using Content.Server.Body.Components;
-using Content.Server.Medical.Components;
 using Content.Server.Temperature.Components;
+using Content.Shared.Body.Components;
 using Content.Shared._Sunrise.Research.Artifact;
 using Content.Shared.Traits.Assorted;
 using Content.Shared.Chemistry.EntitySystems;
@@ -11,6 +12,8 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Content.Shared.Traits.Assorted;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Medical;
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 82990240bf..c7874d64fe 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -67,7 +67,7 @@ public sealed class SuitSensorSystem : EntitySystem
         base.Update(frameTime);
 
         var curTime = _gameTiming.CurTime;
-        var sensors = EntityManager.EntityQueryEnumerator<SuitSensorComponent, DeviceNetworkComponent>();
+        var sensors = EntityQueryEnumerator<SuitSensorComponent, DeviceNetworkComponent>();
 
         while (sensors.MoveNext(out var uid, out var sensor, out var device))
         {
@@ -394,7 +394,7 @@ public sealed class SuitSensorSystem : EntitySystem
 
         // get health mob state
         var isAlive = false;
-        if (EntityManager.TryGetComponent(sensor.User.Value, out MobStateComponent? mobState))
+        if (TryComp(sensor.User.Value, out MobStateComponent? mobState))
             isAlive = !_mobStateSystem.IsDead(sensor.User.Value, mobState);
 
         // get mob total damage
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index f3dfa75d8d..3647e113f5 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -1,18 +1,16 @@
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 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;
@@ -30,13 +28,12 @@ namespace Content.Server.Medical
         [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!;
 
-        [ValidatePrototypeId<SoundCollectionPrototype>]
-        private const string VomitCollection = "Vomit";
+        private static readonly ProtoId<SoundCollectionPrototype> VomitCollection = "Vomit";
 
         private readonly SoundSpecifier _vomitSound = new SoundCollectionSpecifier(VomitCollection,
             AudioParams.Default.WithVariation(0.2f).WithVolume(-4f));
@@ -61,8 +58,7 @@ namespace Content.Server.Medical
             // 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 5e19d135b6..dad5126a31 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 MindSystem _mindSystem = default!;
+
+    public override string Command => "makesentient";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        [Dependency] private readonly IEntityManager _entManager = 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 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/Commands/MindInfoCommand.cs b/Content.Server/Mind/Commands/MindInfoCommand.cs
index c365702a31..bd9d15d549 100644
--- a/Content.Server/Mind/Commands/MindInfoCommand.cs
+++ b/Content.Server/Mind/Commands/MindInfoCommand.cs
@@ -9,41 +9,38 @@ using Robust.Shared.Console;
 namespace Content.Server.Mind.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class MindInfoCommand : IConsoleCommand
+    public sealed class MindInfoCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entities = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly SharedRoleSystem _roles = default!;
+        [Dependency] private readonly SharedMindSystem _minds = default!;
 
-        public string Command => "mindinfo";
-        public string Description => "Lists info for the mind of a specific player.";
-        public string Help => "mindinfo <session ID>";
+        public override string Command => "mindinfo";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 1)
             {
-                shell.WriteLine("Expected exactly 1 argument.");
+                shell.WriteLine(Loc.GetString($"shell-need-exactly-one-argument"));
                 return;
             }
 
-            var mgr = IoCManager.Resolve<IPlayerManager>();
-            if (!mgr.TryGetSessionByUsername(args[0], out var session))
+            if (!_playerManager.TryGetSessionByUsername(args[0], out var session))
             {
-                shell.WriteLine("Can't find that mind");
+                shell.WriteLine(Loc.GetString($"cmd-mindinfo-mind-not-found"));
                 return;
             }
 
-            var minds = _entities.System<SharedMindSystem>();
-            if (!minds.TryGetMind(session, out var mindId, out var mind))
+            if (!_minds.TryGetMind(session, out var mindId, out var mind))
             {
-                shell.WriteLine("Can't find that mind");
+                shell.WriteLine(Loc.GetString($"cmd-mindinfo-mind-not-found"));
                 return;
             }
 
             var builder = new StringBuilder();
             builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedEntity);
 
-            var roles = _entities.System<SharedRoleSystem>();
-            foreach (var role in roles.MindGetAllRoleInfo(mindId))
+            foreach (var role in _roles.MindGetAllRoleInfo(mindId))
             {
                 builder.AppendFormat("{0} ", role.Name);
             }
diff --git a/Content.Server/Mind/Filters/TargetObjectiveMindFilter.cs b/Content.Server/Mind/Filters/TargetObjectiveMindFilter.cs
new file mode 100644
index 0000000000..dae8079ac1
--- /dev/null
+++ b/Content.Server/Mind/Filters/TargetObjectiveMindFilter.cs
@@ -0,0 +1,43 @@
+using Content.Server.Objectives.Components;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Filters;
+using Content.Shared.Whitelist;
+
+namespace Content.Server.Mind.Filters;
+
+/// <summary>
+/// A mind filter that removes minds if you have an objective targeting them matching a blacklist.
+/// </summary>
+/// <remarks>
+/// Used to prevent assigning multiple kill objectives for the same person.
+/// </remarks>
+public sealed partial class TargetObjectiveMindFilter : MindFilter
+{
+    /// <summary>
+    /// A blacklist to check objectives against, for removing a mind.
+    /// If null then any objective targeting it will remove minds.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    protected override bool ShouldRemove(Entity<MindComponent> mind, EntityUid? excluded, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        // ignore this filter if there is no user to check
+        if (!entMan.TryGetComponent<MindComponent>(excluded, out var excludedMind))
+            return false;
+
+        var whitelistSys = entMan.System<EntityWhitelistSystem>();
+        foreach (var objective in excludedMind.Objectives)
+        {
+            // if the player has an objective targeting this mind
+            if (entMan.TryGetComponent<TargetObjectiveComponent>(objective, out var kill) && kill.Target == mind.Owner)
+            {
+                // remove the mind if this objective is blacklisted
+                if (whitelistSys.IsBlacklistPassOrNull(Blacklist, objective))
+                    return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index 71d38c688b..a7547e87e4 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 sealed class MindSystem : SharedMindSystem
             return;
         }
 
-        MakeSentientCommand.MakeSentient(target, EntityManager);
+        MakeSentient(target);
         TransferTo(mindId, target, ghostCheckOverride: true, mind: mind);
     }
 }
diff --git a/Content.Server/Mind/TransferMindOnGibSystem.cs b/Content.Server/Mind/TransferMindOnGibSystem.cs
index 758a23c868..ff71fa0560 100644
--- a/Content.Server/Mind/TransferMindOnGibSystem.cs
+++ b/Content.Server/Mind/TransferMindOnGibSystem.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Server.Body.Components;
+using Content.Shared.Body.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Tag;
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index b34c66a467..3c707242df 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -72,6 +72,10 @@ public sealed class CritMobActionsSystem : EntitySystem
         _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString("action-name-crit-last-words"), "",
             (string lastWords) =>
             {
+                // if a person is gibbed/deleted, they can't say last words
+                if (Deleted(uid))
+                    return;
+
                 // Intentionally does not check for muteness
                 if (actor.PlayerSession.AttachedEntity != uid
                     || !_mobState.IsCritical(uid))
diff --git a/Content.Server/Morgue/CrematoriumSystem.cs b/Content.Server/Morgue/CrematoriumSystem.cs
index 053ad5b5fc..6c1acf6768 100644
--- a/Content.Server/Morgue/CrematoriumSystem.cs
+++ b/Content.Server/Morgue/CrematoriumSystem.cs
@@ -134,7 +134,7 @@ public sealed class CrematoriumSystem : EntitySystem
             {
                 var item = storage.Contents.ContainedEntities[i];
                 _containers.Remove(item, storage.Contents);
-                EntityManager.DeleteEntity(item);
+                Del(item);
             }
             var ash = Spawn("Ash", Transform(uid).Coordinates);
             _containers.Insert(ash, storage.Contents);
@@ -172,7 +172,7 @@ public sealed class CrematoriumSystem : EntitySystem
         }
         else
         {
-            EntityManager.DeleteEntity(victim);
+            Del(victim);
         }
         _entityStorage.CloseStorage(uid);
         Cremate(uid, component);
diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs
index a07accf777..92ed16a06b 100644
--- a/Content.Server/Morgue/MorgueSystem.cs
+++ b/Content.Server/Morgue/MorgueSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Storage.Components;
-using Content.Shared.Body.Components;
 using Content.Shared.Examine;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Morgue;
 using Content.Shared.Morgue.Components;
 using Robust.Shared.Audio.Systems;
@@ -59,7 +59,7 @@ public sealed class MorgueSystem : EntitySystem
 
         foreach (var ent in storage.Contents.ContainedEntities)
         {
-            if (!hasMob && HasComp<BodyComponent>(ent))
+            if (!hasMob && HasComp<MobStateComponent>(ent))
                 hasMob = true;
 
             if (HasComp<ActorComponent>(ent))
diff --git a/Content.Server/Mousetrap/MousetrapSystem.cs b/Content.Server/Mousetrap/MousetrapSystem.cs
deleted file mode 100644
index 3afe858ce0..0000000000
--- a/Content.Server/Mousetrap/MousetrapSystem.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Content.Server.Damage.Systems;
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Popups;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
-using Content.Shared.Mousetrap;
-using Content.Shared.StepTrigger;
-using Content.Shared.StepTrigger.Systems;
-using Robust.Server.GameObjects;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Player;
-
-namespace Content.Server.Mousetrap;
-
-public sealed class MousetrapSystem : EntitySystem
-{
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<MousetrapComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<MousetrapComponent, BeforeDamageUserOnTriggerEvent>(BeforeDamageOnTrigger);
-        SubscribeLocalEvent<MousetrapComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
-        SubscribeLocalEvent<MousetrapComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnUseInHand(EntityUid uid, MousetrapComponent component, UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        component.IsActive = !component.IsActive;
-        _popupSystem.PopupEntity(component.IsActive
-            ? Loc.GetString("mousetrap-on-activate")
-            : Loc.GetString("mousetrap-on-deactivate"),
-            uid,
-            args.User);
-
-        UpdateVisuals(uid);
-
-        args.Handled = true;
-    }
-
-    private void OnStepTriggerAttempt(EntityUid uid, MousetrapComponent component, ref StepTriggerAttemptEvent args)
-    {
-        args.Continue |= component.IsActive;
-    }
-
-    private void BeforeDamageOnTrigger(EntityUid uid, MousetrapComponent component, BeforeDamageUserOnTriggerEvent args)
-    {
-        if (TryComp(args.Tripper, out PhysicsComponent? physics) && physics.Mass != 0)
-        {
-            // The idea here is inverse,
-            // Small - big damage,
-            // Large - small damage
-            // yes i punched numbers into a calculator until the graph looked right
-            var scaledDamage = -50 * Math.Atan(physics.Mass - component.MassBalance) + (25 * Math.PI);
-            args.Damage *= scaledDamage;
-        }
-    }
-
-    private void OnTrigger(EntityUid uid, MousetrapComponent component, TriggerEvent args)
-    {
-        component.IsActive = false;
-        UpdateVisuals(uid);
-    }
-
-    private void UpdateVisuals(EntityUid uid, MousetrapComponent? mousetrap = null, AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref mousetrap, ref appearance, false))
-        {
-            return;
-        }
-
-        _appearance.SetData(uid, MousetrapVisuals.Visual,
-            mousetrap.IsActive ? MousetrapVisuals.Armed : MousetrapVisuals.Unarmed, appearance);
-    }
-}
diff --git a/Content.Server/Movement/LockEyesCommand.cs b/Content.Server/Movement/LockEyesCommand.cs
index fd9854041e..006d8b4dce 100644
--- a/Content.Server/Movement/LockEyesCommand.cs
+++ b/Content.Server/Movement/LockEyesCommand.cs
@@ -6,16 +6,17 @@ using Robust.Shared.Console;
 namespace Content.Server.Movement;
 
 [AdminCommand(AdminFlags.Fun)]
-public sealed class LockEyesCommand : IConsoleCommand
+public sealed class LockEyesCommand : LocalizedEntityCommands
 {
-    public string Command => $"lockeyes";
-    public string Description => Loc.GetString("lockeyes-command-description");
-    public string Help => Loc.GetString("lockeyes-command-help");
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    [Dependency] private readonly SharedMoverController _controller = default!;
+
+    public override string Command => $"lockeyes";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1)
         {
-            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
             return;
         }
 
@@ -25,7 +26,6 @@ public sealed class LockEyesCommand : IConsoleCommand
             return;
         }
 
-        var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedMoverController>();
-        system.CameraRotationLocked = value;
+        _controller.CameraRotationLocked = value;
     }
 }
diff --git a/Content.Server/Movement/RotateEyesCommand.cs b/Content.Server/Movement/RotateEyesCommand.cs
index 733d341820..7fff4b5ad6 100644
--- a/Content.Server/Movement/RotateEyesCommand.cs
+++ b/Content.Server/Movement/RotateEyesCommand.cs
@@ -6,14 +6,12 @@ using Robust.Shared.Console;
 namespace Content.Server.Movement;
 
 [AdminCommand(AdminFlags.Fun)]
-public sealed class RotateEyesCommand : IConsoleCommand
+public sealed class RotateEyesCommand : LocalizedEntityCommands
 {
-    public string Command => "rotateeyes";
-    public string Description => Loc.GetString("rotateeyes-command-description");
-    public string Help => Loc.GetString("rotateeyes-command-help");
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "rotateeyes";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var entManager = IoCManager.Resolve<IEntityManager>();
         var rotation = Angle.Zero;
 
         if (args.Length == 1)
@@ -28,7 +26,7 @@ public sealed class RotateEyesCommand : IConsoleCommand
         }
 
         var count = 0;
-        var query = entManager.EntityQueryEnumerator<InputMoverComponent>();
+        var query = EntityManager.EntityQueryEnumerator<InputMoverComponent>();
         while (query.MoveNext(out var uid, out var mover))
         {
             if (mover.TargetRelativeRotation.Equals(rotation))
@@ -36,10 +34,10 @@ public sealed class RotateEyesCommand : IConsoleCommand
 
             mover.TargetRelativeRotation = rotation;
 
-            entManager.Dirty(uid, mover);
+            EntityManager.Dirty(uid, mover);
             count++;
         }
 
-        shell.WriteLine(Loc.GetString("rotateeyes-command-count", ("count", count)));
+        shell.WriteLine(Loc.GetString("cmd-rotateeyes-command-count", ("count", count)));
     }
 }
diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs
index 40345a5867..f2bbdc247b 100644
--- a/Content.Server/Movement/Systems/PullController.cs
+++ b/Content.Server/Movement/Systems/PullController.cs
@@ -85,7 +85,7 @@ public sealed class PullController : VirtualController
     {
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
-            .Register<PullingSystem>();
+            .Register<PullController>();
 
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
         _pullableQuery = GetEntityQuery<PullableComponent>();
diff --git a/Content.Server/NPC/Commands/NPCCommand.cs b/Content.Server/NPC/Commands/NPCCommand.cs
index e1e432e1a4..451d440f45 100644
--- a/Content.Server/NPC/Commands/NPCCommand.cs
+++ b/Content.Server/NPC/Commands/NPCCommand.cs
@@ -7,12 +7,13 @@ using Robust.Shared.Console;
 namespace Content.Server.NPC.Commands;
 
 [AdminCommand(AdminFlags.Debug)]
-public sealed class NPCCommand : IConsoleCommand
+public sealed class NpcCommand : LocalizedEntityCommands
 {
-    public string Command => "npc";
-    public string Description => "Opens the debug window for NPCs";
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    [Dependency] private readonly EuiManager _euiManager = default!;
+
+    public override string Command => "npc";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (shell.Player is not { } playerSession)
         {
@@ -20,7 +21,6 @@ public sealed class NPCCommand : IConsoleCommand
             return;
         }
 
-        var euiManager = IoCManager.Resolve<EuiManager>();
-        euiManager.OpenEui(new NPCEui(), playerSession);
+        _euiManager.OpenEui(new NPCEui(), playerSession);
     }
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs
index e2e65684ff..93f7679766 100644
--- a/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Hands.Components;
+using Content.Server.Hands.Systems;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.NPC.HTN.Preconditions;
@@ -18,14 +18,18 @@ public sealed partial class ActiveHandComponentPrecondition : HTNPrecondition
 
     public override bool IsMet(NPCBlackboard blackboard)
     {
-        if (!blackboard.TryGetValue<Hand>(NPCBlackboard.ActiveHand, out var hand, _entManager) || hand.HeldEntity == null)
+        if (!blackboard.TryGetValue<EntityUid>(NPCBlackboard.Owner, out var owner, _entManager) ||
+            !blackboard.TryGetValue<string>(NPCBlackboard.ActiveHand, out var hand, _entManager))
         {
             return Invert;
         }
 
+        if (!_entManager.System<HandsSystem>().TryGetHeldItem(owner, hand, out var entity))
+            return Invert;
+
         foreach (var comp in Components)
         {
-            var hasComp = _entManager.HasComponent(hand.HeldEntity, comp.Value.Component.GetType());
+            var hasComp = _entManager.HasComponent(entity, comp.Value.Component.GetType());
 
             if (!hasComp ||
                 Invert && hasComp)
diff --git a/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs
index 0e6c63a433..049d81130a 100644
--- a/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Hands.Components;
+using Content.Server.Hands.Systems;
 
 namespace Content.Server.NPC.HTN.Preconditions;
 
@@ -11,11 +11,12 @@ public sealed partial class ActiveHandEntityPrecondition : HTNPrecondition
 
     public override bool IsMet(NPCBlackboard blackboard)
     {
-        if (!blackboard.TryGetValue(NPCBlackboard.ActiveHand, out Hand? activeHand, _entManager))
+        if (!blackboard.TryGetValue(NPCBlackboard.Owner, out EntityUid owner, _entManager) ||
+            !blackboard.TryGetValue(NPCBlackboard.ActiveHand, out string? activeHand, _entManager))
         {
             return false;
         }
 
-        return activeHand.HeldEntity != null;
+        return !_entManager.System<HandsSystem>().HandIsEmpty(owner, activeHand);
     }
 }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs
index 0ea062a910..89d68283b6 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs
@@ -12,7 +12,7 @@ public sealed partial class DropOperator : HTNOperator
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
-        if (!blackboard.TryGetValue(NPCBlackboard.ActiveHand, out Hand? activeHand, _entManager))
+        if (!blackboard.TryGetValue(NPCBlackboard.ActiveHand, out string? activeHand, _entManager))
         {
             return HTNOperatorStatus.Finished;
         }
diff --git a/Content.Server/NPC/NPCBlackboard.cs b/Content.Server/NPC/NPCBlackboard.cs
index ffdb55045d..8b70569177 100644
--- a/Content.Server/NPC/NPCBlackboard.cs
+++ b/Content.Server/NPC/NPCBlackboard.cs
@@ -1,11 +1,10 @@
 using System.Collections;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.Interaction;
+using Content.Server.Hands.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;
 
@@ -152,6 +151,8 @@ public sealed partial class NPCBlackboard : IEnumerable<KeyValuePair<string, obj
         value = default;
         EntityUid owner;
 
+        var handSys = entManager.System<HandsSystem>();
+
         switch (key)
         {
             case Access:
@@ -168,25 +169,24 @@ public sealed partial class NPCBlackboard : IEnumerable<KeyValuePair<string, obj
             case ActiveHand:
             {
                 if (!TryGetValue(Owner, out owner, entManager) ||
-                    !entManager.TryGetComponent<HandsComponent>(owner, out var hands) ||
-                    hands.ActiveHand == null)
+                    handSys.GetActiveHand(owner) is not { } activeHand)
                 {
                     return false;
                 }
 
-                value = hands.ActiveHand;
+                value = activeHand;
                 return true;
             }
             case ActiveHandFree:
             {
                 if (!TryGetValue(Owner, out owner, entManager) ||
                     !entManager.TryGetComponent<HandsComponent>(owner, out var hands) ||
-                    hands.ActiveHand == null)
+                    handSys.GetActiveHand(owner) is not { } activeHand)
                 {
                     return false;
                 }
 
-                value = hands.ActiveHand.IsEmpty;
+                value = handSys.HandIsEmpty((owner, hands), activeHand);
                 return true;
             }
             case CanMove:
@@ -204,16 +204,16 @@ public sealed partial class NPCBlackboard : IEnumerable<KeyValuePair<string, obj
             {
                 if (!TryGetValue(Owner, out owner, entManager) ||
                     !entManager.TryGetComponent<HandsComponent>(owner, out var hands) ||
-                    hands.ActiveHand == null)
+                    handSys.GetActiveHand(owner) is null)
                 {
                     return false;
                 }
 
                 var handos = new List<string>();
 
-                foreach (var (id, hand) in hands.Hands)
+                foreach (var id in hands.Hands.Keys)
                 {
-                    if (!hand.IsEmpty)
+                    if (!handSys.HandIsEmpty((owner, hands), id))
                         continue;
 
                     handos.Add(id);
@@ -226,16 +226,16 @@ public sealed partial class NPCBlackboard : IEnumerable<KeyValuePair<string, obj
             {
                 if (!TryGetValue(Owner, out owner, entManager) ||
                     !entManager.TryGetComponent<HandsComponent>(owner, out var hands) ||
-                    hands.ActiveHand == null)
+                    handSys.GetActiveHand(owner) is null)
                 {
                     return false;
                 }
 
                 var handos = new List<string>();
 
-                foreach (var (id, hand) in hands.Hands)
+                foreach (var id in hands.Hands.Keys)
                 {
-                    if (!hand.IsEmpty)
+                    if (!handSys.HandIsEmpty((owner, hands), id))
                         continue;
 
                     handos.Add(id);
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index 88db986508..a81ee421bc 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -206,7 +206,7 @@ public sealed partial class NPCCombatSystem
             }
 
             _gun.SetTarget(gun, comp.Target);
-            _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 78610be77e..3585711860 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -30,11 +30,16 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Shared.Prying.Systems;
 using Microsoft.Extensions.ObjectPool;
+using Prometheus;
 
 namespace Content.Server.NPC.Systems;
 
 public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 {
+    private static readonly Gauge ActiveSteeringGauge = Metrics.CreateGauge(
+        "npc_steering_active_count",
+        "Amount of NPCs trying to actively do steering");
+
     /*
      * We use context steering to determine which way to move.
      * This involves creating an array of possible directions and assigning a value for the desireability of each direction.
@@ -87,6 +92,8 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 
     private object _obstacles = new();
 
+    private int _activeSteeringCount;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -205,7 +212,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
         if (!Resolve(uid, ref component, false))
             return;
 
-        if (EntityManager.TryGetComponent(uid, out InputMoverComponent? controller))
+        if (TryComp(uid, out InputMoverComponent? controller))
         {
             controller.CurTickSprintMovement = Vector2.Zero;
 
@@ -244,12 +251,15 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
         };
         var curTime = _timing.CurTime;
 
+        _activeSteeringCount = 0;
+
         Parallel.For(0, index, options, i =>
         {
             var (uid, steering, mover, xform) = npcs[i];
             Steer(uid, steering, mover, xform, frameTime, curTime);
         });
 
+        ActiveSteeringGauge.Set(_activeSteeringCount);
 
         if (_subscribedSessions.Count > 0)
         {
@@ -324,6 +334,8 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
             return;
         }
 
+        Interlocked.Increment(ref _activeSteeringCount);
+
         var agentRadius = steering.Radius;
         var worldPos = _transform.GetWorldPosition(xform);
         var (layer, mask) = _physics.GetHardCollision(uid);
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index 2f303d4c4c..8ab909e6da 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -6,6 +6,9 @@ using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
+using Content.Shared.NPC.Systems;
+using Prometheus;
+using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 
@@ -16,6 +19,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!;
@@ -135,6 +142,8 @@ namespace Content.Server.NPC.Systems
 
             // Add your system here.
             _htn.UpdateNPC(ref _count, _maxUpdates, frameTime);
+
+            ActiveGauge.Set(Count<ActiveNPCComponent>());
         }
 
         public void OnMobStateChange(EntityUid uid, HTNComponent component, MobStateChangedEvent args)
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index c5b463d0d3..6de26cd056 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Fluids.EntitySystems;
+using Content.Server.Hands.Systems;
 using Content.Server.NPC.Queries;
 using Content.Server.NPC.Queries.Considerations;
 using Content.Server.NPC.Queries.Curves;
@@ -43,8 +44,9 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly DrinkSystem _drink = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly FoodSystem _food = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly OpenableSystem _openable = default!;
@@ -172,14 +174,8 @@ public sealed class NPCUtilitySystem : EntitySystem
         {
             case FoodValueCon:
             {
-                if (!TryComp<FoodComponent>(targetUid, out var food))
-                    return 0f;
-
-                // mice can't eat unpeeled bananas, need monkey's help
-                if (_openable.IsClosed(targetUid))
-                    return 0f;
-
-                if (!_food.IsDigestibleBy(owner, targetUid, food))
+                // do we have a mouth available? Is the food item opened?
+                if (!_ingestion.CanConsume(owner, targetUid))
                     return 0f;
 
                 var avoidBadFood = !HasComp<IgnoreBadFoodComponent>(owner);
@@ -192,15 +188,16 @@ public sealed class NPCUtilitySystem : EntitySystem
                 if (avoidBadFood && HasComp<BadFoodComponent>(targetUid))
                     return 0f;
 
+                var nutrition = _ingestion.TotalNutrition(targetUid, owner);
+                if (nutrition <= 1.0f)
+                    return 0f;
+
                 return 1f;
             }
             case DrinkValueCon:
             {
-                if (!TryComp<DrinkComponent>(targetUid, out var drink))
-                    return 0f;
-
-                // can't drink closed drinks
-                if (_openable.IsClosed(targetUid))
+                // can't drink closed drinks and can't drink with a mask on...
+                if (!_ingestion.CanConsume(owner, targetUid))
                     return 0f;
 
                 // only drink when thirsty
@@ -212,7 +209,9 @@ public sealed class NPCUtilitySystem : EntitySystem
                     return 0f;
 
                 // needs to have something that will satiate thirst, mice wont try to drink 100% pure mutagen.
-                var hydration = _drink.TotalHydration(targetUid, drink);
+                // We don't check if the solution is metabolizable cause all drinks should be currently.
+                // If that changes then simply use the other overflow.
+                var hydration = _ingestion.TotalHydration(targetUid);
                 if (hydration <= 1.0f)
                     return 0f;
 
@@ -256,8 +255,9 @@ public sealed class NPCUtilitySystem : EntitySystem
             }
             case TargetAmmoMatchesCon:
             {
-                if (!blackboard.TryGetValue(NPCBlackboard.ActiveHand, out Hand? activeHand, EntityManager) ||
-                    !TryComp<BallisticAmmoProviderComponent>(activeHand.HeldEntity, out var heldGun))
+                if (!blackboard.TryGetValue(NPCBlackboard.ActiveHand, out string? activeHand, EntityManager) ||
+                    !_hands.TryGetHeldItem(owner, activeHand, out var heldEntity) ||
+                    !TryComp<BallisticAmmoProviderComponent>(heldEntity, out var heldGun))
                 {
                     return 0f;
                 }
diff --git a/Content.Server/NameIdentifier/NameIdentifierSystem.cs b/Content.Server/NameIdentifier/NameIdentifierSystem.cs
index 0a9f87557a..c0b9beaa9a 100644
--- a/Content.Server/NameIdentifier/NameIdentifierSystem.cs
+++ b/Content.Server/NameIdentifier/NameIdentifierSystem.cs
@@ -20,7 +20,7 @@ public sealed class NameIdentifierSystem : EntitySystem
     /// Free IDs available per <see cref="NameIdentifierGroupPrototype"/>.
     /// </summary>
     [ViewVariables]
-    public readonly Dictionary<string, List<int>> CurrentIds = new();
+    public readonly Dictionary<string, List<int>> CurrentIds = [];
 
     public override void Initialize()
     {
@@ -35,18 +35,22 @@ public sealed class NameIdentifierSystem : EntitySystem
         InitialSetupPrototypes();
     }
 
-    private void OnComponentShutdown(EntityUid uid, NameIdentifierComponent component, ComponentShutdown args)
+    private void OnComponentShutdown(Entity<NameIdentifierComponent> ent, ref ComponentShutdown args)
     {
-        if (CurrentIds.TryGetValue(component.Group, out var ids))
+        if (ent.Comp.Group is null)
+            return;
+
+        if (CurrentIds.TryGetValue(ent.Comp.Group, out var ids) && ids.Count > 0)
         {
             // Avoid inserting the value right back at the end or shuffling in place:
             // just pick a random spot to put it and then move that one to the end.
             var randomIndex = _robustRandom.Next(ids.Count);
             var random = ids[randomIndex];
-            ids[randomIndex] = component.Identifier;
+            ids[randomIndex] = ent.Comp.Identifier;
             ids.Add(random);
         }
-        _nameModifier.RefreshNameModifiers(uid);
+
+        _nameModifier.RefreshNameModifiers(ent.Owner);
     }
 
     /// <summary>
@@ -78,51 +82,58 @@ public sealed class NameIdentifierSystem : EntitySystem
         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}";
     }
 
-    private void OnMapInit(EntityUid uid, NameIdentifierComponent component, MapInitEvent args)
+    private void OnMapInit(Entity<NameIdentifierComponent> ent, ref MapInitEvent args)
     {
-        if (!_prototypeManager.TryIndex<NameIdentifierGroupPrototype>(component.Group, out var group))
+        if (ent.Comp.Group is null)
+            return;
+
+        if (!_prototypeManager.TryIndex(ent.Comp.Group, out var group))
             return;
 
         int id;
         string uniqueName;
 
         // If it has an existing valid identifier then use that, otherwise generate a new one.
-        if (component.Identifier != -1 &&
-            CurrentIds.TryGetValue(component.Group, out var ids) &&
-            ids.Remove(component.Identifier))
+        if (ent.Comp.Identifier != -1 &&
+            CurrentIds.TryGetValue(ent.Comp.Group, out var ids) &&
+            ids.Remove(ent.Comp.Identifier))
         {
-            id = component.Identifier;
-            uniqueName = group.Prefix is not null
-                ? $"{group.Prefix}-{id}"
+            id = ent.Comp.Identifier;
+            uniqueName = group.Format is not null
+                ? Loc.GetString(group.Format, ("number", id))
                 : $"{id}";
         }
         else
         {
-            uniqueName = GenerateUniqueName(uid, group, out id);
-            component.Identifier = id;
+            uniqueName = GenerateUniqueName(ent, group, out id);
+            ent.Comp.Identifier = id;
         }
 
-        component.FullIdentifier = group.FullName
+        ent.Comp.FullIdentifier = group.FullName
             ? uniqueName
             : $"({uniqueName})";
 
-        Dirty(uid, component);
-        _nameModifier.RefreshNameModifiers(uid);
+        Dirty(ent);
+        _nameModifier.RefreshNameModifiers(ent.Owner);
     }
 
     private void OnRefreshNameModifiers(Entity<NameIdentifierComponent> ent, ref RefreshNameModifiersEvent args)
     {
+        if (ent.Comp.Group is null)
+            return;
+
         // Don't apply the modifier if the component is being removed
         if (ent.Comp.LifeStage > ComponentLifeStage.Running)
             return;
 
-        if (!_prototypeManager.TryIndex<NameIdentifierGroupPrototype>(ent.Comp.Group, out var group))
+        if (!_prototypeManager.TryIndex(ent.Comp.Group, out var group))
             return;
+
         var format = group.FullName ? "name-identifier-format-full" : "name-identifier-format-append";
         // We apply the modifier with a low priority to keep it near the base name
         // "Beep (Si-4562) the zombie" instead of "Beep the zombie (Si-4562)"
@@ -188,13 +199,13 @@ public sealed class NameIdentifierSystem : EntitySystem
 
         foreach (var proto in set.Modified.Values)
         {
-            var name_proto = (NameIdentifierGroupPrototype) proto;
+            var name_proto = (NameIdentifierGroupPrototype)proto;
 
             // Only bother adding new ones.
             if (CurrentIds.ContainsKey(proto.ID))
                 continue;
 
-            var ids  = GetOrCreateIdList(name_proto);
+            var ids = GetOrCreateIdList(name_proto);
             FillGroup(name_proto, ids);
         }
     }
diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
index 6594d7883b..c08576a5ce 100644
--- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
+++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Mind;
 using Content.Server.Objectives.Components;
 using Content.Server.Popups;
@@ -7,6 +6,7 @@ using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Roles;
 using Content.Shared.Sticky;
+using Content.Shared.Trigger;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -80,6 +80,9 @@ public sealed class SpiderChargeSystem : SharedSpiderChargeSystem
     /// </summary>
     private void OnExplode(EntityUid uid, SpiderChargeComponent comp, TriggerEvent args)
     {
+        if (args.Key != comp.TriggerKey)
+            return;
+
         if (!TryComp<SpaceNinjaComponent>(comp.Planter, out var ninja))
             return;
 
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 822486cff5..8697692e5e 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -63,7 +63,7 @@ public sealed class StunProviderSystem : SharedStunProviderSystem
         _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/Nuke/Commands/SendNukeCodesCommand.cs b/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
index d0e83e4f75..e44811a835 100644
--- a/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
+++ b/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
@@ -1,55 +1,48 @@
 using Content.Server.Administration;
-using Content.Server.Station.Components;
 using Content.Shared.Administration;
-using JetBrains.Annotations;
+using Content.Shared.Station.Components;
 using Robust.Shared.Console;
 
-namespace Content.Server.Nuke.Commands
+namespace Content.Server.Nuke.Commands;
+
+[AdminCommand(AdminFlags.Fun)]
+public sealed class SendNukeCodesCommand : LocalizedEntityCommands
 {
-    [UsedImplicitly]
-    [AdminCommand(AdminFlags.Fun)]
-    public sealed class SendNukeCodesCommand : IConsoleCommand
+    [Dependency] private readonly NukeCodePaperSystem _nukeCodeSystem = default!;
+
+    public override string Command => "nukecodes";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        public string Command => "nukecodes";
-        public string Description => "Send nuke codes to a station's communication consoles";
-        public string Help => "nukecodes [station EntityUid]";
-
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        if (args.Length != 1)
         {
-            if (args.Length != 1)
-            {
-                shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[0], out var uidNet) || !_entityManager.TryGetEntity(uidNet, out var uid))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            _entityManager.System<NukeCodePaperSystem>().SendNukeCodes(uid.Value);
+            shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
+            return;
         }
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        if (!NetEntity.TryParse(args[0], out var uidNet) || !EntityManager.TryGetEntity(uidNet, out var uid))
         {
-            if (args.Length != 1)
-            {
-                return CompletionResult.Empty;
-            }
-
-            var stations = new List<CompletionOption>();
-            var query = _entityManager.EntityQueryEnumerator<StationDataComponent>();
-            while (query.MoveNext(out var uid, out var stationData))
-            {
-                var meta = _entityManager.GetComponent<MetaDataComponent>(uid);
-
-                stations.Add(new CompletionOption(uid.ToString(), meta.EntityName));
-            }
-
-            return CompletionResult.FromHintOptions(stations, null);
+            shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
+            return;
         }
+
+        _nukeCodeSystem.SendNukeCodes(uid.Value);
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length != 1)
+            return CompletionResult.Empty;
+
+        var stations = new List<CompletionOption>();
+        var query = EntityManager.EntityQueryEnumerator<StationDataComponent>();
+        while (query.MoveNext(out var uid, out _))
+        {
+            var meta = EntityManager.GetComponent<MetaDataComponent>(uid);
+
+            stations.Add(new CompletionOption(uid.ToString(), meta.EntityName));
+        }
+
+        return CompletionResult.FromHintOptions(stations, null);
     }
 }
diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs
index aac2d2361d..af6751ed71 100644
--- a/Content.Server/Nuke/NukeCodePaperSystem.cs
+++ b/Content.Server/Nuke/NukeCodePaperSystem.cs
@@ -2,9 +2,9 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Server.Chat.Systems;
 using Content.Server.Fax;
 using Content.Shared.Fax.Components;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Paper;
+using Content.Shared.Station.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
diff --git a/Content.Server/Nuke/NukeComponent.cs b/Content.Server/Nuke/NukeComponent.cs
index b14ad9c165..cd1c0227eb 100644
--- a/Content.Server/Nuke/NukeComponent.cs
+++ b/Content.Server/Nuke/NukeComponent.cs
@@ -56,7 +56,7 @@ namespace Content.Server.Nuke
         ///     How long a user must wait to disarm the bomb.
         /// </summary>
         [DataField("disarmDoafterLength")]
-        public float DisarmDoafterLength = 30.0f;
+        public float DisarmDoAfterLength = 30.0f;
 
         [DataField("alertLevelOnActivate")] public string AlertLevelOnActivate = default!;
         [DataField("alertLevelOnDeactivate")] public string AlertLevelOnDeactivate = default!;
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index accbdf06c4..a3cfdfdde5 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -32,7 +32,6 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly ExplosionSystem _explosions = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly PointLightSystem _pointLight = default!;
@@ -45,6 +44,7 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     /// <summary>
     ///     Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx
@@ -165,7 +165,7 @@ public sealed class NukeSystem : EntitySystem
     {
         UpdateUserInterface(uid, component);
 
-        if (args.Anchored == false && component.Status == NukeStatus.ARMED && component.RemainingTime > component.DisarmDoafterLength)
+        if (args.Anchored == false && component.Status == NukeStatus.ARMED && component.RemainingTime > component.DisarmDoAfterLength)
         {
             // yes, this means technically if you can find a way to unanchor the nuke, you can disarm it
             // without the doafter. but that takes some effort, and it won't allow you to disarm a nuke that can't be disarmed by the doafter.
@@ -210,7 +210,7 @@ public sealed class NukeSystem : EntitySystem
 
             foreach (var tile in _map.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(worldPos, component.RequiredFloorRadius), false))
             {
-                if (!tile.IsSpace(_tileDefManager))
+                if (!_turf.IsSpace(tile))
                     continue;
 
                 var msg = Loc.GetString("nuke-component-cant-anchor-floor");
@@ -271,7 +271,7 @@ public sealed class NukeSystem : EntitySystem
 
         else
         {
-            DisarmBombDoafter(uid, args.Actor, component);
+            DisarmBombDoAfter(uid, args.Actor, component);
         }
     }
 
@@ -381,7 +381,12 @@ public sealed class NukeSystem : EntitySystem
                 // do nothing, wait for arm button to be pressed
                 break;
             case NukeStatus.ARMED:
-                // do nothing, wait for arm button to be unpressed
+                // handling case of wizard recalling disk out of armed Nuke
+                if (!component.DiskSlot.HasItem)
+                {
+                    DisarmBomb(uid, component);
+                }
+
                 break;
         }
     }
@@ -409,7 +414,7 @@ public sealed class NukeSystem : EntitySystem
             AllowArm = allowArm,
             EnteredCodeLength = component.EnteredCode.Length,
             MaxCodeLength = component.CodeLength,
-            CooldownTime = (int) component.CooldownTime
+            CooldownTime = (int) component.CooldownTime,
         };
 
         _ui.SetUiState(uid, NukeUiKey.Key, state);
@@ -436,7 +441,7 @@ public sealed class NukeSystem : EntitySystem
             8 => 9,
             9 => 10,
             0 => component.LastPlayedKeypadSemitones + 12,
-            _ => 0
+            _ => 0,
         };
 
         // Don't double-dip on the octave shifting
@@ -621,9 +626,9 @@ public sealed class NukeSystem : EntitySystem
 
     #endregion
 
-    private void DisarmBombDoafter(EntityUid uid, EntityUid user, NukeComponent nuke)
+    private void DisarmBombDoAfter(EntityUid uid, EntityUid user, NukeComponent nuke)
     {
-        var doAfter = new DoAfterArgs(EntityManager, user, nuke.DisarmDoafterLength, new NukeDisarmDoAfterEvent(), uid, target: uid)
+        var doAfter = new DoAfterArgs(EntityManager, user, nuke.DisarmDoAfterLength, new NukeDisarmDoAfterEvent(), uid, target: uid)
         {
             BreakOnDamage = true,
             BreakOnMove = true,
@@ -633,8 +638,10 @@ public sealed class NukeSystem : EntitySystem
         if (!_doAfter.TryStartDoAfter(doAfter))
             return;
 
-        _popups.PopupEntity(Loc.GetString("nuke-component-doafter-warning"), user,
-            user, PopupType.LargeCaution);
+        _popups.PopupEntity(Loc.GetString("nuke-component-doafter-warning"),
+            user,
+            user,
+            PopupType.LargeCaution);
     }
 
     private void UpdateAppearance(EntityUid uid, NukeComponent nuke)
diff --git a/Content.Server/Nutrition/Components/MessyDrinkerComponent.cs b/Content.Server/Nutrition/Components/MessyDrinkerComponent.cs
new file mode 100644
index 0000000000..5519c5d983
--- /dev/null
+++ b/Content.Server/Nutrition/Components/MessyDrinkerComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Nutrition.Components;
+
+/// <summary>
+/// Entities with this component occasionally spill some of the solution they're ingesting.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MessyDrinkerComponent : Component
+{
+    [DataField]
+    public float SpillChance = 0.2f;
+
+    /// <summary>
+    /// The amount of solution that is spilled when <see cref="SpillChance"/> procs.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 SpillAmount = 1.0;
+
+    /// <summary>
+    /// The types of food prototypes we can spill
+    /// </summary>
+    [DataField]
+    public List<ProtoId<EdiblePrototype>> SpillableTypes = new List<ProtoId<EdiblePrototype>> { "Drink" };
+
+    [DataField]
+    public LocId? SpillMessagePopup;
+}
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index bfea95fb66..41cf5c875b 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -1,15 +1,15 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Explosion.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Throwing;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Systems;
 using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
@@ -45,7 +45,7 @@ namespace Content.Server.Nutrition.EntitySystems
             var coordinates = Transform(uid).Coordinates;
             _audio.PlayPvs(_audio.ResolveSound(creamPie.Sound), coordinates, AudioParams.Default.WithVariation(0.125f));
 
-            if (EntityManager.TryGetComponent(uid, out FoodComponent? foodComp))
+            if (TryComp(uid, out FoodComponent? foodComp))
             {
                 if (_solutions.TryGetSolution(uid, foodComp.Solution, out _, out var solution))
                 {
@@ -53,12 +53,12 @@ namespace Content.Server.Nutrition.EntitySystems
                 }
                 foreach (var trash in foodComp.Trash)
                 {
-                    EntityManager.SpawnEntity(trash, Transform(uid).Coordinates);
+                    Spawn(trash, Transform(uid).Coordinates);
                 }
             }
             ActivatePayload(uid);
 
-            EntityManager.QueueDeleteEntity(uid);
+            QueueDel(uid);
         }
 
         private void OnConsume(Entity<CreamPieComponent> entity, ref ConsumeDoAfterEvent args)
@@ -77,15 +77,9 @@ namespace Content.Server.Nutrition.EntitySystems
             {
                 if (_itemSlots.TryEject(uid, itemSlot, user: null, out var item))
                 {
-                    if (TryComp<OnUseTimerTriggerComponent>(item.Value, out var timerTrigger))
+                    if (TryComp<TimerTriggerComponent>(item.Value, out var timerTrigger))
                     {
-                        _trigger.HandleTimerTrigger(
-                            item.Value,
-                            null,
-                            timerTrigger.Delay,
-                            timerTrigger.BeepInterval,
-                            timerTrigger.InitialBeepDelay,
-                            timerTrigger.BeepSound);
+                        _trigger.ActivateTimerTrigger((item.Value, timerTrigger));
                     }
                 }
             }
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index deb49ea668..1677f1d822 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,49 +1,16 @@
-using Content.Server.Body.Systems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Forensics;
-using Content.Server.Inventory;
-using Content.Server.Popups;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects.Effects;
-using Content.Shared.FixedPoint;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
+
 
 namespace Content.Server.Nutrition.EntitySystems;
 
 public sealed class DrinkSystem : SharedDrinkSystem
 {
-    [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly FoodSystem _food = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly PuddleSystem _puddle = default!;
-    [Dependency] private readonly ReactiveSystem _reaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly StomachSystem _stomach = default!;
-    [Dependency] private readonly ForensicsSystem _forensics = default!;
 
     public override void Initialize()
     {
@@ -54,59 +21,6 @@ public sealed class DrinkSystem : SharedDrinkSystem
         SubscribeLocalEvent<DrinkComponent, ComponentInit>(OnDrinkInit);
         // run before inventory so for bucket it always tries to drink before equipping (when empty)
         // run after openable so its always open -> drink
-        SubscribeLocalEvent<DrinkComponent, UseInHandEvent>(OnUse, before: [typeof(ServerInventorySystem)], after: [typeof(OpenableSystem)]);
-        SubscribeLocalEvent<DrinkComponent, AfterInteractEvent>(AfterInteract);
-        SubscribeLocalEvent<DrinkComponent, ConsumeDoAfterEvent>(OnDoAfter);
-    }
-
-    /// <summary>
-    /// Get the total hydration factor contained in a drink's solution.
-    /// </summary>
-    public float TotalHydration(EntityUid uid, DrinkComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return 0f;
-
-        if (!_solutionContainer.TryGetSolution(uid, comp.Solution, out _, out var solution))
-            return 0f;
-
-        var total = 0f;
-        foreach (var quantity in solution.Contents)
-        {
-            var reagent = _proto.Index<ReagentPrototype>(quantity.Reagent.Prototype);
-            if (reagent.Metabolisms == null)
-                continue;
-
-            foreach (var entry in reagent.Metabolisms.Values)
-            {
-                foreach (var effect in entry.Effects)
-                {
-                    // ignores any effect conditions, just cares about how much it can hydrate
-                    if (effect is SatiateThirst thirst)
-                    {
-                        total += thirst.HydrationFactor * quantity.Quantity.Float();
-                    }
-                }
-            }
-        }
-
-        return total;
-    }
-
-    private void AfterInteract(Entity<DrinkComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || args.Target == null || !args.CanReach)
-            return;
-
-        args.Handled = TryDrink(args.User, args.Target.Value, entity.Comp, entity);
-    }
-
-    private void OnUse(Entity<DrinkComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = TryDrink(args.User, args.User, entity.Comp, entity);
     }
 
     private void OnDrinkInit(Entity<DrinkComponent> entity, ref ComponentInit args)
@@ -146,108 +60,4 @@ public sealed class DrinkSystem : SharedDrinkSystem
         var drainAvailable = DrinkVolume(uid, component);
         _appearance.SetData(uid, FoodVisuals.Visual, drainAvailable.Float(), appearance);
     }
-
-    /// <summary>
-    ///     Raised directed at a victim when someone has force fed them a drink.
-    /// </summary>
-    private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || entity.Comp.Deleted)
-            return;
-
-        if (!TryComp<BodyComponent>(args.Target, out var body))
-            return;
-
-        if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
-            return;
-
-        if (_openable.IsClosed(args.Used.Value, args.Target.Value, predicted: true))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (_food.IsMouthBlocked(args.Target.Value))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
-            return;
-
-        var transferAmount = FixedPoint2.Min(entity.Comp.TransferAmount, solution.Volume);
-        var drained = _solutionContainer.SplitSolution(soln.Value, transferAmount);
-        var forceDrink = args.User != args.Target;
-
-        args.Handled = true;
-        if (transferAmount <= 0)
-            return;
-
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
-        {
-            _popup.PopupEntity(Loc.GetString(forceDrink ? "drink-component-try-use-drink-cannot-drink-other" : "drink-component-try-use-drink-had-enough"), args.Target.Value, args.User);
-
-            if (HasComp<RefillableSolutionComponent>(args.Target.Value))
-            {
-                _puddle.TrySpillAt(args.User, drained, out _);
-                return;
-            }
-
-            _solutionContainer.Refill(args.Target.Value, soln.Value, drained);
-            return;
-        }
-
-        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Owner, drained, stomach.Comp1));
-
-        //All stomachs are full or can't handle whatever solution we have.
-        if (firstStomach == null)
-        {
-            _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"), args.Target.Value, args.Target.Value);
-
-            if (forceDrink)
-            {
-                _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Target.Value, args.User);
-                _puddle.TrySpillAt(args.Target.Value, drained, out _);
-            }
-            else
-                _solutionContainer.TryAddSolution(soln.Value, drained);
-
-            return;
-        }
-
-        var flavors = args.FlavorMessage;
-
-        if (forceDrink)
-        {
-            var targetName = Identity.Entity(args.Target.Value, EntityManager);
-            var userName = Identity.Entity(args.User, EntityManager);
-
-            _popup.PopupEntity(Loc.GetString("drink-component-force-feed-success", ("user", userName), ("flavors", flavors)), args.Target.Value, args.Target.Value);
-
-            _popup.PopupEntity(
-                Loc.GetString("drink-component-force-feed-success-user", ("target", targetName)),
-                args.User, args.User);
-
-            // log successful forced drinking
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to drink {ToPrettyString(entity.Owner):drink}");
-        }
-        else
-        {
-            _popup.PopupEntity(
-                Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User,
-                args.User);
-            _popup.PopupEntity(
-                Loc.GetString("drink-component-try-use-drink-success-slurp"), args.User, Filter.PvsExcept(args.User), true);
-
-            // log successful voluntary drinking
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}");
-        }
-
-        _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f));
-
-        _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1);
-
-        _forensics.TransferDna(entity, args.Target.Value);
-
-        if (!forceDrink && solution.Volume > 0)
-            args.Repeat = true;
-    }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs b/Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs
new file mode 100644
index 0000000000..dc8c11bb7f
--- /dev/null
+++ b/Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs
@@ -0,0 +1,48 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+using Robust.Shared.Random;
+
+namespace Content.Server.Nutrition.EntitySystems;
+
+public sealed class MessyDrinkerSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
+    [Dependency] private readonly PuddleSystem _puddle = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MessyDrinkerComponent, IngestingEvent>(OnIngested);
+    }
+
+    private void OnIngested(Entity<MessyDrinkerComponent> ent, ref IngestingEvent ev)
+    {
+        if (ev.Split.Volume <= ent.Comp.SpillAmount)
+            return;
+
+        var proto = _ingestion.GetEdibleType(ev.Food);
+
+        if (proto == null || !ent.Comp.SpillableTypes.Contains(proto.Value))
+            return;
+
+        // Cannot spill if you're being forced to drink.
+        if (ev.ForceFed)
+            return;
+
+        if (!_random.Prob(ent.Comp.SpillChance))
+            return;
+
+        if (ent.Comp.SpillMessagePopup != null)
+            _popup.PopupEntity(Loc.GetString(ent.Comp.SpillMessagePopup), ent, ent, PopupType.MediumCaution);
+
+        var split = ev.Split.SplitSolution(ent.Comp.SpillAmount);
+
+        _puddle.TrySpillAt(ent, split, out _);
+    }
+}
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index 3ce285b06c..2a13d07797 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -22,6 +22,7 @@ public sealed class SliceableFoodSystem : EntitySystem
 {
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDestructibleSystem _destroy = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -64,31 +65,27 @@ public sealed class SliceableFoodSystem : EntitySystem
         if (args.Cancelled || args.Handled || args.Args.Target == null)
             return;
 
-        if (TrySliceFood(entity, args.User, args.Used, entity.Comp))
+        if (TrySliceFood(entity.Owner, args.User, args.Used))
             args.Handled = true;
     }
 
-    private bool TrySliceFood(EntityUid uid,
+    private bool TrySliceFood(Entity<TransformComponent?, SliceableFoodComponent?, EdibleComponent?> entity,
         EntityUid user,
-        EntityUid? usedItem,
-        SliceableFoodComponent? component = null,
-        FoodComponent? food = null,
-        TransformComponent? transform = null)
+        EntityUid? usedItem)
     {
-        if (!Resolve(uid, ref component, ref food, ref transform) ||
-            string.IsNullOrEmpty(component.Slice))
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2, ref entity.Comp3) || string.IsNullOrEmpty(entity.Comp2.Slice))
             return false;
 
-        if (!_solutionContainer.TryGetSolution(uid, food.Solution, out var soln, out var solution))
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp3.Solution, out var soln, out var solution))
             return false;
 
         if (!TryComp<UtensilComponent>(usedItem, out var utensil) || (utensil.Types & UtensilType.Knife) == 0)
             return false;
 
-        var sliceVolume = solution.Volume / FixedPoint2.New(component.TotalCount);
-        for (int i = 0; i < component.TotalCount; i++)
+        var sliceVolume = solution.Volume / FixedPoint2.New(entity.Comp2.TotalCount);
+        for (int i = 0; i < entity.Comp2.TotalCount; i++)
         {
-            var sliceUid = Slice(uid, user, component, transform);
+            var sliceUid = Slice(entity, user);
 
             var lostSolution =
                 _solutionContainer.SplitSolution(soln.Value, sliceVolume);
@@ -97,11 +94,11 @@ public sealed class SliceableFoodSystem : EntitySystem
             FillSlice(sliceUid, lostSolution);
         }
 
-        _audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
+        _audio.PlayPvs(entity.Comp2.Sound, entity.Comp1.Coordinates, AudioParams.Default.WithVolume(-2));
         var ev = new SliceFoodEvent();
-        RaiseLocalEvent(uid, ref ev);
+        RaiseLocalEvent(entity, ref ev);
 
-        DeleteFood(uid, user, food);
+        DeleteFood(entity, user);
         return true;
     }
 
@@ -109,19 +106,16 @@ public sealed class SliceableFoodSystem : EntitySystem
     /// Create a new slice in the world and returns its entity.
     /// The solutions must be set afterwards.
     /// </summary>
-    public EntityUid Slice(EntityUid uid,
-        EntityUid user,
-        SliceableFoodComponent? comp = null,
-        TransformComponent? transform = null)
+    public EntityUid Slice(Entity<TransformComponent?, SliceableFoodComponent?> entity, EntityUid user)
     {
-        if (!Resolve(uid, ref comp, ref transform))
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
             return EntityUid.Invalid;
 
-        var sliceUid = Spawn(comp.Slice, _transform.GetMapCoordinates(uid));
+        var sliceUid = Spawn(entity.Comp2.Slice, _transform.GetMapCoordinates((entity, entity.Comp1)));
 
         // try putting the slice into the container if the food being sliced is in a container!
         // this lets you do things like slice a pizza up inside of a hot food cart without making a food-everywhere mess
-        _transform.DropNextTo(sliceUid, (uid, transform));
+        _transform.DropNextTo(sliceUid, entity);
         _transform.SetLocalRotation(sliceUid, 0);
 
         if (!_container.IsEntityOrParentInContainer(sliceUid))
@@ -134,7 +128,7 @@ public sealed class SliceableFoodSystem : EntitySystem
         return sliceUid;
     }
 
-    private void DeleteFood(EntityUid uid, EntityUid user, FoodComponent foodComp)
+    private void DeleteFood(EntityUid uid, EntityUid user)
     {
         var ev = new BeforeFullySlicedEvent
         {
@@ -144,38 +138,32 @@ public sealed class SliceableFoodSystem : EntitySystem
         if (ev.Cancelled)
             return;
 
-        var dev = new DestructionEventArgs();
-        RaiseLocalEvent(uid, dev);
-
-        // Locate the sliced food and spawn its trash
-        foreach (var trash in foodComp.Trash)
-        {
-            var trashUid = Spawn(trash, _transform.GetMapCoordinates(uid));
-
-            // try putting the trash in the food's container too, to be consistent with slice spawning?
-            _transform.DropNextTo(trashUid, uid);
-            _transform.SetLocalRotation(trashUid, 0);
-        }
-
-        QueueDel(uid);
+        _destroy.DestroyEntity(uid);
     }
 
-    private void FillSlice(EntityUid sliceUid, Solution solution)
+    private void FillSlice(Entity<EdibleComponent?> slice, Solution solution)
     {
-        // Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
-        if (TryComp<FoodComponent>(sliceUid, out var sliceFoodComp) &&
-            _solutionContainer.TryGetSolution(sliceUid, sliceFoodComp.Solution, out var itsSoln, out var itsSolution))
-        {
-            _solutionContainer.RemoveAllSolution(itsSoln.Value);
+        if (!Resolve(slice, ref slice.Comp, false))
+            return;
 
-            var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
-            _solutionContainer.TryAddSolution(itsSoln.Value, lostSolutionPart);
-        }
+        // Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
+        if (!_solutionContainer.TryGetSolution(slice.Owner, slice.Comp.Solution, out var itsSoln, out var itsSolution))
+            return;
+
+        _solutionContainer.RemoveAllSolution(itsSoln.Value);
+
+        var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
+        _solutionContainer.TryAddSolution(itsSoln.Value, lostSolutionPart);
     }
 
     private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref ComponentStartup args)
     {
-        var foodComp = EnsureComp<FoodComponent>(entity);
+        // TODO: When Food Component is fully kill delete this awful method
+        // This exists just to make tests fail I guess, awesome!
+        // If you're here because your test just failed, make sure that:
+        // Your food has the edible component
+        // The solution listed in the edible component exists
+        var foodComp = EnsureComp<EdibleComponent>(entity);
         _solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
     }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
index 510b9552a3..48e5b1a0c0 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
@@ -21,7 +21,7 @@ namespace Content.Server.Nutrition.EntitySystems
             if (args.Handled || !args.Complex)
                 return;
 
-            if (!EntityManager.TryGetComponent(entity, out SmokableComponent? smokable))
+            if (!TryComp(entity, out SmokableComponent? smokable))
                 return;
 
             if (smokable.State != SmokableState.Lit)
@@ -36,7 +36,7 @@ namespace Content.Server.Nutrition.EntitySystems
             if (args.Handled)
                 return;
 
-            if (!EntityManager.TryGetComponent(entity, out SmokableComponent? smokable))
+            if (!TryComp(entity, out SmokableComponent? smokable))
                 return;
 
             if (smokable.State != SmokableState.Unlit)
@@ -57,7 +57,7 @@ namespace Content.Server.Nutrition.EntitySystems
             var targetEntity = args.Target;
             if (targetEntity == null ||
                 !args.CanReach ||
-                !EntityManager.TryGetComponent(entity, out SmokableComponent? smokable) ||
+                !TryComp(entity, out SmokableComponent? smokable) ||
                 smokable.State == SmokableState.Lit)
                 return;
 
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
index 26d86acd54..9a1d64b2eb 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
@@ -30,7 +30,7 @@ namespace Content.Server.Nutrition.EntitySystems
             if (args.Handled)
                 return;
 
-            if (!EntityManager.TryGetComponent(entity, out SmokableComponent? smokable))
+            if (!TryComp(entity, out SmokableComponent? smokable))
                 return;
 
             if (smokable.State != SmokableState.Unlit)
@@ -52,7 +52,7 @@ namespace Content.Server.Nutrition.EntitySystems
             var targetEntity = args.Target;
             if (targetEntity == null ||
                 !args.CanReach ||
-                !EntityManager.TryGetComponent(entity, out SmokableComponent? smokable) ||
+                !TryComp(entity, out SmokableComponent? smokable) ||
                 smokable.State == SmokableState.Lit)
                 return;
 
@@ -91,7 +91,7 @@ namespace Content.Server.Nutrition.EntitySystems
                 _solutionContainerSystem.TryAddSolution(pipeSolution.Value, reagentSolution);
             }
 
-            EntityManager.DeleteEntity(contents);
+            Del(contents);
 
             _itemSlotsSystem.SetLock(entity.Owner, entity.Comp.BowlSlot, true); //no inserting more until current runs out
 
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index 72b8396051..5de6a5a631 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -1,8 +1,8 @@
-using Content.Server.Body.Components;
 using Content.Server.DoAfter;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
+using Content.Shared.Body.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
@@ -22,7 +22,7 @@ namespace Content.Server.Nutrition.EntitySystems
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
         [Dependency] private readonly EmagSystem _emag = default!;
-        [Dependency] private readonly FoodSystem _foodSystem = default!;
+        [Dependency] private readonly IngestionSystem _ingestion = default!;
         [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
 
@@ -42,7 +42,8 @@ namespace Content.Server.Nutrition.EntitySystems
             if (!args.CanReach
                 || !_solutionContainerSystem.TryGetRefillableSolution(entity.Owner, out _, out var solution)
                 || !HasComp<BloodstreamComponent>(args.Target)
-                || _foodSystem.IsMouthBlocked(args.Target.Value, args.User))
+                || _ingestion.HasMouthAvailable(args.Target.Value, args.User)
+                )
             {
                 return;
             }
@@ -64,7 +65,7 @@ namespace Content.Server.Nutrition.EntitySystems
             if (entity.Comp.ExplodeOnUse || _emag.CheckFlag(entity, EmagType.Interaction))
             {
                 _explosionSystem.QueueExplosion(entity.Owner, "Default", entity.Comp.ExplosionIntensity, 0.5f, 3, canCreateVacuum: false);
-                EntityManager.DeleteEntity(entity);
+                Del(entity);
                 exploded = true;
             }
             else
@@ -80,7 +81,7 @@ namespace Content.Server.Nutrition.EntitySystems
                     {
                         exploded = true;
                         _explosionSystem.QueueExplosion(entity.Owner, "Default", entity.Comp.ExplosionIntensity, 0.5f, 3, canCreateVacuum: false);
-                        EntityManager.DeleteEntity(entity);
+                        Del(entity);
                         break;
                     }
                 }
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index b3ef8bff69..4960ff1ba8 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -1,10 +1,9 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Forensics;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.FixedPoint;
@@ -17,7 +16,6 @@ using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using System.Linq;
 using Content.Shared.Atmos;
 
 namespace Content.Server.Nutrition.EntitySystems
@@ -159,7 +157,7 @@ namespace Content.Server.Nutrition.EntitySystems
                 }
 
                 _reactiveSystem.DoEntityReaction(containerManager.Owner, inhaledSolution, ReactionMethod.Ingestion);
-                _bloodstreamSystem.TryAddToChemicals(containerManager.Owner, inhaledSolution, bloodstream);
+                _bloodstreamSystem.TryAddToChemicals((containerManager.Owner, bloodstream), inhaledSolution);
             }
 
             _timer -= UpdateTimer;
diff --git a/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs b/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs
index ea3a8be9cb..08ff0c1d41 100644
--- a/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs
@@ -33,7 +33,7 @@ namespace Content.Server.Nutrition.EntitySystems
 
         public void CheckSolutions(Entity<TrashOnSolutionEmptyComponent> entity)
         {
-            if (!EntityManager.HasComponent<SolutionContainerManagerComponent>(entity))
+            if (!HasComp<SolutionContainerManagerComponent>(entity))
                 return;
 
             if (_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
diff --git a/Content.Server/Nutrition/Events/DrinkEvents.cs b/Content.Server/Nutrition/Events/DrinkEvents.cs
new file mode 100644
index 0000000000..b7a7403105
--- /dev/null
+++ b/Content.Server/Nutrition/Events/DrinkEvents.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Chemistry.Components;
+
+namespace Content.Server.Nutrition.Events;
+
+/// <summary>
+/// Raised on the entity drinking. This is right before they actually transfer the solution into the stomach.
+/// </summary>
+/// <param name="Drink">The drink that is being drank.</param>
+/// <param name="Solution">The solution that will be digested.</param>
+/// <param name="Forced">Whether the target was forced to drink the solution by somebody else.</param>
+[ByRefEvent]
+public record struct BeforeIngestDrinkEvent(EntityUid Drink, Solution Solution, bool Forced);
diff --git a/Content.Server/Objectives/Components/PickRandomHeadComponent.cs b/Content.Server/Objectives/Components/PickRandomHeadComponent.cs
deleted file mode 100644
index 38ed252264..0000000000
--- a/Content.Server/Objectives/Components/PickRandomHeadComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Server.Objectives.Components;
-
-/// <summary>
-/// Sets the target for <see cref="TargetObjectiveComponent"/> to a random head.
-/// If there are no heads it will fallback to any person.
-/// </summary>
-[RegisterComponent]
-public sealed partial class PickRandomHeadComponent : Component;
diff --git a/Content.Server/Objectives/Components/PickRandomPersonComponent.cs b/Content.Server/Objectives/Components/PickRandomPersonComponent.cs
index bf4135e2a9..2c864a80d4 100644
--- a/Content.Server/Objectives/Components/PickRandomPersonComponent.cs
+++ b/Content.Server/Objectives/Components/PickRandomPersonComponent.cs
@@ -1,7 +1,26 @@
+using Content.Server.Objectives.Systems;
+using Content.Shared.Mind.Filters;
+
 namespace Content.Server.Objectives.Components;
 
 /// <summary>
-/// Sets the target for <see cref="TargetObjectiveComponent"/> to a random person.
+/// Sets the target for <see cref="TargetObjectiveComponent"/> to a random person from a pool and filters.
 /// </summary>
-[RegisterComponent]
-public sealed partial class PickRandomPersonComponent : Component;
+/// <remarks>
+/// Don't copy paste this for a new objective, if you need a new filter just make a new filter and set it in YAML.
+/// </remarks>
+[RegisterComponent, Access(typeof(PickObjectiveTargetSystem))]
+public sealed partial class PickRandomPersonComponent : Component
+{
+    /// <summary>
+    /// A pool to pick potential targets from.
+    /// </summary>
+    [DataField]
+    public IMindPool Pool = new AliveHumansPool();
+
+    /// <summary>
+    /// Filters to apply to <see cref="Pool"/>.
+    /// </summary>
+    [DataField]
+    public List<MindFilter> Filters = new();
+}
diff --git a/Content.Server/Objectives/Components/RandomTraitorAliveComponent.cs b/Content.Server/Objectives/Components/RandomTraitorAliveComponent.cs
deleted file mode 100644
index 1c45cb45d5..0000000000
--- a/Content.Server/Objectives/Components/RandomTraitorAliveComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Objectives.Components;
-
-/// <summary>
-/// Sets the target for <see cref="KeepAliveConditionComponent"/> to a random traitor.
-/// </summary>
-[RegisterComponent]
-public sealed partial class RandomTraitorAliveComponent : Component;
diff --git a/Content.Server/Objectives/Components/RandomTraitorProgressComponent.cs b/Content.Server/Objectives/Components/RandomTraitorProgressComponent.cs
deleted file mode 100644
index f2da9778eb..0000000000
--- a/Content.Server/Objectives/Components/RandomTraitorProgressComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Objectives.Components;
-
-/// <summary>
-/// Sets the target for <see cref="HelpProgressConditionComponent"/> to a random traitor.
-/// </summary>
-[RegisterComponent]
-public sealed partial class RandomTraitorProgressComponent : Component;
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index 39effb9bdb..1b20d65c45 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -244,8 +244,10 @@ public sealed class ObjectivesSystem : SharedObjectivesSystem
             var objectives = group.Weights.ShallowClone();
             while (_random.TryPickAndTake(objectives, out var objectiveProto))
             {
-                if (TryCreateObjective((mindId, mind), objectiveProto, out var objective)
-                    && Comp<ObjectiveComponent>(objective.Value).Difficulty <= maxDifficulty)
+                if (!_prototypeManager.Index(objectiveProto).TryGetComponent<ObjectiveComponent>(out var objectiveComp, EntityManager.ComponentFactory))
+                    continue;
+
+                if (objectiveComp.Difficulty <= maxDifficulty && TryCreateObjective((mindId, mind), objectiveProto, out var objective))
                     return objective;
             }
         }
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index 808829f6d9..c9e9326c1e 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Objectives.Components;
 using Content.Server.Roles;
-using Content.Server.Warps;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Roles;
diff --git a/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs b/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs
index 2977e10569..0fa20c27e5 100644
--- a/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs
+++ b/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs
@@ -25,10 +25,6 @@ public sealed class PickObjectiveTargetSystem : EntitySystem
 
         SubscribeLocalEvent<PickSpecificPersonComponent, ObjectiveAssignedEvent>(OnSpecificPersonAssigned);
         SubscribeLocalEvent<PickRandomPersonComponent, ObjectiveAssignedEvent>(OnRandomPersonAssigned);
-        SubscribeLocalEvent<PickRandomHeadComponent, ObjectiveAssignedEvent>(OnRandomHeadAssigned);
-
-        SubscribeLocalEvent<RandomTraitorProgressComponent, ObjectiveAssignedEvent>(OnRandomTraitorProgressAssigned);
-        SubscribeLocalEvent<RandomTraitorAliveComponent, ObjectiveAssignedEvent>(OnRandomTraitorAliveAssigned);
     }
 
     private void OnSpecificPersonAssigned(Entity<PickSpecificPersonComponent> ent, ref ObjectiveAssignedEvent args)
@@ -63,7 +59,7 @@ public sealed class PickObjectiveTargetSystem : EntitySystem
     private void OnRandomPersonAssigned(Entity<PickRandomPersonComponent> ent, ref ObjectiveAssignedEvent args)
     {
         // invalid objective prototype
-        if (!TryComp<TargetObjectiveComponent>(ent.Owner, out var target))
+        if (!TryComp<TargetObjectiveComponent>(ent, out var target))
         {
             args.Cancelled = true;
             return;
@@ -73,140 +69,13 @@ public sealed class PickObjectiveTargetSystem : EntitySystem
         if (target.Target != null)
             return;
 
-        var allHumans = _mind.GetAliveHumans(args.MindId);
-
-        // Can't have multiple objectives to kill the same person
-        foreach (var objective in args.Mind.Objectives)
-        {
-            if (HasComp<KillPersonConditionComponent>(objective) && TryComp<TargetObjectiveComponent>(objective, out var kill))
-            {
-                allHumans.RemoveWhere(x => x.Owner == kill.Target);
-            }
-        }
-
-        // no other humans to kill
-        if (allHumans.Count == 0)
+        // couldn't find a target :(
+        if (_mind.PickFromPool(ent.Comp.Pool, ent.Comp.Filters, args.MindId) is not {} picked)
         {
             args.Cancelled = true;
             return;
         }
 
-        _target.SetTarget(ent.Owner, _random.Pick(allHumans), target);
-    }
-
-    private void OnRandomHeadAssigned(Entity<PickRandomHeadComponent> ent, ref ObjectiveAssignedEvent args)
-    {
-        // invalid prototype
-        if (!TryComp<TargetObjectiveComponent>(ent.Owner, out var target))
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        // target already assigned
-        if (target.Target != null)
-            return;
-
-        // no other humans to kill
-        var allHumans = _mind.GetAliveHumans(args.MindId);
-        if (allHumans.Count == 0)
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        var allHeads = new HashSet<Entity<MindComponent>>();
-        foreach (var person in allHumans)
-        {
-            if (TryComp<MindComponent>(person, out var mind) && mind.OwnedEntity is { } owned && HasComp<CommandStaffComponent>(owned))
-                allHeads.Add(person);
-        }
-
-        if (allHeads.Count == 0)
-            allHeads = allHumans; // fallback to non-head target
-
-        _target.SetTarget(ent.Owner, _random.Pick(allHeads), target);
-    }
-
-    private void OnRandomTraitorProgressAssigned(Entity<RandomTraitorProgressComponent> ent, ref ObjectiveAssignedEvent args)
-    {
-        // invalid prototype
-        if (!TryComp<TargetObjectiveComponent>(ent.Owner, out var target))
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        var traitors = _traitorRule.GetOtherTraitorMindsAliveAndConnected(args.Mind).ToHashSet();
-
-        // cant help anyone who is tasked with helping:
-        // 1. thats boring
-        // 2. no cyclic progress dependencies!!!
-        foreach (var traitor in traitors)
-        {
-            // TODO: replace this with TryComp<ObjectivesComponent>(traitor) or something when objectives are moved out of mind
-            if (!TryComp<MindComponent>(traitor.Id, out var mind))
-                continue;
-
-            foreach (var objective in mind.Objectives)
-            {
-                if (HasComp<HelpProgressConditionComponent>(objective))
-                    traitors.RemoveWhere(x => x.Mind == mind);
-            }
-        }
-
-        // Can't have multiple objectives to help/save the same person
-        foreach (var objective in args.Mind.Objectives)
-        {
-            if (HasComp<RandomTraitorAliveComponent>(objective) || HasComp<RandomTraitorProgressComponent>(objective))
-            {
-                if (TryComp<TargetObjectiveComponent>(objective, out var help))
-                {
-                    traitors.RemoveWhere(x => x.Id == help.Target);
-                }
-            }
-        }
-
-        // no more helpable traitors
-        if (traitors.Count == 0)
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        _target.SetTarget(ent.Owner, _random.Pick(traitors).Id, target);
-    }
-
-    private void OnRandomTraitorAliveAssigned(Entity<RandomTraitorAliveComponent> ent, ref ObjectiveAssignedEvent args)
-    {
-        // invalid prototype
-        if (!TryComp<TargetObjectiveComponent>(ent.Owner, out var target))
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        var traitors = _traitorRule.GetOtherTraitorMindsAliveAndConnected(args.Mind).ToHashSet();
-
-        // Can't have multiple objectives to help/save the same person
-        foreach (var objective in args.Mind.Objectives)
-        {
-            if (HasComp<RandomTraitorAliveComponent>(objective) || HasComp<RandomTraitorProgressComponent>(objective))
-            {
-                if (TryComp<TargetObjectiveComponent>(objective, out var help))
-                {
-                    traitors.RemoveWhere(x => x.Id == help.Target);
-                }
-            }
-        }
-
-        // You are the first/only traitor.
-        if (traitors.Count == 0)
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        _target.SetTarget(ent.Owner, _random.Pick(traitors).Id, target);
+        _target.SetTarget(ent, picked, target);
     }
 }
diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
index e16e8884b2..11e97c5b93 100644
--- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs
+++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Payload.Components;
 using Content.Shared.Tag;
+using Content.Shared.Trigger;
 using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization.Manager;
@@ -54,18 +54,22 @@ public sealed class PayloadSystem : EntitySystem
 
     private void OnCaseTriggered(EntityUid uid, PayloadCaseComponent component, TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
+
         if (!TryComp(uid, out ContainerManagerComponent? contMan))
             return;
 
         // Pass trigger event onto all contained payloads. Payload capacity configurable by construction graphs.
         foreach (var ent in GetAllPayloads(uid, contMan))
         {
-            RaiseLocalEvent(ent, args, false);
+            RaiseLocalEvent(ent, ref args, false);
         }
     }
 
     private void OnTriggerTriggered(EntityUid uid, PayloadTriggerComponent component, TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
+
         if (!component.Active)
             return;
 
@@ -75,7 +79,7 @@ public sealed class PayloadSystem : EntitySystem
         // Ensure we don't enter a trigger-loop
         DebugTools.Assert(!_tagSystem.HasTag(uid, PayloadTag));
 
-        RaiseLocalEvent(parent, args, false);
+        RaiseLocalEvent(parent, ref args);
     }
 
     private void OnEntityInserted(EntityUid uid, PayloadCaseComponent _, EntInsertedIntoContainerMessage args)
@@ -102,7 +106,7 @@ public sealed class PayloadSystem : EntitySystem
 
             var temp = (object) component;
             _serializationManager.CopyTo(data.Component, ref temp);
-            EntityManager.AddComponent(uid, (Component) temp!);
+            AddComp(uid, (Component) temp!);
 
             trigger.GrantedComponents.Add(registration.Type);
         }
@@ -117,7 +121,7 @@ public sealed class PayloadSystem : EntitySystem
 
         foreach (var type in trigger.GrantedComponents)
         {
-            EntityManager.RemoveComponent(uid, type);
+            RemComp(uid, type);
         }
 
         trigger.GrantedComponents.Clear();
@@ -146,6 +150,7 @@ public sealed class PayloadSystem : EntitySystem
 
     private void HandleChemicalPayloadTrigger(Entity<ChemicalPayloadComponent> entity, ref TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
         if (entity.Comp.BeakerSlotA.Item is not EntityUid beakerA
             || entity.Comp.BeakerSlotB.Item is not EntityUid beakerB
             || !TryComp(beakerA, out FitsInDispenserComponent? compA)
diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs
index fa278278e2..9ec05be9b7 100644
--- a/Content.Server/Physics/Controllers/ConveyorController.cs
+++ b/Content.Server/Physics/Controllers/ConveyorController.cs
@@ -19,6 +19,7 @@ public sealed class ConveyorController : SharedConveyorController
     [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
     [Dependency] private readonly MaterialReclaimerSystem _materialReclaimer = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     public override void Initialize()
     {
@@ -123,7 +124,7 @@ public sealed class ConveyorController : SharedConveyorController
 
         var xform = ent.Comp;
 
-        var beltTileRef = xform.Coordinates.GetTileRef(EntityManager, MapManager);
+        var beltTileRef = _turf.GetTileRef(xform.Coordinates);
 
         if (beltTileRef != null)
         {
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index f0a723f3c0..5c87de1863 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -7,6 +7,7 @@ using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
+using Prometheus;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
@@ -17,6 +18,10 @@ namespace Content.Server.Physics.Controllers;
 
 public sealed class MoverController : SharedMoverController
 {
+    private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge(
+        "physics_active_mover_count",
+        "Active amount of InputMovers being processed by MoverController");
+
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
@@ -97,6 +102,8 @@ public sealed class MoverController : SharedMoverController
             HandleMobMovement(mover, frameTime);
         }
 
+        ActiveMoverGauge.Set(_movers.Count);
+
         HandleShuttleMovement(frameTime);
     }
 
diff --git a/Content.Server/Physics/Controllers/RandomWalkController.cs b/Content.Server/Physics/Controllers/RandomWalkController.cs
index 55d3d50d2a..fad6493524 100644
--- a/Content.Server/Physics/Controllers/RandomWalkController.cs
+++ b/Content.Server/Physics/Controllers/RandomWalkController.cs
@@ -43,9 +43,9 @@ internal sealed class RandomWalkController : VirtualController
         var query = EntityQueryEnumerator<RandomWalkComponent, PhysicsComponent>();
         while (query.MoveNext(out var uid, out var randomWalk, out var physics))
         {
-            if (EntityManager.HasComponent<ActorComponent>(uid)
-            ||  EntityManager.HasComponent<ThrownItemComponent>(uid)
-            ||  EntityManager.HasComponent<FollowerComponent>(uid))
+            if (HasComp<ActorComponent>(uid)
+            || HasComp<ThrownItemComponent>(uid)
+            || HasComp<FollowerComponent>(uid))
                 continue;
 
             var curTime = _timing.CurTime;
diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index 123be99126..82f9e0860c 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Station.Systems;
-using Content.Server.Warps;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Localizations;
@@ -28,7 +27,7 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
+    [Dependency] private readonly TurfSystem _turfSystem = default!;
 
     public const float CloseDistance = 15f;
     public const float FarDistance = 30f;
@@ -63,7 +62,6 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
         SubscribeLocalEvent<NavMapBeaconComponent, AnchorStateChangedEvent>(OnNavMapBeaconAnchor);
         SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, NavMapBeaconConfigureBuiMessage>(OnConfigureMessage);
         SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, MapInitEvent>(OnConfigurableMapInit);
-        SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, ExaminedEvent>(OnConfigurableExamined);
     }
 
     private void OnStationInit(StationGridAddedEvent ev)
@@ -118,7 +116,7 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
             var relative = SharedMapSystem.GetChunkRelative(tile, ChunkSize);
             ref var tileData = ref chunk.TileData[GetTileIndex(relative)];
 
-            if (change.NewTile.IsSpace(_tileDefManager))
+            if (_turfSystem.IsSpace(change.NewTile))
             {
                 tileData = 0;
                 if (PruneEmpty((ev.Entity, navMap), chunk))
@@ -227,17 +225,6 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
         UpdateBeaconEnabledVisuals((ent, navMap));
     }
 
-    private void OnConfigurableExamined(Entity<ConfigurableNavMapBeaconComponent> ent, ref ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange || !TryComp<NavMapBeaconComponent>(ent, out var navMap))
-            return;
-
-        args.PushMarkup(Loc.GetString("nav-beacon-examine-text",
-            ("enabled", navMap.Enabled),
-            ("color", navMap.Color.ToHexNoAlpha()),
-            ("label", navMap.Text ?? string.Empty)));
-    }
-
     #endregion
 
     #region: Grid functions
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
index 1061552a53..07c6817b60 100644
--- a/Content.Server/Pinpointer/PinpointerSystem.cs
+++ b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -197,7 +197,7 @@ public sealed class PinpointerSystem : SharedPinpointerSystem
             return;
 
         var target = pinpointer.Target;
-        if (target == null || !EntityManager.EntityExists(target.Value))
+        if (target == null || !Exists(target.Value))
         {
             SetDistance(uid, Distance.Unknown, pinpointer);
             return;
diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
index 3cf25472f0..09f61632b6 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.Atmos.Components;
 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 @@ public sealed class PneumaticCannonSystem : SharedPneumaticCannonSystem
         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/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index aaa9f89a66..223ce0b1b3 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -162,7 +162,7 @@ namespace Content.Server.Pointing.EntitySystems
             var mapCoordsPointed = _transform.ToMapCoordinates(coordsPointed);
             _rotateToFaceSystem.TryFaceCoordinates(player, mapCoordsPointed.Position);
 
-            var arrow = EntityManager.SpawnEntity("PointingArrow", coordsPointed);
+            var arrow = Spawn("PointingArrow", coordsPointed);
 
             if (TryComp<PointingArrowComponent>(arrow, out var pointing))
             {
@@ -183,7 +183,7 @@ namespace Content.Server.Pointing.EntitySystems
             var layer = (int) VisibilityFlags.Normal;
             if (TryComp(player, out VisibilityComponent? playerVisibility))
             {
-                var arrowVisibility = EntityManager.EnsureComponent<VisibilityComponent>(arrow);
+                var arrowVisibility = EnsureComp<VisibilityComponent>(arrow);
                 layer = playerVisibility.Layer;
                 _visibilitySystem.SetLayer((arrow, arrowVisibility), (ushort) layer);
             }
diff --git a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
index 1edcec6677..cc22611627 100644
--- a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
@@ -62,7 +62,7 @@ namespace Content.Server.Pointing.EntitySystems
 
                 if (component.Chasing is not {Valid: true} chasing || Deleted(chasing))
                 {
-                    EntityManager.QueueDeleteEntity(uid);
+                    QueueDel(uid);
                     continue;
                 }
 
@@ -99,7 +99,7 @@ namespace Content.Server.Pointing.EntitySystems
 
 
                 _explosion.QueueExplosion(uid, ExplosionSystem.DefaultExplosionPrototypeId, 50, 3, 10);
-                EntityManager.QueueDeleteEntity(uid);
+                QueueDel(uid);
             }
         }
     }
diff --git a/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs b/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs
deleted file mode 100644
index a11b4f4d4c..0000000000
--- a/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Components;
-
-/// <summary>
-/// Intended for use with the trigger system.
-/// Polymorphs the user of the trigger.
-/// </summary>
-[RegisterComponent]
-public sealed partial class PolymorphOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Polymorph settings.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<PolymorphPrototype> Polymorph;
-}
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs
index 1db624439a..fd24ad9774 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs
@@ -31,7 +31,9 @@ public sealed partial class PolymorphSystem
         if (PausedMap != null && Exists(PausedMap))
             return;
 
-        PausedMap = _map.CreateMap();
-        _map.SetPaused(PausedMap.Value, true);
+        var mapUid = _map.CreateMap();
+        _metaData.SetEntityName(mapUid, Loc.GetString("polymorph-paused-map-name"));
+        _map.SetPaused(mapUid, true);
+        PausedMap = mapUid;
     }
 }
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs
deleted file mode 100644
index 452b060315..0000000000
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Polymorph;
-using Content.Server.Polymorph.Components;
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Systems;
-
-public sealed partial class PolymorphSystem
-{
-    /// <summary>
-    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
-    /// an entity we're colliding with in case of TriggerOnCollide.
-    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
-    /// </summary>
-    private Queue<(EntityUid Ent, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
-
-    private void InitializeTrigger()
-    {
-        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.User == null)
-            return;
-
-        _queuedPolymorphUpdates.Enqueue((args.User.Value, ent.Comp.Polymorph));
-        args.Handled = true;
-    }
-
-    public void UpdateTrigger()
-    {
-        while (_queuedPolymorphUpdates.TryDequeue(out var data))
-        {
-            if (TerminatingOrDeleted(data.Item1))
-                continue;
-
-            PolymorphEntity(data.Item1, data.Item2);
-        }
-    }
-}
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index a6c9831cce..cf799e6215 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -1,10 +1,7 @@
 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.Actions;
-using Content.Shared.Actions.Components;
 using Content.Shared.Buckle;
 using Content.Shared.Coordinates;
 using Content.Shared.Damage;
@@ -24,7 +21,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 // Sunrise-Start
-using Content.Shared.EntityEffects; 
+using Content.Shared.EntityEffects;
 using Content.Shared.Mind.Components;
 // Sunrise-End
 
@@ -60,12 +57,10 @@ public sealed partial class PolymorphSystem : EntitySystem
         SubscribeLocalEvent<PolymorphableComponent, PolymorphActionEvent>(OnPolymorphActionEvent);
         SubscribeLocalEvent<PolymorphedEntityComponent, RevertPolymorphActionEvent>(OnRevertPolymorphActionEvent);
 
-        SubscribeLocalEvent<PolymorphedEntityComponent, BeforeFullyEatenEvent>(OnBeforeFullyEaten);
         SubscribeLocalEvent<PolymorphedEntityComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
         SubscribeLocalEvent<PolymorphedEntityComponent, DestructionEventArgs>(OnDestruction);
 
         InitializeMap();
-        InitializeTrigger();
     }
 
     public override void Update(float frameTime)
@@ -92,8 +87,6 @@ public sealed partial class PolymorphSystem : EntitySystem
                 Revert((uid, comp));
             }
         }
-
-        UpdateTrigger();
     }
 
     private void OnComponentStartup(Entity<PolymorphableComponent> ent, ref ComponentStartup args)
@@ -136,16 +129,6 @@ public sealed partial class PolymorphSystem : EntitySystem
         Revert((ent, ent));
     }
 
-    private void OnBeforeFullyEaten(Entity<PolymorphedEntityComponent> ent, ref BeforeFullyEatenEvent args)
-    {
-        var (_, comp) = ent;
-        if (comp.Configuration.RevertOnEat)
-        {
-            args.Cancel();
-            Revert((ent, ent));
-        }
-    }
-
     private void OnBeforeFullySliced(Entity<PolymorphedEntityComponent> ent, ref BeforeFullySlicedEvent args)
     {
         var (_, comp) = ent;
@@ -180,23 +163,27 @@ public sealed partial class PolymorphSystem : EntitySystem
     }
 
     /// <summary>
-    /// Polymorphs the target entity into another
+    /// Polymorphs the target entity into another.
     /// </summary>
     /// <param name="uid">The entity that will be transformed</param>
-    /// <param name="configuration">Polymorph data</param>
-    /// <returns></returns>
+    /// <param name="configuration">The new polymorph configuration</param>
+    /// <returns>The new entity, or null if the polymorph failed.</returns>
     public EntityUid? PolymorphEntity(EntityUid uid, PolymorphConfiguration configuration)
     {
         // Sunrise-Start
-        if (configuration.BlockIfHasMind 
-            && TryComp<MindContainerComponent>(uid, out var mindContainer) 
+        if (configuration.BlockIfHasMind
+            && TryComp<MindContainerComponent>(uid, out var mindContainer)
             && mindContainer.HasMind)
         {
             return null;
         }
         // Sunrise-End
-        // if it's already morphed, don't allow it again with this condition active.
-        if (!configuration.AllowRepeatedMorphs && HasComp<PolymorphedEntityComponent>(uid))
+
+        // If they're morphed, check their current config to see if they can be
+        // morphed again
+        if (!configuration.IgnoreAllowRepeatedMorphs
+            && TryComp<PolymorphedEntityComponent>(uid, out var currentPoly)
+            && !currentPoly.Configuration.AllowRepeatedMorphs)
             return null;
 
         // If this polymorph has a cooldown, check if that amount of time has passed since the
@@ -222,7 +209,7 @@ public sealed partial class PolymorphSystem : EntitySystem
                 ("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/Commands/PowerStatCommand.cs b/Content.Server/Power/Commands/PowerStatCommand.cs
index 127050393a..b9d71ee9bc 100644
--- a/Content.Server/Power/Commands/PowerStatCommand.cs
+++ b/Content.Server/Power/Commands/PowerStatCommand.cs
@@ -3,25 +3,22 @@ using Content.Server.Power.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
-namespace Content.Server.Power.Commands
+namespace Content.Server.Power.Commands;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class PowerStatCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Debug)]
-    public sealed class PowerStatCommand : IConsoleCommand
+    [Dependency] private readonly PowerNetSystem _powerNet = default!;
+
+    public override string Command => "powerstat";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        [Dependency] private readonly IEntityManager _e = default!;
-
-        public string Command => "powerstat";
-        public string Description => "Shows statistics for pow3r";
-        public string Help => "Usage: powerstat";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var stats = _e.System<PowerNetSystem>().GetStatistics();
-
-            shell.WriteLine($"networks: {stats.CountNetworks}");
-            shell.WriteLine($"loads: {stats.CountLoads}");
-            shell.WriteLine($"supplies: {stats.CountSupplies}");
-            shell.WriteLine($"batteries: {stats.CountBatteries}");
-        }
+        var stats = _powerNet.GetStatistics();
+        shell.WriteLine(Loc.GetString("cmd-powerstat-output",
+            ("networks", stats.CountNetworks),
+            ("loads", stats.CountLoads),
+            ("supplies", stats.CountSupplies),
+            ("batteries", stats.CountBatteries)));
     }
 }
diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
index b22950c1a1..464bbd6f39 100644
--- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs
+++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
@@ -4,6 +4,7 @@ using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.NodeContainer;
 using Content.Shared.NodeContainer.NodeGroups;
+using Content.Shared.Power;
 
 namespace Content.Server.Power.Components
 {
@@ -94,11 +95,4 @@ namespace Content.Server.Power.Components
             TryFindAndSetNet();
         }
     }
-
-    public enum Voltage
-    {
-        High = NodeGroupID.HVPower,
-        Medium = NodeGroupID.MVPower,
-        Apc = NodeGroupID.Apc,
-    }
 }
diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
index 6ce19cfaf6..33e3f8ff2c 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 @@ public sealed class BatteryInterfaceSystem : EntitySystem
     {
         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/EntitySystems/CableSystem.Placer.cs b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
index 5d9105a3fc..55d517cf7d 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
@@ -48,7 +48,7 @@ public sealed partial class CableSystem
         if (TryComp<StackComponent>(placer, out var stack) && !_stack.Use(placer, 1, stack))
             return;
 
-        var newCable = EntityManager.SpawnEntity(component.CablePrototypeId, _map.GridTileToLocal(gridUid, grid, snapPos));
+        var newCable = Spawn(component.CablePrototypeId, _map.GridTileToLocal(gridUid, grid, snapPos));
         _adminLogger.Add(LogType.Construction, LogImpact.Low,
             $"{ToPrettyString(args.User):player} placed {ToPrettyString(newCable):cable} at {Transform(newCable).Coordinates}");
         args.Handled = true;
diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
index 89f32166ae..fd6ff70f77 100644
--- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
+++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
@@ -174,7 +174,7 @@ namespace Content.Server.Power.EntitySystems
 
         private void OnReceiverStarted(Entity<ExtensionCableReceiverComponent> receiver, ref ComponentStartup args)
         {
-            if (EntityManager.TryGetComponent(receiver.Owner, out PhysicsComponent? physicsComponent))
+            if (TryComp(receiver.Owner, out PhysicsComponent? physicsComponent))
             {
                 receiver.Comp.Connectable = physicsComponent.BodyType == BodyType.Static;
             }
diff --git a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
index 7935af155a..671a880874 100644
--- a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs
@@ -85,8 +85,8 @@ public sealed class PowerChargeSystem : EntitySystem
         if (!Resolve(uid, ref powerReceiver))
             return;
 
-        if (user is { } )
-            _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{ToPrettyString(user):player} set ${ToPrettyString(uid):target} to {(on ? "on" : "off")}");
+        if (user is { })
+            _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{ToPrettyString(user):player} set {ToPrettyString(uid):target} to {(on ? "on" : "off")}");
 
         component.SwitchedOn = on;
         UpdatePowerState(component, powerReceiver);
diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
index 7b41af66b9..be79d64fc9 100644
--- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
@@ -80,7 +80,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 
     private void OnPowerMonitoringConsoleMessage(EntityUid uid, PowerMonitoringConsoleComponent component, PowerMonitoringConsoleMessage args)
     {
-        var focus = EntityManager.GetEntity(args.FocusDevice);
+        var focus = GetEntity(args.FocusDevice);
         var group = args.FocusGroup;
 
         // Update this if the focus device has changed
@@ -207,17 +207,17 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 
             if (!args.Anchored)
             {
-                entConsole.PowerMonitoringDeviceMetaData.Remove(EntityManager.GetNetEntity(uid));
+                entConsole.PowerMonitoringDeviceMetaData.Remove(GetNetEntity(uid));
                 Dirty(ent, entConsole);
 
                 continue;
             }
 
             var name = MetaData(uid).EntityName;
-            var coords = EntityManager.GetNetCoordinates(xform.Coordinates);
+            var coords = GetNetCoordinates(xform.Coordinates);
 
             var metaData = new PowerMonitoringDeviceMetaData(name, coords, component.Group, component.SpritePath, component.SpriteState);
-            entConsole.PowerMonitoringDeviceMetaData.TryAdd(EntityManager.GetNetEntity(uid), metaData);
+            entConsole.PowerMonitoringDeviceMetaData.TryAdd(GetNetEntity(uid), metaData);
 
             Dirty(ent, entConsole);
         }
@@ -364,7 +364,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
                 continue;
 
             // Generate a new console entry with which to populate the UI
-            var entry = new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), device.Group, powerStats.PowerValue, powerStats.BatteryLevel);
+            var entry = new PowerMonitoringConsoleEntry(GetNetEntity(ent), device.Group, powerStats.PowerValue, powerStats.BatteryLevel);
             allEntries.Add(entry);
         }
 
@@ -548,7 +548,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
                     continue;
                 }
 
-                indexedSources.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, powerSupplier.CurrentSupply, GetBatteryLevel(ent)));
+                indexedSources.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, powerSupplier.CurrentSupply, GetBatteryLevel(ent)));
             }
         }
 
@@ -578,7 +578,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
                     continue;
                 }
 
-                indexedSources.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, entBattery.CurrentSupply, GetBatteryLevel(ent)));
+                indexedSources.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, entBattery.CurrentSupply, GetBatteryLevel(ent)));
             }
         }
 
@@ -662,7 +662,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
                     continue;
                 }
 
-                indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, powerConsumer.ReceivedPower, GetBatteryLevel(ent)));
+                indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, powerConsumer.ReceivedPower, GetBatteryLevel(ent)));
             }
         }
 
@@ -692,7 +692,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
                     continue;
                 }
 
-                indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, battery.CurrentReceiving, GetBatteryLevel(ent)));
+                indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, battery.CurrentReceiving, GetBatteryLevel(ent)));
             }
         }
 
@@ -831,7 +831,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 
     private void UpdateCollectionChildMetaData(EntityUid child, EntityUid master)
     {
-        var netEntity = EntityManager.GetNetEntity(child);
+        var netEntity = GetNetEntity(child);
         var xform = Transform(child);
 
         var query = AllEntityQuery<PowerMonitoringConsoleComponent, TransformComponent>();
@@ -843,7 +843,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
             if (!entConsole.PowerMonitoringDeviceMetaData.TryGetValue(netEntity, out var metaData))
                 continue;
 
-            metaData.CollectionMaster = EntityManager.GetNetEntity(master);
+            metaData.CollectionMaster = GetNetEntity(master);
             entConsole.PowerMonitoringDeviceMetaData[netEntity] = metaData;
 
             Dirty(ent, entConsole);
@@ -852,7 +852,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 
     private void UpdateCollectionMasterMetaData(EntityUid master, int childCount)
     {
-        var netEntity = EntityManager.GetNetEntity(master);
+        var netEntity = GetNetEntity(master);
         var xform = Transform(master);
 
         var query = AllEntityQuery<PowerMonitoringConsoleComponent, TransformComponent>();
@@ -960,9 +960,9 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
             if (grid != entXform.GridUid)
                 continue;
 
-            var netEntity = EntityManager.GetNetEntity(ent);
+            var netEntity = GetNetEntity(ent);
             var name = MetaData(ent).EntityName;
-            var netCoords = EntityManager.GetNetCoordinates(entXform.Coordinates);
+            var netCoords = GetNetCoordinates(entXform.Coordinates);
 
             var metaData = new PowerMonitoringDeviceMetaData(name, netCoords, entDevice.Group, entDevice.SpritePath, entDevice.SpriteState);
 
@@ -970,7 +970,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
             {
                 if (!entDevice.IsCollectionMaster)
                 {
-                    metaData.CollectionMaster = EntityManager.GetNetEntity(entDevice.CollectionMaster);
+                    metaData.CollectionMaster = GetNetEntity(entDevice.CollectionMaster);
                 }
 
                 else if (entDevice.ChildDevices.Count > 0)
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 4e2e5cbd02..b22045061e 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -52,6 +52,7 @@ namespace Content.Server.Power.EntitySystems
             UpdatesAfter.Add(typeof(NodeGroupSystem));
             _solver = new(_cfg.GetCVar(CCVars.DebugPow3rDisableParallel));
 
+            SubscribeLocalEvent<ApcPowerReceiverComponent, MapInitEvent>(ApcPowerReceiverMapInit);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentInit>(ApcPowerReceiverInit);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentShutdown>(ApcPowerReceiverShutdown);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentRemove>(ApcPowerReceiverRemove);
@@ -81,6 +82,11 @@ namespace Content.Server.Power.EntitySystems
             _solver = new(val);
         }
 
+        private void ApcPowerReceiverMapInit(Entity<ApcPowerReceiverComponent> ent, ref MapInitEvent args)
+        {
+            _appearance.SetData(ent, PowerDeviceVisuals.Powered, ent.Comp.Powered);
+        }
+
         private void ApcPowerReceiverInit(EntityUid uid, ApcPowerReceiverComponent component, ComponentInit args)
         {
             AllocLoad(component.NetworkLoad);
diff --git a/Content.Server/Power/Generator/PowerSwitchableSystem.cs b/Content.Server/Power/Generator/PowerSwitchableSystem.cs
index 7b7d7ce256..25de3bd293 100644
--- a/Content.Server/Power/Generator/PowerSwitchableSystem.cs
+++ b/Content.Server/Power/Generator/PowerSwitchableSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.Nodes;
 using Content.Shared.NodeContainer;
+using Content.Shared.Power;
 using Content.Shared.Power.Generator;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
diff --git a/Content.Server/Power/Nodes/CableNode.cs b/Content.Server/Power/Nodes/CableNode.cs
index b8c404e8e2..b0cbad4d48 100644
--- a/Content.Server/Power/Nodes/CableNode.cs
+++ b/Content.Server/Power/Nodes/CableNode.cs
@@ -52,7 +52,6 @@ namespace Content.Server.Power.Nodes
                         {
                             // Target tile has a terminal towards us, block the direction.
                             terminalDirs |= 1 << (int) dir;
-                            break;
                         }
                     }
                 }
diff --git a/Content.Server/Power/Nodes/CableTerminalPortNode.cs b/Content.Server/Power/Nodes/CableTerminalPortNode.cs
index f71f1c4aa6..b2397ebb6c 100644
--- a/Content.Server/Power/Nodes/CableTerminalPortNode.cs
+++ b/Content.Server/Power/Nodes/CableTerminalPortNode.cs
@@ -21,9 +21,11 @@ namespace Content.Server.Power.Nodes
             var gridIndex = grid.TileIndicesFor(xform.Coordinates);
 
             var nodes = NodeHelpers.GetCardinalNeighborNodes(nodeQuery, grid, gridIndex, includeSameTile: false);
-            foreach (var (_, node) in nodes)
+            foreach (var (dir, node) in nodes)
             {
-                if (node is CableTerminalNode)
+                if (node is CableTerminalNode
+                    && dir != Direction.Invalid
+                    && xformQuery.GetComponent(node.Owner).LocalRotation.GetCardinalDir().GetOpposite() == dir)
                     yield return node;
             }
         }
diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs
index b73cf63069..7ceee20172 100644
--- a/Content.Server/Power/SetBatteryPercentCommand.cs
+++ b/Content.Server/Power/SetBatteryPercentCommand.cs
@@ -7,41 +7,40 @@ using Robust.Shared.Console;
 namespace Content.Server.Power
 {
     [AdminCommand(AdminFlags.Debug)]
-    public sealed class SetBatteryPercentCommand : IConsoleCommand
+    public sealed class SetBatteryPercentCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly BatterySystem _batterySystem = default!;
 
-        public string Command => "setbatterypercent";
-        public string Description => "Drains or recharges a battery by entity uid and percentage, i.e.: forall with Battery do setbatterypercent $ID 0";
-        public string Help => $"{Command} <id> <percent>";
+        public override string Command => "setbatterypercent";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 2)
             {
-                shell.WriteLine($"Invalid amount of arguments.\n{Help}");
+                shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific",
+                    ("properAmount", 2),
+                    ("currentAmount", args.Length)));
                 return;
             }
 
-            if (!NetEntity.TryParse(args[0], out var netEnt) || !_entManager.TryGetEntity(netEnt, out var id))
+            if (!NetEntity.TryParse(args[0], out var netEnt) || !EntityManager.TryGetEntity(netEnt, out var id))
             {
-                shell.WriteLine($"{args[0]} is not a valid entity id.");
+                shell.WriteLine(Loc.GetString($"shell-invalid-entity-uid", ("uid", args[0])));
                 return;
             }
 
             if (!float.TryParse(args[1], out var percent))
             {
-                shell.WriteLine($"{args[1]} is not a valid float (percentage).");
+                shell.WriteLine(Loc.GetString($"cmd-setbatterypercent-not-valid-percent", ("arg", args[1])));
                 return;
             }
 
-            if (!_entManager.TryGetComponent<BatteryComponent>(id, out var battery))
+            if (!EntityManager.TryGetComponent<BatteryComponent>(id, out var battery))
             {
-                shell.WriteLine($"No battery found with id {id}.");
+                shell.WriteLine(Loc.GetString($"cmd-setbatterypercent-battery-not-found", ("id", id)));
                 return;
             }
-            var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<BatterySystem>();
-            system.SetCharge(id.Value, battery.MaxCharge * percent / 100, battery);
+            _batterySystem.SetCharge(id.Value, battery.MaxCharge * percent / 100, battery);
             // Don't acknowledge b/c people WILL forall this
         }
     }
diff --git a/Content.Server/PowerCell/PowerCellSystem.Draw.cs b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
index ae43b6dae9..9156d30b1f 100644
--- a/Content.Server/PowerCell/PowerCellSystem.Draw.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
@@ -28,7 +28,7 @@ public sealed partial class PowerCellSystem
             if (!TryGetBatteryFromSlot(uid, out var batteryEnt, out var battery, slot))
                 continue;
 
-            if (_battery.TryUseCharge(batteryEnt.Value, comp.DrawRate, battery))
+            if (_battery.TryUseCharge(batteryEnt.Value, comp.DrawRate * (float)comp.Delay.TotalSeconds, battery))
                 continue;
 
             var ev = new PowerCellSlotEmptyEvent();
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index ae2c5ecd69..1ee47c86b6 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -111,7 +111,7 @@ namespace Content.Server.PowerSink
             foreach (var (entity, component) in toRemove)
             {
                 _explosionSystem.QueueExplosion(entity, "PowerSink", 2000f, 4f, 20f, canCreateVacuum: true);
-                EntityManager.RemoveComponent(entity, component);
+                RemComp(entity, component);
             }
         }
 
diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs
index 59fd9a5d69..4235fa2a1c 100644
--- a/Content.Server/Prayer/PrayerSystem.cs
+++ b/Content.Server/Prayer/PrayerSystem.cs
@@ -35,7 +35,7 @@ public sealed class PrayerSystem : EntitySystem
     private void AddPrayVerb(EntityUid uid, PrayableComponent comp, GetVerbsEvent<ActivationVerb> args)
     {
         // if it doesn't have an actor and we can't reach it then don't add the verb
-        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+        if (!TryComp(args.User, out ActorComponent? actor))
             return;
 
         // this is to prevent ghosts from using it
@@ -48,7 +48,7 @@ public sealed class PrayerSystem : EntitySystem
             Icon = comp.VerbImage,
             Act = () =>
             {
-                if (comp.BibleUserOnly && !EntityManager.TryGetComponent<BibleUserComponent>(args.User, out var bibleUser))
+                if (comp.BibleUserOnly && !TryComp<BibleUserComponent>(args.User, out var bibleUser))
                 {
                     _popupSystem.PopupEntity(Loc.GetString("prayer-popup-notify-pray-locked"), uid, actor.PlayerSession, PopupType.Large);
                     return;
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.Exterior.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.Exterior.cs
index 92237dca2a..4f2f564ded 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.Exterior.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.Exterior.cs
@@ -30,7 +30,7 @@ public sealed partial class DungeonJob
         SharedPathfindingSystem.GridCast(startTile, position, tile =>
         {
             if (!_maps.TryGetTileRef(_gridUid, _grid, tile, out var tileRef) ||
-                tileRef.Tile.IsSpace(_tileDefManager))
+                _turf.IsSpace(tileRef.Tile))
             {
                 return true;
             }
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.cs
index f2bd5a4394..77404fc963 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.cs
@@ -42,6 +42,7 @@ public sealed partial class DungeonJob : Job<List<Dungeon>>
     private readonly EntityTableSystem _entTable;
     private readonly TagSystem _tags;
     private readonly TileSystem _tile;
+    private readonly TurfSystem _turf;
     private readonly SharedMapSystem _maps;
     private readonly SharedTransformSystem _transform;
 
@@ -70,6 +71,7 @@ public sealed partial class DungeonJob : Job<List<Dungeon>>
         DungeonSystem dungeon,
         EntityLookupSystem lookup,
         TileSystem tile,
+        TurfSystem turf,
         SharedTransformSystem transform,
         DungeonConfig gen,
         MapGridComponent grid,
@@ -89,6 +91,7 @@ public sealed partial class DungeonJob : Job<List<Dungeon>>
         _dungeon = dungeon;
         _lookup = lookup;
         _tile = tile;
+        _turf = turf;
         _tags = _entManager.System<TagSystem>();
         _maps = _entManager.System<SharedMapSystem>();
         _entTable = _entManager.System<EntityTableSystem>();
diff --git a/Content.Server/Procedural/DungeonSystem.Commands.cs b/Content.Server/Procedural/DungeonSystem.Commands.cs
index 09e881686e..01cc6d3676 100644
--- a/Content.Server/Procedural/DungeonSystem.Commands.cs
+++ b/Content.Server/Procedural/DungeonSystem.Commands.cs
@@ -47,7 +47,7 @@ public sealed partial class DungeonSystem
         if (!TryComp<MapGridComponent>(dungeonUid, out var dungeonGrid))
         {
             dungeonUid = EntityManager.CreateEntityUninitialized(null, new EntityCoordinates(dungeonUid, position));
-            dungeonGrid = EntityManager.AddComponent<MapGridComponent>(dungeonUid);
+            dungeonGrid = AddComp<MapGridComponent>(dungeonUid);
             EntityManager.InitializeAndStartEntity(dungeonUid, mapId);
             // If we created a grid (e.g. space dungen) then offset it so we don't double-apply positions
             position = Vector2i.Zero;
diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs
index 9cc3fbb158..aac620acc0 100644
--- a/Content.Server/Procedural/DungeonSystem.cs
+++ b/Content.Server/Procedural/DungeonSystem.cs
@@ -36,6 +36,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly TileSystem _tile = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -53,8 +54,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     private readonly JobQueue _dungeonJobQueue = new(DungeonJobTime);
     private readonly Dictionary<DungeonJob.DungeonJob, CancellationTokenSource> _dungeonJobs = new();
 
-    [ValidatePrototypeId<ContentTileDefinition>]
-    public const string FallbackTileId = "FloorSteel";
+    public static readonly ProtoId<ContentTileDefinition> FallbackTileId = "FloorSteel";
 
     public override void Initialize()
     {
@@ -212,6 +212,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
             this,
             _lookup,
             _tile,
+            _turf,
             _transform,
             gen,
             grid,
@@ -244,6 +245,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
             this,
             _lookup,
             _tile,
+            _turf,
             _transform,
             gen,
             grid,
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 64bb678321..4c054a4561 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -57,7 +57,7 @@ public sealed class ProjectileSystem : SharedProjectileSystem
         var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, damageable: damageableComponent, origin: component.Shooter);
         var deleted = Deleted(target);
 
-        if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
+        if (modifiedDamage is not null && Exists(component.Shooter))
         {
             if (modifiedDamage.AnyPositive() && !deleted)
             {
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs
index 4436090565..7e1775e359 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs
@@ -1,11 +1,9 @@
-using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Radiation.Components;
 using Content.Shared.Administration;
 using Content.Shared.Radiation.Events;
 using Content.Shared.Radiation.Systems;
 using Robust.Shared.Console;
-using Robust.Shared.Debugging;
 using Robust.Shared.Enums;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
@@ -89,19 +87,18 @@ public partial class RadiationSystem
 ///     Toggle visibility of radiation rays coming from rad sources.
 /// </summary>
 [AdminCommand(AdminFlags.Admin)]
-public sealed class RadiationViewCommand : IConsoleCommand
+public sealed class RadiationViewCommand : LocalizedEntityCommands
 {
-    public string Command => "showradiation";
-    public string Description => Loc.GetString("radiation-command-description");
-    public string Help => Loc.GetString("radiation-command-help");
+    [Dependency] private readonly RadiationSystem _radiation = default!;
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "showradiation";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var session = shell.Player;
         if (session == null)
             return;
 
-        var entityManager = IoCManager.Resolve<IEntityManager>();
-        entityManager.System<RadiationSystem>().ToggleDebugView(session);
+        _radiation.ToggleDebugView(session);
     }
 }
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
index ffcf12b9d8..796c1e1fce 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
@@ -35,7 +35,7 @@ public partial class RadiationSystem
         stopwatch.Start();
 
         _sources.Clear();
-        _sources.EnsureCapacity(EntityManager.Count<RadiationSourceComponent>());
+        _sources.EnsureCapacity(Count<RadiationSourceComponent>());
 
         var sources = EntityQueryEnumerator<RadiationSourceComponent, TransformComponent>();
         var destinations = EntityQueryEnumerator<RadiationReceiverComponent, TransformComponent>();
diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index 2e1992f083..5a2a42a37b 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -100,14 +100,24 @@ public sealed class HeadsetSystem : SharedHeadsetSystem
 
     private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref RadioReceiveEvent args)
     {
-        // Sunrise-TTS-Start
-        var actorUid = Transform(uid).ParentUid;
-        if (TryComp(Transform(uid).ParentUid, out ActorComponent? actor))
+        // TODO: change this when a code refactor is done
+        // this is currently done this way because receiving radio messages on an entity otherwise requires that entity
+        // to have an ActiveRadioComponent
+
+        var parent = Transform(uid).ParentUid;
+
+        if (parent.IsValid())
+        {
+            var relayEvent = new HeadsetRadioReceiveRelayEvent(args);
+            RaiseLocalEvent(parent, ref relayEvent);
+        }
+
+        if (TryComp(parent, out ActorComponent? actor))
         {
             _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel);
-            if (actorUid != args.MessageSource && HasComp<TTSComponent>(args.MessageSource))
+            if (parent != args.MessageSource && HasComp<TTSComponent>(args.MessageSource))
             {
-                args.Receivers.Add(actorUid);
+                args.Receivers.Add(parent);
             }
         }
         // Sunrise-TTS-End
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 3829fc34d2..f052c460f5 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -2,15 +2,14 @@ using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio.Components;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Radio;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Chat;
 using Content.Shared.Radio.Components;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Radio/RadioEvent.cs b/Content.Server/Radio/RadioEvent.cs
index e52c8f3923..03cce66345 100644
--- a/Content.Server/Radio/RadioEvent.cs
+++ b/Content.Server/Radio/RadioEvent.cs
@@ -6,6 +6,12 @@ namespace Content.Server.Radio;
 [ByRefEvent]
 public readonly record struct RadioReceiveEvent(string Message, EntityUid MessageSource, RadioChannelPrototype Channel, EntityUid RadioSource, MsgChatMessage ChatMsg, List<EntityUid> Receivers); // Sunrise-TTS
 
+/// <summary>
+/// Event raised on the parent entity of a headset radio when a radio message is received
+/// </summary>
+[ByRefEvent]
+public readonly record struct HeadsetRadioReceiveRelayEvent(RadioReceiveEvent RelayedEvent);
+
 /// <summary>
 /// Use this event to cancel sending message per receiver
 /// </summary>
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index c46a138385..c624b9f0e0 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -52,11 +52,19 @@ namespace Content.Shared.Remotes
                 return;
             }
 
+            var accessTarget = args.Used;
+            // This covers the accesses the REMOTE has, and is not effected by the user's ID card.
+            if (entity.Comp.IncludeUserAccess) // Allows some door remotes to inherit the user's access.
+            {
+                accessTarget = args.User;
+                // This covers the accesses the USER has, which always includes the remote's access since holding a remote acts like holding an ID card.
+            }
+
             if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
-                && !_doorSystem.HasAccess(args.Target.Value, args.Used, doorComp, accessComponent))
+                && !_doorSystem.HasAccess(args.Target.Value, accessTarget, doorComp, accessComponent))
             {
                 if (isAirlock)
-                    _doorSystem.Deny(args.Target.Value, doorComp, args.User);
+                    _doorSystem.Deny(args.Target.Value, doorComp, accessTarget);
                 Popup.PopupEntity(Loc.GetString("door-remote-denied"), args.User, args.User);
                 return;
             }
@@ -64,7 +72,7 @@ namespace Content.Shared.Remotes
             switch (entity.Comp.Mode)
             {
                 case OperatingMode.OpenClose:
-                    if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.Used))
+                    if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, accessTarget))
                         _adminLogger.Add(LogType.Action,
                             LogImpact.Medium,
                             $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
@@ -74,7 +82,7 @@ namespace Content.Shared.Remotes
                     {
                         if (!boltsComp.BoltWireCut)
                         {
-                            _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.Used);
+                            _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, accessTarget);
                             _adminLogger.Add(LogType.Action,
                                 LogImpact.Medium,
                                 $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
diff --git a/Content.Server/Repairable/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs
deleted file mode 100644
index bab70f66b5..0000000000
--- a/Content.Server/Repairable/RepairableComponent.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Tools;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Repairable
-{
-    [RegisterComponent]
-    public sealed partial class RepairableComponent : Component
-    {
-        /// <summary>
-        ///     All the damage to change information is stored in this <see cref="DamageSpecifier"/>.
-        /// </summary>
-        /// <remarks>
-        ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
-        ///     in order to heal/repair the damage values have to be negative.
-        /// </remarks>
-        [DataField]
-        public DamageSpecifier? Damage;
-
-        [DataField]
-        public int FuelCost = 5;
-
-        [DataField]
-        public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
-
-        [DataField]
-        public int DoAfterDelay = 1;
-
-        /// <summary>
-        /// A multiplier that will be applied to the above if an entity is repairing themselves.
-        /// </summary>
-        [DataField]
-        public float SelfRepairPenalty = 3f;
-
-        /// <summary>
-        /// Whether or not an entity is allowed to repair itself.
-        /// </summary>
-        [DataField]
-        public bool AllowSelfRepair = true;
-    }
-}
diff --git a/Content.Server/Repairable/RepairableSystem.cs b/Content.Server/Repairable/RepairableSystem.cs
deleted file mode 100644
index 306da5bdd8..0000000000
--- a/Content.Server/Repairable/RepairableSystem.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Interaction;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Repairable;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
-
-namespace Content.Server.Repairable
-{
-    public sealed class RepairableSystem : SharedRepairableSystem
-    {
-        [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger= default!;
-        [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<RepairableComponent, InteractUsingEvent>(Repair);
-            SubscribeLocalEvent<RepairableComponent, RepairFinishedEvent>(OnRepairFinished);
-        }
-
-        private void OnRepairFinished(EntityUid uid, RepairableComponent component, RepairFinishedEvent args)
-        {
-            if (args.Cancelled)
-                return;
-
-            if (!EntityManager.TryGetComponent(uid, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
-                return;
-
-            if (component.Damage != null)
-            {
-                // Sunrise-start
-                var damageChanged = _damageableSystem.TryChangeDamage(uid, component.Damage, true, false, origin: args.User);
-                _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target} by {damageChanged?.GetTotal()}");
-
-                if (CanRepair(damageable.Damage.DamageDict, component) && args.Used != null)
-                {
-                    var isNotSelf = args.User != args.Target;
-
-                    var delay = isNotSelf
-                        ? component.DoAfterDelay
-                        : component.DoAfterDelay * GetScaledRepairPenalty(args.User, component);
-
-                    _toolSystem.UseTool(args.Used.Value, args.User, uid, delay, component.QualityNeeded, new RepairFinishedEvent(), component.FuelCost);
-                }
-                // Sunrise-end
-            }
-            else
-            {
-                // Repair all damage
-                _damageableSystem.SetAllDamage(uid, damageable, 0);
-                _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target} back to full health");
-            }
-
-            var str = Loc.GetString("comp-repairable-repair",
-                ("target", uid),
-                ("tool", args.Used!));
-            _popup.PopupEntity(str, uid, args.User);
-
-            var ev = new RepairedEvent((uid, component), args.User);
-            RaiseLocalEvent(uid, ref ev);
-        }
-
-        // Sunrise-start
-        private bool CanRepair(Dictionary<string, FixedPoint2> damage, RepairableComponent component)
-        {
-            if (component.Damage == null)
-            {
-                return true;
-            }
-
-            foreach (var type in component.Damage.DamageDict)
-            {
-                if (damage[type.Key].Value > 0)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-        // Sunrise-end
-
-        public async void Repair(EntityUid uid, RepairableComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // Only try repair the target if it is damaged
-            if (!TryComp<DamageableComponent>(uid, out var damageable) || damageable.TotalDamage == 0)
-                return;
-
-            if (!component.AllowSelfRepair && args.User == uid)
-                return;
-
-            // Sunrise-start
-            if (!CanRepair(damageable.Damage.DamageDict, component))
-                return;
-            // Sunrise-end
-
-            // Add a penalty to how long it takes if the user is repairing itself
-            var isNotSelf = args.User != args.Target;
-
-            var delay = isNotSelf
-                ? component.DoAfterDelay
-                : component.DoAfterDelay * GetScaledRepairPenalty(args.User, component);
-
-            // Run the repairing doafter
-            args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, delay, component.QualityNeeded, new RepairFinishedEvent(), component.FuelCost);
-        }
-
-        public float GetScaledRepairPenalty(EntityUid uid, RepairableComponent component)
-        {
-            var output = component.DoAfterDelay;
-            if (!TryComp<MobThresholdsComponent>(uid, out var mobThreshold) ||
-                !TryComp<DamageableComponent>(uid, out var damageable))
-                return output;
-            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var amount, mobThreshold))
-                return 1;
-
-            var percentDamage = (float) (damageable.TotalDamage / amount);
-            //basically make it scale from 1 to the multiplier.
-            var modifier = percentDamage * (component.SelfRepairPenalty - 1) + 1;
-            return Math.Max(modifier, 1);
-        }
-    }
-
-    /// <summary>
-    /// Event raised on an entity when its successfully repaired.
-    /// </summary>
-    /// <param name="Ent"></param>
-    /// <param name="User"></param>
-    [ByRefEvent]
-    public readonly record struct RepairedEvent(Entity<RepairableComponent> Ent, EntityUid User);
-
-}
diff --git a/Content.Server/Research/Disk/ResearchDiskSystem.cs b/Content.Server/Research/Disk/ResearchDiskSystem.cs
index 4d65c19f6e..2e30367a1c 100644
--- a/Content.Server/Research/Disk/ResearchDiskSystem.cs
+++ b/Content.Server/Research/Disk/ResearchDiskSystem.cs
@@ -30,7 +30,7 @@ namespace Content.Server.Research.Disk
 
             _research.ModifyServerPoints(args.Target.Value, component.Points, server);
             _popupSystem.PopupEntity(Loc.GetString("research-disk-inserted", ("points", component.Points)), args.Target.Value, args.User);
-            EntityManager.QueueDeleteEntity(uid);
+            QueueDel(uid);
             args.Handled = true;
         }
 
diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 0237c8712a..3e8888276f 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -2,6 +2,7 @@ using Content.Shared.Database;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Research.Systems;
 
@@ -165,9 +166,9 @@ public sealed partial class ResearchSystem
             return;
         component.MainDiscipline = null;
         component.CurrentTechnologyCards = new List<string>();
-        component.SupportedDisciplines = new List<string>();
-        component.UnlockedTechnologies = new List<string>();
-        component.UnlockedRecipes = new List<string>();
+        component.SupportedDisciplines = new List<ProtoId<TechDisciplinePrototype>>();
+        component.UnlockedTechnologies = new List<ProtoId<TechnologyPrototype>>();
+        component.UnlockedRecipes = new List<ProtoId<LatheRecipePrototype>>();
         Dirty(uid, component);
     }
 }
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index cde0fd2aa0..45229b7418 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -17,7 +17,6 @@ namespace Content.Server.Respawn;
 public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
 {
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -108,7 +107,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
 
             foreach (var tile in _map.GetTilesIntersecting(entityGridUid.Value, grid, circle))
             {
-                if (tile.IsSpace(_tileDefinitionManager)
+                if (_turf.IsSpace(tile)
                     || _turf.IsTileBlocked(tile, CollisionGroup.MobMask)
                     || !_atmosphere.IsTileMixtureProbablySafe(entityGridUid, entityMapUid.Value,
                         _map.TileIndicesFor((entityGridUid.Value, grid), mapPos)))
@@ -179,7 +178,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
 
             foreach (var newTileRef in _map.GetTilesIntersecting(targetGrid, grid, circle))
             {
-                if (newTileRef.IsSpace(_tileDefinitionManager) || _turf.IsTileBlocked(newTileRef, CollisionGroup.MobMask) || !_atmosphere.IsTileMixtureProbablySafe(targetGrid, targetMap, mapTarget))
+                if (_turf.IsSpace(newTileRef) || _turf.IsTileBlocked(newTileRef, CollisionGroup.MobMask) || !_atmosphere.IsTileMixtureProbablySafe(targetGrid, targetMap, mapTarget))
                     continue;
 
                 found = true;
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 8a7d302c4b..41306f102c 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -37,6 +37,7 @@ namespace Content.Server.Revenant.EntitySystems;
 
 public sealed partial class RevenantSystem
 {
+    [Dependency] private readonly EmagSystem _emagSystem = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly EntityStorageSystem _entityStorage = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -414,8 +415,7 @@ public sealed partial class RevenantSystem
                 _whitelistSystem.IsBlacklistPass(component.MalfunctionBlacklist, ent))
                 continue;
 
-            var ev = new GotEmaggedEvent(uid, EmagType.Interaction | EmagType.Access);
-            RaiseLocalEvent(ent, ref ev);
+            _emagSystem.TryEmagEffect(uid, uid, ent);
         }
     }
 }
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 0a6752b166..884d5c6f22 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -45,10 +45,10 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly VisibilitySystem _visibility = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string RevenantShopId = "ActionRevenantShop";
-    private const string RevenantDrainActionId = "ActionRevenantDrain";  // Sunrise-Edit
+    private static readonly EntProtoId RevenantShopId = "ActionRevenantShop";
+    private static readonly EntProtoId RevenantDrainActionId = "ActionRevenantDrain";  // Sunrise-Edit
 
     public override void Initialize()
     {
@@ -166,7 +166,7 @@ public sealed partial class RevenantSystem : EntitySystem
             return false;
         }
 
-        var tileref = Transform(uid).Coordinates.GetTileRef();
+        var tileref = _turf.GetTileRef(Transform(uid).Coordinates);
         if (tileref != null)
         {
             if(_physics.GetEntitiesIntersectingBody(uid, (int) CollisionGroup.Impassable).Count > 0)
@@ -179,7 +179,7 @@ public sealed partial class RevenantSystem : EntitySystem
         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/Roles/AddRoleCommand.cs b/Content.Server/Roles/AddRoleCommand.cs
index e510d24ac0..6337657612 100644
--- a/Content.Server/Roles/AddRoleCommand.cs
+++ b/Content.Server/Roles/AddRoleCommand.cs
@@ -10,53 +10,50 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Roles
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class AddRoleCommand : IConsoleCommand
+    public sealed class AddRoleCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly EntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly JobSystem _jobSystem = default!;
 
-        public string Command => "addrole";
+        public override string Command => "addrole";
 
-        public string Description => "Adds a role to a player's mind.";
-
-        public string Help => "addrole <session ID> <role>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 2)
             {
-                shell.WriteLine("Expected exactly 2 arguments.");
+                shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific",
+                    ("properAmount", 2),
+                    ("currentAmount", args.Length)));
                 return;
             }
 
-            var mgr = IoCManager.Resolve<IPlayerManager>();
-            if (!mgr.TryGetPlayerDataByUsername(args[0], out var data))
+            if (!_playerManager.TryGetPlayerDataByUsername(args[0], out var data))
             {
-                shell.WriteLine("Can't find that mind");
+                shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found"));
                 return;
             }
 
             var mind = data.ContentData()?.Mind;
             if (mind == null)
             {
-                shell.WriteLine("Can't find that mind");
+                shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found"));
                 return;
             }
 
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            if (!prototypeManager.TryIndex<JobPrototype>(args[1], out var jobPrototype))
+            if (!_prototypeManager.TryIndex<JobPrototype>(args[1], out var jobPrototype))
             {
-                shell.WriteLine("Can't find that role");
+                shell.WriteLine(Loc.GetString($"cmd-addrole-role-not-found"));
                 return;
             }
 
-            var jobs = _entityManager.System<JobSystem>();
-            if (jobs.MindHasJobWithId(mind, jobPrototype.Name))
+            if (_jobSystem.MindHasJobWithId(mind, jobPrototype.Name))
             {
-                shell.WriteLine("Mind already has that role");
+                shell.WriteLine(Loc.GetString($"cmd-addrole-mind-already-has-role"));
                 return;
             }
 
-            jobs.MindAddJob(mind.Value, args[1]);
+            _jobSystem.MindAddJob(mind.Value, args[1]);
         }
     }
 }
diff --git a/Content.Server/Roles/ListRolesCommand.cs b/Content.Server/Roles/ListRolesCommand.cs
index 41f6704249..22c8491591 100644
--- a/Content.Server/Roles/ListRolesCommand.cs
+++ b/Content.Server/Roles/ListRolesCommand.cs
@@ -7,24 +7,21 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Roles
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class ListRolesCommand : IConsoleCommand
+    public sealed class ListRolesCommand : LocalizedCommands
     {
-        public string Command => "listroles";
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        public string Description => "Lists roles";
+        public override string Command => "listroles";
 
-        public string Help => "listroles";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 0)
             {
-                shell.WriteLine("Expected no arguments.");
+                shell.WriteLine(Loc.GetString($"shell-need-exactly-zero-arguments"));
                 return;
             }
 
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            foreach(var job in prototypeManager.EnumeratePrototypes<JobPrototype>())
+            foreach(var job in _prototypeManager.EnumeratePrototypes<JobPrototype>())
             {
                 shell.WriteLine(job.ID);
             }
diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs
index c6e11cee22..2d18415067 100644
--- a/Content.Server/Roles/RemoveRoleCommand.cs
+++ b/Content.Server/Roles/RemoveRoleCommand.cs
@@ -9,28 +9,27 @@ using Robust.Shared.Console;
 namespace Content.Server.Roles
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class RemoveRoleCommand : IConsoleCommand
+    public sealed class RemoveRoleCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly SharedJobSystem _jobs = default!;
+        [Dependency] private readonly SharedRoleSystem _roles = default!;
 
-        public string Command => "rmrole";
+        public override string Command => "rmrole";
 
-        public string Description => "Removes a role from a player's mind.";
-
-        public string Help => "rmrole <session ID> <Role Type>\nThat role type is the actual C# type name.";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 2)
             {
-                shell.WriteLine("Expected exactly 2 arguments.");
+                shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific",
+                    ("properAmount", 2),
+                    ("currentAmount", args.Length)));
                 return;
             }
 
-            var mgr = IoCManager.Resolve<IPlayerManager>();
-            if (!mgr.TryGetPlayerDataByUsername(args[0], out var data))
+            if (!_playerManager.TryGetPlayerDataByUsername(args[0], out var data))
             {
-                shell.WriteLine("Can't find that mind");
+                shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found"));
                 return;
             }
 
@@ -38,14 +37,12 @@ namespace Content.Server.Roles
 
             if (mind == null)
             {
-                shell.WriteLine("Can't find that mind");
+                shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found"));
                 return;
             }
 
-            var roles = _entityManager.System<SharedRoleSystem>();
-            var jobs = _entityManager.System<SharedJobSystem>();
-            if (jobs.MindHasJobWithId(mind, args[1]))
-                roles.MindRemoveRole<JobRoleComponent>(mind.Value);
+            if (_jobs.MindHasJobWithId(mind, args[1]))
+                _roles.MindRemoveRole<JobRoleComponent>(mind.Value);
         }
     }
 }
diff --git a/Content.Server/Rootable/RootableSystem.cs b/Content.Server/Rootable/RootableSystem.cs
index ce88f18dc3..cd18315bd0 100644
--- a/Content.Server/Rootable/RootableSystem.cs
+++ b/Content.Server/Rootable/RootableSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -12,6 +12,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Server.Rootable;
 
+// TODO: Move all of this to shared
 /// <summary>
 /// Adds an action to toggle rooting to the ground, primarily for the Diona species.
 /// </summary>
@@ -68,7 +69,7 @@ public sealed class RootableSystem : SharedRootableSystem
 
         _reactive.DoEntityReaction(entity, transferSolution, ReactionMethod.Ingestion);
 
-        if (_blood.TryAddToChemicals(entity, transferSolution, entity.Comp2))
+        if (_blood.TryAddToChemicals((entity, entity.Comp2), transferSolution))
         {
             // Log solution addition by puddle
             _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):target} absorbed puddle {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
diff --git a/Content.Server/Rotatable/FlippableComponent.cs b/Content.Server/Rotatable/FlippableComponent.cs
deleted file mode 100644
index 98eb0f6d5c..0000000000
--- a/Content.Server/Rotatable/FlippableComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Rotatable
-{
-    [RegisterComponent]
-    public sealed partial class FlippableComponent : Component
-    {
-        /// <summary>
-        ///     Entity to replace this entity with when the current one is 'flipped'.
-        /// </summary>
-        [DataField("mirrorEntity", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string MirrorEntity = default!;
-    }
-}
diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs
deleted file mode 100644
index 32f8c91403..0000000000
--- a/Content.Server/Rotatable/RotatableSystem.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using Content.Server.Popups;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Input;
-using Content.Shared.Interaction;
-using Content.Shared.Rotatable;
-using Content.Shared.Verbs;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Map;
-using Robust.Shared.Player;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Rotatable
-{
-    /// <summary>
-    ///     Handles verbs for the <see cref="RotatableComponent"/> and <see cref="FlippableComponent"/> components.
-    /// </summary>
-    public sealed class RotatableSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<FlippableComponent, GetVerbsEvent<Verb>>(AddFlipVerb);
-            SubscribeLocalEvent<RotatableComponent, GetVerbsEvent<Verb>>(AddRotateVerbs);
-
-            CommandBinds.Builder
-                .Bind(ContentKeyFunctions.RotateObjectClockwise, new PointerInputCmdHandler(HandleRotateObjectClockwise))
-                .Bind(ContentKeyFunctions.RotateObjectCounterclockwise, new PointerInputCmdHandler(HandleRotateObjectCounterclockwise))
-                .Bind(ContentKeyFunctions.FlipObject, new PointerInputCmdHandler(HandleFlipObject))
-                .Register<RotatableSystem>();
-        }
-
-        private void AddFlipVerb(EntityUid uid, FlippableComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess
-                || !args.CanInteract
-                || !args.CanComplexInteract)
-                return;
-
-            // Check if the object is anchored.
-            if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physics) && physics.BodyType == BodyType.Static)
-                return;
-
-            Verb verb = new()
-            {
-                Act = () => Flip(uid, component),
-                Text = Loc.GetString("flippable-verb-get-data-text"),
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/flip.svg.192dpi.png")),
-                Priority = -3, // show flip last
-                DoContactInteraction = true
-            };
-            args.Verbs.Add(verb);
-        }
-
-        private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess
-                || !args.CanInteract
-                || !args.CanComplexInteract
-                || Transform(uid).NoLocalRotation) // Good ol prototype inheritance, eh?
-                return;
-
-            // Check if the object is anchored, and whether we are still allowed to rotate it.
-            if (!component.RotateWhileAnchored &&
-                EntityManager.TryGetComponent(uid, out PhysicsComponent? physics) &&
-                physics.BodyType == BodyType.Static)
-                return;
-
-            Verb resetRotation = new()
-            {
-                DoContactInteraction = true,
-                Act = () => EntityManager.GetComponent<TransformComponent>(uid).LocalRotation = Angle.Zero,
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")),
-                Text = "Reset",
-                Priority = -2, // show CCW, then CW, then reset
-                CloseMenu = false,
-            };
-            args.Verbs.Add(resetRotation);
-
-            // rotate clockwise
-            Verb rotateCW = new()
-            {
-                Act = () => EntityManager.GetComponent<TransformComponent>(uid).LocalRotation -= component.Increment,
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png")),
-                Priority = -1,
-                CloseMenu = false, // allow for easy double rotations.
-            };
-            args.Verbs.Add(rotateCW);
-
-            // rotate counter-clockwise
-            Verb rotateCCW = new()
-            {
-                Act = () => EntityManager.GetComponent<TransformComponent>(uid).LocalRotation += component.Increment,
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png")),
-                Priority = 0,
-                CloseMenu = false, // allow for easy double rotations.
-            };
-            args.Verbs.Add(rotateCCW);
-        }
-
-        /// <summary>
-        ///     Replace a flippable entity with it's flipped / mirror-symmetric entity.
-        /// </summary>
-        public void Flip(EntityUid uid, FlippableComponent component)
-        {
-            var oldTransform = EntityManager.GetComponent<TransformComponent>(uid);
-            var entity = EntityManager.SpawnEntity(component.MirrorEntity, oldTransform.Coordinates);
-            var newTransform = EntityManager.GetComponent<TransformComponent>(entity);
-            newTransform.LocalRotation = oldTransform.LocalRotation;
-            _transform.Unanchor(entity, newTransform);
-            EntityManager.DeleteEntity(uid);
-        }
-
-        public bool HandleRotateObjectClockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
-        {
-            if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
-                return false;
-
-            if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
-                return false;
-
-            if (!_actionBlocker.CanInteract(player, entity)
-                || !_actionBlocker.CanComplexInteract(player)
-                || !_interaction.InRangeAndAccessible(player, entity))
-                return false;
-
-            // Check if the object is anchored, and whether we are still allowed to rotate it.
-            if (!rotatableComp.RotateWhileAnchored && EntityManager.TryGetComponent(entity, out PhysicsComponent? physics) &&
-                physics.BodyType == BodyType.Static)
-            {
-                _popup.PopupEntity(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
-                return false;
-            }
-
-            Transform(entity).LocalRotation -= rotatableComp.Increment;
-            return true;
-        }
-
-        public bool HandleRotateObjectCounterclockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
-        {
-            if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
-                return false;
-
-            if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
-                return false;
-
-            if (!_actionBlocker.CanInteract(player, entity)
-                || !_actionBlocker.CanComplexInteract(player)
-                || !_interaction.InRangeAndAccessible(player, entity))
-                return false;
-
-            // Check if the object is anchored, and whether we are still allowed to rotate it.
-            if (!rotatableComp.RotateWhileAnchored && EntityManager.TryGetComponent(entity, out PhysicsComponent? physics) &&
-                physics.BodyType == BodyType.Static)
-            {
-                _popup.PopupEntity(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
-                return false;
-            }
-
-            Transform(entity).LocalRotation += rotatableComp.Increment;
-            return true;
-        }
-
-        public bool HandleFlipObject(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
-        {
-            if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
-                return false;
-
-            if (!TryComp<FlippableComponent>(entity, out var flippableComp))
-                return false;
-
-            if (!_actionBlocker.CanInteract(player, entity)
-                || !_actionBlocker.CanComplexInteract(player)
-                || !_interaction.InRangeAndAccessible(player, entity))
-                return false;
-
-            // Check if the object is anchored.
-            if (EntityManager.TryGetComponent(entity, out PhysicsComponent? physics) && physics.BodyType == BodyType.Static)
-            {
-                _popup.PopupEntity(Loc.GetString("flippable-component-try-flip-is-stuck"), entity, player);
-                return false;
-            }
-
-            Flip(entity, flippableComp);
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 8c2f1c5852..9521113394 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -10,7 +10,6 @@ using Content.Server.GameTicking;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -21,6 +20,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.Station.Components;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.RoundEnd
@@ -99,11 +99,10 @@ namespace Content.Server.RoundEnd
         /// </summary>
         public EntityUid? GetStation()
         {
-            AllEntityQuery<StationEmergencyShuttleComponent, StationDataComponent>()
-                .MoveNext(out _, out _, out var data);
+            AllEntityQuery<StationEmergencyShuttleComponent, StationDataComponent>().MoveNext(out var uid, out _, out var data);
             if (data == null)
                 return null;
-            var targetGrid = _stationSystem.GetLargestGrid(data);
+            var targetGrid = _stationSystem.GetLargestGrid((uid, data));
             return targetGrid == null ? null : Transform(targetGrid.Value).MapUid;
         }
 
diff --git a/Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs b/Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs
deleted file mode 100644
index f79d33412a..0000000000
--- a/Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Salvage.Expeditions.Structure;
-
-/// <summary>
-/// Mission objective for salvage expeditions.
-/// </summary>
-[RegisterComponent, Access(typeof(SalvageSystem))]
-public sealed partial class SalvageStructureComponent : Component
-{
-
-}
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index a9d8314f57..aa501368de 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -8,8 +8,8 @@ namespace Content.Server.Salvage;
 
 public sealed partial class SalvageSystem
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string CoordinatesDisk = "CoordinatesDisk";
+    public static readonly EntProtoId CoordinatesDisk = "CoordinatesDisk";
+    public static readonly ProtoId<LocalizedDatasetPrototype> PlanetNames = "NamesBorer";
 
     private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleComponent component, ClaimSalvageMessage args)
     {
@@ -28,7 +28,7 @@ public sealed partial class SalvageSystem
         var mission = GetMission(_prototypeManager.Index<SalvageDifficultyPrototype>(missionparams.Difficulty), missionparams.Seed);
         data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
 
-        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index<LocalizedDatasetPrototype>("NamesBorer"), missionparams.Seed));
+        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index(PlanetNames), missionparams.Seed));
         _audio.PlayPvs(component.PrintSound, uid);
 
         UpdateConsoles((station.Value, data));
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index 466678be3d..adc97ac824 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -1,16 +1,13 @@
 using System.Linq;
 using System.Threading;
 using Content.Server.Salvage.Expeditions;
-using Content.Server.Salvage.Expeditions.Structure;
 using Content.Shared.CCVar;
 using Content.Shared.Examine;
-using Content.Shared.Random.Helpers;
 using Content.Shared.Salvage.Expeditions;
-using Robust.Shared.Audio;
+using Content.Shared.Shuttles.Components;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
 using Robust.Shared.GameStates;
-using Robust.Shared.Map;
 
 namespace Content.Server.Salvage;
 
@@ -38,8 +35,6 @@ public sealed partial class SalvageSystem
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentShutdown>(OnExpeditionShutdown);
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentGetState>(OnExpeditionGetState);
 
-        SubscribeLocalEvent<SalvageStructureComponent, ExaminedEvent>(OnStructureExamine);
-
         _cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown);
         Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange);
     }
@@ -76,6 +71,15 @@ public sealed partial class SalvageSystem
     {
         component.Stream = _audio.Stop(component.Stream);
 
+        // First wipe any disks referencing us
+        var disks = AllEntityQuery<ShuttleDestinationCoordinatesComponent>();
+        while (disks.MoveNext(out var disk, out var diskComp)
+               && diskComp.Destination == uid)
+        {
+            diskComp.Destination = null;
+            Dirty(disk, diskComp);
+        }
+
         foreach (var (job, cancelToken) in _salvageJobs.ToArray())
         {
             if (job.Station == component.Station)
@@ -179,9 +183,4 @@ public sealed partial class SalvageSystem
         _salvageJobs.Add((job, cancelToken));
         _salvageQueue.EnqueueJob(job);
     }
-
-    private void OnStructureExamine(EntityUid uid, SalvageStructureComponent component, ExaminedEvent args)
-    {
-        args.PushMarkup(Loc.GetString("salvage-expedition-structure-examine"));
-    }
 }
diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs
index 41d4c2e755..ee5cd792c6 100644
--- a/Content.Server/Salvage/SalvageSystem.Magnet.cs
+++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs
@@ -8,6 +8,7 @@ using Content.Shared.Radio;
 using Content.Shared.Salvage.Magnet;
 using Robust.Shared.Exceptions;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Salvage;
 
@@ -15,8 +16,7 @@ public sealed partial class SalvageSystem
 {
     [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
 
-    [ValidatePrototypeId<RadioChannelPrototype>]
-    private const string MagnetChannel = "Supply";
+    private static readonly ProtoId<RadioChannelPrototype> MagnetChannel = "Supply";
 
     private EntityQuery<SalvageMobRestrictionsComponent> _salvMobQuery;
     private EntityQuery<MobStateComponent> _mobStateQuery;
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 9050db3971..ceee9c3784 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -2,7 +2,6 @@ using System.Numerics;
 using Content.Server.Salvage.Expeditions;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
-using Content.Server.Station.Components;
 using Content.Shared.Chat;
 using Content.Shared.Humanoid;
 using Content.Shared.Mobs.Components;
@@ -10,6 +9,7 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Localizations;
+using Content.Shared.Station.Components;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index cbce4dc692..f212fa4a83 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -11,7 +11,6 @@ using Content.Server.Ghost.Roles.Components;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
 using Content.Server.Salvage.Expeditions;
-using Content.Server.Salvage.Expeditions.Structure;
 using Content.Shared.Atmos;
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.Dataset;
@@ -100,7 +99,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
         destComp.Enabled = true;
         _metaData.SetEntityName(
             mapUid,
-            _entManager.System<SharedSalvageSystem>().GetFTLName(_prototypeManager.Index<LocalizedDatasetPrototype>("NamesBorer"), _missionParams.Seed));
+            _entManager.System<SharedSalvageSystem>().GetFTLName(_prototypeManager.Index(SalvageSystem.PlanetNames), _missionParams.Seed));
         _entManager.AddComponent<FTLBeaconComponent>(mapUid);
 
         // Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
@@ -255,7 +254,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
             }
         }
 
-        var allLoot = _prototypeManager.Index<SalvageLootPrototype>(SharedSalvageSystem.ExpeditionsLootProto);
+        var allLoot = _prototypeManager.Index(SharedSalvageSystem.ExpeditionsLootProto);
         var lootBudget = difficultyProto.LootBudget;
 
         foreach (var rule in allLoot.LootRules)
diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
index 2fcfcd8cbb..8237ccb2eb 100644
--- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
+++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -1,8 +1,6 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.EntitySystems;
-using Content.Server.NodeContainer;
-using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Administration;
 using Content.Shared.NodeContainer;
 using Content.Shared.NodeContainer.NodeGroups;
@@ -11,17 +9,17 @@ using Robust.Shared.Console;
 namespace Content.Server.Sandbox.Commands
 {
     [AnyCommand]
-    public sealed class ColorNetworkCommand : LocalizedCommands
+    public sealed class ColorNetworkCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IAdminManager _adminManager = default!;
+        [Dependency] private readonly AtmosPipeColorSystem _pipeColorSystem = default!;
+        [Dependency] private readonly SandboxSystem _sandboxSystem = default!;
 
         public override string Command => "colornetwork";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var sandboxManager = _entManager.System<SandboxSystem>();
-            var adminManager = IoCManager.Resolve<IAdminManager>();
-            if (shell.IsClient || (!sandboxManager.IsSandboxEnabled && !adminManager.HasAdminFlag(shell.Player!, AdminFlags.Mapping)))
+            if (shell.IsClient || (!_sandboxSystem.IsSandboxEnabled && !_adminManager.HasAdminFlag(shell.Player!, AdminFlags.Mapping)))
             {
                 shell.WriteError(Loc.GetString("cmd-colornetwork-no-access"));
             }
@@ -40,13 +38,13 @@ namespace Content.Server.Sandbox.Commands
 
             var nent = new NetEntity(targetId);
 
-            if (!_entManager.TryGetEntity(nent, out var eUid))
+            if (!EntityManager.TryGetEntity(nent, out var eUid))
             {
                 shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
                 return;
             }
 
-            if (!_entManager.TryGetComponent(eUid, out NodeContainerComponent? nodeContainerComponent))
+            if (!EntityManager.TryGetComponent(eUid, out NodeContainerComponent? nodeContainerComponent))
             {
                 shell.WriteLine(Loc.GetString("shell-entity-is-not-node-container"));
                 return;
@@ -77,10 +75,10 @@ namespace Content.Server.Sandbox.Commands
 
             foreach (var x in group.Nodes)
             {
-                if (!_entManager.TryGetComponent(x.Owner, out AtmosPipeColorComponent? atmosPipeColorComponent))
+                if (!EntityManager.TryGetComponent(x.Owner, out AtmosPipeColorComponent? atmosPipeColorComponent))
                     continue;
 
-                _entManager.System<AtmosPipeColorSystem>().SetColor(x.Owner, atmosPipeColorComponent, color);
+                _pipeColorSystem.SetColor(x.Owner, atmosPipeColorComponent, color);
             }
         }
     }
diff --git a/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs b/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs
index 3c881dcbb5..4750cd77c1 100644
--- a/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs
+++ b/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs
@@ -9,24 +9,17 @@ namespace Content.Server.Shuttles.Commands;
 /// Delays the round from ending via the shuttle call. Can still be ended via other means.
 /// </summary>
 [AdminCommand(AdminFlags.Fun)]
-public sealed class DelayRoundEndCommand : IConsoleCommand
+public sealed class DelayRoundEndCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _sysManager = default!;
+    [Dependency] private readonly EmergencyShuttleSystem _shuttleSystem = default!;
 
-    public string Command => "delayroundend";
-    public string Description => Loc.GetString("emergency-shuttle-command-round-desc");
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "delayroundend";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var system = _sysManager.GetEntitySystem<EmergencyShuttleSystem>();
-
-        if (system.DelayEmergencyRoundEnd())
-        {
+        if (_shuttleSystem.DelayEmergencyRoundEnd())
             shell.WriteLine(Loc.GetString("emergency-shuttle-command-round-yes"));
-        }
         else
-        {
             shell.WriteLine(Loc.GetString("emergency-shuttle-command-round-no"));
-        }
     }
 }
diff --git a/Content.Server/Shuttles/Commands/DockCommand.cs b/Content.Server/Shuttles/Commands/DockCommand.cs
index 62634af2bc..14042cd953 100644
--- a/Content.Server/Shuttles/Commands/DockCommand.cs
+++ b/Content.Server/Shuttles/Commands/DockCommand.cs
@@ -7,70 +7,61 @@ using Robust.Shared.Console;
 namespace Content.Server.Shuttles.Commands;
 
 [AdminCommand(AdminFlags.Mapping)]
-public sealed class DockCommand : IConsoleCommand
+public sealed class DockCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly DockingSystem _dockSystem = default!;
 
-    public string Command => "dock";
-    public string Description => Loc.GetString("cmd-dock-desc");
-    public string Help => Loc.GetString("cmd-dock-help");
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "dock";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 2)
         {
-            shell.WriteError(Loc.GetString("cmd-dock-args"));
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)));
             return;
         }
 
-        if (!NetEntity.TryParse(args[0], out var airlock1Net) || !_entManager.TryGetEntity(airlock1Net, out var airlock1))
+        if (!NetEntity.TryParse(args[0], out var airlock1Net) || !EntityManager.TryGetEntity(airlock1Net, out var airlock1))
         {
-            shell.WriteError(Loc.GetString("cmd-dock-invalid", ("entity", args[0])));
+            shell.WriteError(Loc.GetString("shell-invalid-entity-uid", ("uid", args[0])));
             return;
         }
 
-        if (!NetEntity.TryParse(args[1], out var airlock2Net) || !_entManager.TryGetEntity(airlock2Net, out var airlock2))
+        if (!NetEntity.TryParse(args[1], out var airlock2Net) || !EntityManager.TryGetEntity(airlock2Net, out var airlock2))
         {
-            shell.WriteError(Loc.GetString("cmd-dock-invalid", ("entity", args[1])));
+            shell.WriteError(Loc.GetString("shell-invalid-entity-uid", ("uid", args[1])));
             return;
         }
 
-        if (!_entManager.TryGetComponent(airlock1, out DockingComponent? dock1))
+        if (!EntityManager.TryGetComponent(airlock1, out DockingComponent? dock1))
         {
-            shell.WriteError(Loc.GetString("cmd-dock-found", ("airlock", airlock1)));
+            shell.WriteError(Loc.GetString("shell-entity-with-uid-lacks-component", ("uid", args[0]), ("componentName", nameof(DockingComponent))));
             return;
         }
 
-        if (!_entManager.TryGetComponent(airlock2, out DockingComponent? dock2))
+        if (!EntityManager.TryGetComponent(airlock2, out DockingComponent? dock2))
         {
-            shell.WriteError(Loc.GetString("cmd-dock-found", ("airlock", airlock2)));
+            shell.WriteError(Loc.GetString("shell-entity-with-uid-lacks-component", ("uid", args[1]), ("componentName", nameof(DockingComponent))));
             return;
         }
 
-        var dockSystem = _entManager.System<DockingSystem>();
-        dockSystem.Dock((airlock1.Value, dock1), (airlock2.Value, dock2));
+        _dockSystem.Dock((airlock1.Value, dock1), (airlock2.Value, dock2));
 
         if (dock1.DockedWith == airlock2)
-        {
             shell.WriteLine(Loc.GetString("cmd-dock-success"));
-        }
         else
-        {
             shell.WriteError(Loc.GetString("cmd-dock-fail"));
-        }
     }
 
-    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
-        if (args.Length == 1)
+        return args.Length switch
         {
-            return CompletionResult.FromOptions(CompletionHelper.Components<DockingComponent>(args[0], _entManager));
-        }
-
-        if (args.Length == 2)
-        {
-            return CompletionResult.FromOptions(CompletionHelper.Components<DockingComponent>(args[1], _entManager));
-        }
-
-        return CompletionResult.Empty;
+            1 => CompletionResult.FromOptions(CompletionHelper.Components<DockingComponent>(args[0], EntityManager)),
+            2 => CompletionResult.FromOptions(CompletionHelper.Components<DockingComponent>(args[1], EntityManager)),
+            _ => CompletionResult.Empty,
+        };
     }
 }
diff --git a/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs b/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs
index f219602bcb..b95cecc894 100644
--- a/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs
+++ b/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs
@@ -9,16 +9,14 @@ namespace Content.Server.Shuttles.Commands;
 /// Calls in the emergency shuttle.
 /// </summary>
 [AdminCommand(AdminFlags.Fun)]
-public sealed class DockEmergencyShuttleCommand : IConsoleCommand
+public sealed class DockEmergencyShuttleCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _sysManager = default!;
+    [Dependency] private readonly EmergencyShuttleSystem _shuttleSystem = default!;
 
-    public string Command => "dockemergencyshuttle";
-    public string Description => Loc.GetString("emergency-shuttle-command-dock-desc");
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "dockemergencyshuttle";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var system = _sysManager.GetEntitySystem<EmergencyShuttleSystem>();
-        system.DockEmergencyShuttle();
+        _shuttleSystem.DockEmergencyShuttle();
     }
 }
diff --git a/Content.Server/Shuttles/Commands/FTLDiskCommand.cs b/Content.Server/Shuttles/Commands/FTLDiskCommand.cs
index 014dbe6d99..5d7c108e5d 100644
--- a/Content.Server/Shuttles/Commands/FTLDiskCommand.cs
+++ b/Content.Server/Shuttles/Commands/FTLDiskCommand.cs
@@ -25,11 +25,8 @@ public sealed class FTLDiskCommand : LocalizedCommands
 
     public override string Command => "ftldisk";
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string CoordinatesDisk = "CoordinatesDisk";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string DiskCase = "DiskCase";
+    public static readonly EntProtoId CoordinatesDisk = "CoordinatesDisk";
+    public static readonly EntProtoId DiskCase = "DiskCase";
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length == 0)
@@ -152,7 +149,7 @@ public sealed class FTLDiskCommand : LocalizedCommands
 
                 if (_entManager.TryGetComponent<StorageComponent>(cdCaseUid, out var storage) && storageSystem.Insert(cdCaseUid, cdUid, out _, storageComp: storage, playSound: false))
                 {
-                    if (_entManager.TryGetComponent<HandsComponent>(entity, out var handsComponent) && handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent))
+                    if (_entManager.TryGetComponent<HandsComponent>(entity, out var handsComponent) && handsSystem.TryGetEmptyHand((entity, handsComponent), out var emptyHand))
                     {
                         handsSystem.TryPickup(entity, cdCaseUid, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
                     }
@@ -161,7 +158,7 @@ public sealed class FTLDiskCommand : LocalizedCommands
                 {
                     _entManager.DeleteEntity(cdCaseUid); // something went wrong so just yeet the chaf
 
-                    if (_entManager.TryGetComponent<HandsComponent>(entity, out var handsComponent) && handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent))
+                    if (_entManager.TryGetComponent<HandsComponent>(entity, out var handsComponent) && handsSystem.TryGetEmptyHand((entity, handsComponent), out var emptyHand))
                     {
                         handsSystem.TryPickup(entity, cdUid, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
                     }
diff --git a/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs b/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs
index b9dd9c20e9..7f129e6d20 100644
--- a/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs
+++ b/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs
@@ -9,16 +9,14 @@ namespace Content.Server.Shuttles.Commands;
 /// Early launches in the emergency shuttle.
 /// </summary>
 [AdminCommand(AdminFlags.Fun)]
-public sealed class LaunchEmergencyShuttleCommand : IConsoleCommand
+public sealed class LaunchEmergencyShuttleCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _sysManager = default!;
+    [Dependency] private readonly EmergencyShuttleSystem _shuttleSystem = default!;
 
-    public string Command => "launchemergencyshuttle";
-    public string Description => Loc.GetString("emergency-shuttle-command-launch-desc");
-    public string Help => $"{Command}";
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override string Command => "launchemergencyshuttle";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var system = _sysManager.GetEntitySystem<EmergencyShuttleSystem>();
-        system.EarlyLaunch();
+        _shuttleSystem.EarlyLaunch();
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 06fd7c66ca..1292754af3 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -12,7 +12,6 @@ using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Spawners.Components;
 using Content.Server.Spawners.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Server.Station.Systems;
 using Content.Shared._Sunrise.UnbuildableGrid;
@@ -229,7 +228,7 @@ public sealed class ArrivalsSystem : EntitySystem
 
             if (component.FirstRun)
             {
-                var station = _station.GetLargestGrid(Comp<StationDataComponent>(component.Station));
+                var station = _station.GetLargestGrid(component.Station);
                 sourceMap = station == null ? null : Transform(station.Value)?.MapUid;
                 arrivalsDelay += RoundStartFTLDuration;
                 component.FirstRun = false;
@@ -464,7 +463,7 @@ public sealed class ArrivalsSystem : EntitySystem
         {
             while (query.MoveNext(out var uid, out var comp, out var shuttle, out var xform))
             {
-                if (comp.NextTransfer > curTime || !TryComp<StationDataComponent>(comp.Station, out var data))
+                if (comp.NextTransfer > curTime)
                     continue;
 
                 var tripTime = _shuttles.DefaultTravelTime + _shuttles.DefaultStartupTime;
@@ -480,7 +479,7 @@ public sealed class ArrivalsSystem : EntitySystem
                 // Go to station
                 else
                 {
-                    var targetGrid = _station.GetLargestGrid(data);
+                    var targetGrid = _station.GetLargestGrid(comp.Station);
 
                     if (targetGrid != null)
                         _shuttles.FTLToDock(uid, shuttle, targetGrid.Value, priorityTag: "DockArrivals", ignored: true, deletedTrash: true); // Sunrise-Edit
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index 18f1968a93..76c0032dca 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -129,7 +129,7 @@ namespace Content.Server.Shuttles.Systems
         private void OnShutdown(EntityUid uid, DockingComponent component, ComponentShutdown args)
         {
             if (component.DockedWith == null ||
-                EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage > EntityLifeStage.MapInitialized)
+                Comp<MetaDataComponent>(uid).EntityLifeStage > EntityLifeStage.MapInitialized)
             {
                 return;
             }
@@ -172,8 +172,8 @@ namespace Content.Server.Shuttles.Systems
             dockA.DockJointId = null;
 
             // If these grids are ever null then need to look at fixing ordering for unanchored events elsewhere.
-            var gridAUid = EntityManager.GetComponent<TransformComponent>(dockAUid).GridUid;
-            var gridBUid = EntityManager.GetComponent<TransformComponent>(dockBUid.Value).GridUid;
+            var gridAUid = Comp<TransformComponent>(dockAUid).GridUid;
+            var gridBUid = Comp<TransformComponent>(dockBUid.Value).GridUid;
 
             var msg = new UndockEvent
             {
@@ -194,7 +194,7 @@ namespace Content.Server.Shuttles.Systems
             var component = entity.Comp;
 
             // Use startup so transform already initialized
-            if (!EntityManager.GetComponent<TransformComponent>(uid).Anchored)
+            if (!Comp<TransformComponent>(uid).Anchored)
                 return;
 
             // This little gem is for docking deserialization
@@ -204,7 +204,7 @@ namespace Content.Server.Shuttles.Systems
                 if (MetaData(component.DockedWith.Value).EntityLifeStage < EntityLifeStage.Initialized)
                     return;
 
-                var otherDock = EntityManager.GetComponent<DockingComponent>(component.DockedWith.Value);
+                var otherDock = Comp<DockingComponent>(component.DockedWith.Value);
                 DebugTools.Assert(otherDock.DockedWith != null);
 
                 Dock((uid, component), (component.DockedWith.Value, otherDock));
@@ -265,8 +265,8 @@ namespace Content.Server.Shuttles.Systems
             // https://gamedev.stackexchange.com/questions/98772/b2distancejoint-with-frequency-equal-to-0-vs-b2weldjoint
 
             // We could also potentially use a prismatic joint? Depending if we want clamps that can extend or whatever
-            var dockAXform = EntityManager.GetComponent<TransformComponent>(dockAUid);
-            var dockBXform = EntityManager.GetComponent<TransformComponent>(dockBUid);
+            var dockAXform = Comp<TransformComponent>(dockAUid);
+            var dockBXform = Comp<TransformComponent>(dockBUid);
 
             DebugTools.Assert(dockAXform.GridUid != null);
             DebugTools.Assert(dockBXform.GridUid != null);
@@ -280,8 +280,8 @@ namespace Content.Server.Shuttles.Systems
                 SharedJointSystem.LinearStiffness(
                     2f,
                     0.7f,
-                    EntityManager.GetComponent<PhysicsComponent>(gridA).Mass,
-                    EntityManager.GetComponent<PhysicsComponent>(gridB).Mass,
+                    Comp<PhysicsComponent>(gridA).Mass,
+                    Comp<PhysicsComponent>(gridB).Mass,
                     out var stiffness,
                     out var damping);
 
@@ -300,8 +300,8 @@ namespace Content.Server.Shuttles.Systems
                     joint = _jointSystem.GetOrCreateWeldJoint(gridA, gridB, DockingJoint + dockAUid);
                 }
 
-                var gridAXform = EntityManager.GetComponent<TransformComponent>(gridA);
-                var gridBXform = EntityManager.GetComponent<TransformComponent>(gridB);
+                var gridAXform = Comp<TransformComponent>(gridA);
+                var gridBXform = Comp<TransformComponent>(gridB);
 
                 var anchorA = dockAXform.LocalPosition + dockAXform.LocalRotation.ToWorldVec() / 2f;
                 var anchorB = dockBXform.LocalPosition + dockBXform.LocalRotation.ToWorldVec() / 2f;
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index cc4ecf31fc..f4515fa2b9 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -9,6 +9,7 @@ using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Emag.Systems;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Popups;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
@@ -16,7 +17,7 @@ using Content.Shared.Shuttles.Systems;
 using Content.Shared.UserInterface;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
-using Content.Shared.DeviceNetwork.Components;
+using Robust.Shared.Prototypes;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Shuttles.Systems;
@@ -72,8 +73,7 @@ public sealed partial class EmergencyShuttleSystem
 
     private CancellationTokenSource? _roundEndCancelToken;
 
-    [ValidatePrototypeId<AccessLevelPrototype>]
-    private const string EmergencyRepealAllAccess = "EmergencyShuttleRepealAll";
+    private static readonly ProtoId<AccessLevelPrototype> EmergencyRepealAllAccess = "EmergencyShuttleRepealAll";
     private static readonly Color DangerColor = Color.Red;
 
     /// <summary>
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index 9dafe8e691..a3c86b12e6 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -19,7 +19,6 @@ using Content.Server.RoundEnd;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
-using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Server.Station.Systems;
 using Content.Shared._Sunrise.AlwaysPoweredMap;
@@ -31,6 +30,7 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.GameTicking;
@@ -104,8 +104,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
 
     private bool _emergencyShuttleEnabled;
 
-    [ValidatePrototypeId<TagPrototype>]
-    private const string DockTag = "DockEmergency";
+    private static readonly ProtoId<TagPrototype> DockTag = "DockEmergency";
 
     public override void Initialize()
     {
@@ -220,7 +219,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
             return;
         }
 
-        var targetGrid = _station.GetLargestGrid(Comp<StationDataComponent>(station.Value));
+        var targetGrid = _station.GetLargestGrid(station.Value);
         if (targetGrid == null)
             return;
 
@@ -314,8 +313,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
             return null;
         }
 
-        var targetGrid = _station.GetLargestGrid(Comp<StationDataComponent>(stationUid));
-        var announcementSound = new SoundPathSpecifier("/Audio/Misc/notice1.ogg");
+        var targetGrid = _station.GetLargestGrid(stationUid);
 
         // Sunrise-start
         DockTime = _timing.CurTime;
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 3f090318f0..74ae23199e 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -327,7 +327,7 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
 
     public void AddPilot(EntityUid uid, EntityUid entity, ShuttleConsoleComponent component)
     {
-        if (!EntityManager.TryGetComponent(entity, out PilotComponent? pilotComponent)
+        if (!TryComp(entity, out PilotComponent? pilotComponent)
         || component.SubscribedPilots.Contains(entity))
         {
             return;
@@ -341,7 +341,7 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
 
         pilotComponent.Console = uid;
         ActionBlockerSystem.UpdateCanMove(entity);
-        pilotComponent.Position = EntityManager.GetComponent<TransformComponent>(entity).Coordinates;
+        pilotComponent.Position = Comp<TransformComponent>(entity).Coordinates;
         Dirty(entity, pilotComponent);
     }
 
@@ -364,12 +364,12 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
         _popup.PopupEntity(Loc.GetString("shuttle-pilot-end"), pilotUid, pilotUid);
 
         if (pilotComponent.LifeStage < ComponentLifeStage.Stopping)
-            EntityManager.RemoveComponent<PilotComponent>(pilotUid);
+            RemComp<PilotComponent>(pilotUid);
     }
 
     public void RemovePilot(EntityUid entity)
     {
-        if (!EntityManager.TryGetComponent(entity, out PilotComponent? pilotComponent))
+        if (!TryComp(entity, out PilotComponent? pilotComponent))
             return;
 
         RemovePilot(entity, pilotComponent);
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index bab8dcd237..b067a7c292 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -641,10 +641,7 @@ public sealed partial class ShuttleSystem
         {
             foreach (var child in toKnock)
             {
-                if (!_statusQuery.TryGetComponent(child, out var status))
-                    continue;
-
-                _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
+                _stuns.TryUpdateParalyzeDuration(child, _hyperspaceKnockdownTime);
 
                 // Sunrise-Start
                 if (_physicsQuery.TryGetComponent(child, out var physics))
@@ -725,7 +722,7 @@ public sealed partial class ShuttleSystem
         // only toss if its on lattice/space
         var tile = _mapSystem.GetTileRef(shuttleEntity, shuttleGrid, childXform.Coordinates);
 
-        if (!tile.IsSpace(_tileDefManager))
+        if (!_turf.IsSpace(tile))
             return;
 
         var throwDirection = childXform.LocalPosition - shuttleBody.LocalCenter;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index a794ee0104..2e6ebe396c 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -1,9 +1,7 @@
 using System.Numerics;
 using Content.Server.Shuttles.Components;
-using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
-using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Station.Components;
 using Robust.Shared.Collections;
@@ -62,10 +60,7 @@ public sealed partial class ShuttleSystem
         if (!_cfg.GetCVar(CCVars.GridFill))
             return;
 
-        if (!TryComp(uid, out StationDataComponent? dataComp))
-            return;
-
-        var targetGrid = _station.GetLargestGrid(dataComp);
+        var targetGrid = _station.GetLargestGrid(uid);
 
         if (targetGrid == null)
             return;
@@ -165,12 +160,7 @@ public sealed partial class ShuttleSystem
         if (!_cfg.GetCVar(CCVars.GridFill))
             return;
 
-        if (!TryComp<StationDataComponent>(uid, out var data))
-        {
-            return;
-        }
-
-        var targetGrid = _station.GetLargestGrid(data);
+        var targetGrid = _station.GetLargestGrid(uid);
 
         if (targetGrid == null)
             return;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index f165990f1c..e78a17e180 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -249,7 +249,7 @@ public sealed partial class ShuttleSystem
 
             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
@@ -275,7 +275,7 @@ public sealed partial class ShuttleSystem
 
         foreach (var tileRef in _mapSystem.GetLocalTilesIntersecting(uid, grid, new Circle(centerTile, radius)))
         {
-            var def = (ContentTileDefinition)_tileDefManager[tileRef.Tile.TypeId];
+            var def = _turf.GetContentTileDefinition(tileRef);
             mass += def.Mass;
             tileCount++;
 
@@ -402,7 +402,7 @@ public sealed partial class ShuttleSystem
                 continue;
 
             // Mark tiles for breaking/effects
-            var def = (ContentTileDefinition)_tileDefManager[_mapSystem.GetTileRef(uid, grid, tileData.Tile).Tile.TypeId];
+            var def = _turf.GetContentTileDefinition(_mapSystem.GetTileRef(uid, grid, tileData.Tile));
             if (tileData.Energy > def.Mass * _tileBreakEnergyMultiplier)
                 brokenTiles.Add((tileData.Tile, Tile.Empty));
 
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 71d51e3187..cea7fbfc09 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -28,6 +28,7 @@ using Robust.Shared.Physics.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Content.Shared.Maps;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -40,7 +41,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
     [Dependency] private readonly BiomeSystem _biomes = default!;
     [Dependency] private readonly BodySystem _bobby = default!;
     [Dependency] private readonly BuckleSystem _buckle = default!;
@@ -62,6 +62,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     private EntityQuery<BuckleComponent> _buckleQuery;
     private EntityQuery<MapGridComponent> _gridQuery;
@@ -108,12 +109,12 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
 
     private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args)
     {
-        if (!EntityManager.HasComponent<MapGridComponent>(uid))
+        if (!HasComp<MapGridComponent>(uid))
         {
             return;
         }
 
-        if (!EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
+        if (!TryComp(uid, out PhysicsComponent? physicsComponent))
         {
             return;
         }
@@ -128,7 +129,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
 
     public void Toggle(EntityUid uid, ShuttleComponent component)
     {
-        if (!EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
+        if (!TryComp(uid, out PhysicsComponent? physicsComponent))
             return;
 
         component.Enabled = !component.Enabled;
@@ -166,7 +167,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     private void OnShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args)
     {
         // None of the below is necessary for any cleanup if we're just deleting.
-        if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating)
+        if (Comp<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating)
             return;
 
         Disable(uid);
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 42c249c9ab..f7f0a8b251 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -26,13 +26,13 @@ namespace Content.Server.Shuttles.Systems;
 public sealed class ThrusterSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly AmbientSoundSystem _ambient = default!;
     [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     // Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement.
     // This is done for each direction available.
@@ -68,7 +68,7 @@ public sealed class ThrusterSystem : EntitySystem
             args.PushMarkup(enabled);
 
             if (component.Type == ThrusterType.Linear &&
-                EntityManager.TryGetComponent(uid, out TransformComponent? xform) &&
+                TryComp(uid, out TransformComponent? xform) &&
                 xform.Anchored)
             {
                 var nozzleLocalization = ContentLocalizationManager.FormatDirection(xform.LocalRotation.Opposite().ToWorldVec().GetDir()).ToLower();
@@ -97,7 +97,7 @@ public sealed class ThrusterSystem : EntitySystem
         foreach (var change in args.Changes)
         {
             // If the old tile was space but the new one isn't then disable all adjacent thrusters
-            if (change.NewTile.IsSpace(_tileDefManager) || !change.OldTile.IsSpace(_tileDefManager))
+            if (_turf.IsSpace(change.NewTile) || !_turf.IsSpace(change.OldTile))
                 continue;
 
             var tilePos = change.GridIndices;
@@ -163,8 +163,8 @@ public sealed class ThrusterSystem : EntitySystem
         // TODO: Don't make them rotatable and make it require anchoring.
 
         if (!component.Enabled ||
-            !EntityManager.TryGetComponent(uid, out TransformComponent? xform) ||
-            !EntityManager.TryGetComponent(xform.GridUid, out ShuttleComponent? shuttleComponent))
+            !TryComp(uid, out TransformComponent? xform) ||
+            !TryComp(xform.GridUid, out ShuttleComponent? shuttleComponent))
         {
             return;
         }
@@ -285,7 +285,7 @@ public sealed class ThrusterSystem : EntitySystem
 
         component.IsOn = true;
 
-        if (!EntityManager.TryGetComponent(xform.GridUid, out ShuttleComponent? shuttleComponent))
+        if (!TryComp(xform.GridUid, out ShuttleComponent? shuttleComponent))
             return;
 
         // Logger.DebugS("thruster", $"Enabled thruster {uid}");
@@ -300,7 +300,7 @@ public sealed class ThrusterSystem : EntitySystem
                 shuttleComponent.LinearThrusters[direction].Add(uid);
 
                 // Don't just add / remove the fixture whenever the thruster fires because perf
-                if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent) &&
+                if (TryComp(uid, out PhysicsComponent? physicsComponent) &&
                     component.BurnPoly.Count > 0)
                 {
                     var shape = new PolygonShape();
@@ -318,7 +318,7 @@ public sealed class ThrusterSystem : EntitySystem
                 throw new ArgumentOutOfRangeException();
         }
 
-        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+        if (TryComp(uid, out AppearanceComponent? appearance))
         {
             _appearance.SetData(uid, ThrusterVisualState.State, true, appearance);
         }
@@ -382,7 +382,7 @@ public sealed class ThrusterSystem : EntitySystem
 
         component.IsOn = false;
 
-        if (!EntityManager.TryGetComponent(gridId, out ShuttleComponent? shuttleComponent))
+        if (!TryComp(gridId, out ShuttleComponent? shuttleComponent))
             return;
 
         // Logger.DebugS("thruster", $"Disabled thruster {uid}");
@@ -406,7 +406,7 @@ public sealed class ThrusterSystem : EntitySystem
                 throw new ArgumentOutOfRangeException();
         }
 
-        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+        if (TryComp(uid, out AppearanceComponent? appearance))
         {
             _appearance.SetData(uid, ThrusterVisualState.State, false, appearance);
         }
@@ -418,7 +418,7 @@ public sealed class ThrusterSystem : EntitySystem
 
         _ambient.SetAmbience(uid, false);
 
-        if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
+        if (TryComp(uid, out PhysicsComponent? physicsComponent))
         {
             _fixtureSystem.DestroyFixture(uid, BurnFixture, body: physicsComponent);
         }
@@ -457,7 +457,7 @@ public sealed class ThrusterSystem : EntitySystem
         var mapGrid = Comp<MapGridComponent>(xform.GridUid.Value);
         var tile = _mapSystem.GetTileRef(xform.GridUid.Value, mapGrid, new Vector2i((int)Math.Floor(x), (int)Math.Floor(y)));
 
-        return tile.Tile.IsSpace();
+        return _turf.IsSpace(tile);
     }
 
     #region Burning
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index 784c2f8fbb..07fb1cb30b 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -199,7 +199,7 @@ public sealed partial class BorgSystem
             else
             {
                 item = component.ProvidedContainer.ContainedEntities
-                    .FirstOrDefault(ent => Prototype(ent)?.ID == itemProto);
+                    .FirstOrDefault(ent => Prototype(ent)?.ID == itemProto.Id);
                 if (!item.IsValid())
                 {
                     Log.Debug($"no items found: {component.ProvidedContainer.ContainedEntities.Count}");
@@ -217,8 +217,8 @@ public sealed partial class BorgSystem
 
             var handId = $"{uid}-item{component.HandCounter}";
             component.HandCounter++;
-            _hands.AddHand(chassis, handId, HandLocation.Middle, hands);
-            _hands.DoPickup(chassis, hands.Hands[handId], item, hands);
+            _hands.AddHand((chassis, hands), handId, HandLocation.Middle);
+            _hands.DoPickup(chassis, handId, item, hands);
             EnsureComp<UnremoveableComponent>(item);
             component.ProvidedItems.Add(handId, item);
         }
@@ -239,7 +239,7 @@ public sealed partial class BorgSystem
             foreach (var (hand, item) in component.ProvidedItems)
             {
                 QueueDel(item);
-                _hands.RemoveHand(chassis, hand, hands);
+                _hands.RemoveHand(chassis, hand);
             }
             component.ProvidedItems.Clear();
             return;
@@ -252,7 +252,7 @@ public sealed partial class BorgSystem
                 RemComp<UnremoveableComponent>(item);
                 _container.Insert(item, component.ProvidedContainer);
             }
-            _hands.RemoveHand(chassis, handId, hands);
+            _hands.RemoveHand(chassis, handId);
         }
         component.ProvidedItems.Clear();
     }
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index a70183da87..96df55f5d1 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -129,7 +129,7 @@ public sealed partial class BorgSystem
 
         var message = Loc.GetString(ent.Comp.DestroyingPopup, ("name", Name(ent)));
         Popup.PopupEntity(message, ent);
-        _trigger.StartTimer(ent.Owner, user: null);
+        _trigger.ActivateTimerTrigger(ent.Owner);
 
         // prevent a shitter borg running into people
         RemComp<InputMoverComponent>(ent);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 3957e02d2d..f33b71c54e 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -1,13 +1,13 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Server.Actions;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
-using Content.Server.Body.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Hands.Systems;
 using Content.Server.PowerCell;
 using Content.Shared.Alert;
-using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Body.Events;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -24,16 +24,16 @@ using Content.Shared.Roles;
 using Content.Shared.Silicons.Borgs;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Trigger.Systems;
 using Content.Shared.Whitelist;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 
 namespace Content.Server.Silicons.Borgs;
 
@@ -62,8 +62,7 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
 
-    [ValidatePrototypeId<JobPrototype>]
-    public const string BorgJobId = "Borg";
+    public static readonly ProtoId<JobPrototype> BorgJobId = "Borg";
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs
index 7b848a0ea6..249813edc1 100644
--- a/Content.Server/Silicons/Laws/IonStormSystem.cs
+++ b/Content.Server/Silicons/Laws/IonStormSystem.cs
@@ -22,42 +22,24 @@ public sealed class IonStormSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
 
     // funny
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Threats = "IonStormThreats";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Objects = "IonStormObjects";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Crew = "IonStormCrew";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Adjectives = "IonStormAdjectives";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Verbs = "IonStormVerbs";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string NumberBase = "IonStormNumberBase";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string NumberMod = "IonStormNumberMod";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Areas = "IonStormAreas";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Feelings = "IonStormFeelings";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string FeelingsPlural = "IonStormFeelingsPlural";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Musts = "IonStormMusts";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Requires = "IonStormRequires";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Actions = "IonStormActions";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Allergies = "IonStormAllergies";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string AllergySeverities = "IonStormAllergySeverities";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Concepts = "IonStormConcepts";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Drinks = "IonStormDrinks";
-    [ValidatePrototypeId<DatasetPrototype>]
-    private const string Foods = "IonStormFoods";
+    private static readonly ProtoId<DatasetPrototype> Threats = "IonStormThreats";
+    private static readonly ProtoId<DatasetPrototype> Objects = "IonStormObjects";
+    private static readonly ProtoId<DatasetPrototype> Crew = "IonStormCrew";
+    private static readonly ProtoId<DatasetPrototype> Adjectives = "IonStormAdjectives";
+    private static readonly ProtoId<DatasetPrototype> Verbs = "IonStormVerbs";
+    private static readonly ProtoId<DatasetPrototype> NumberBase = "IonStormNumberBase";
+    private static readonly ProtoId<DatasetPrototype> NumberMod = "IonStormNumberMod";
+    private static readonly ProtoId<DatasetPrototype> Areas = "IonStormAreas";
+    private static readonly ProtoId<DatasetPrototype> Feelings = "IonStormFeelings";
+    private static readonly ProtoId<DatasetPrototype> FeelingsPlural = "IonStormFeelingsPlural";
+    private static readonly ProtoId<DatasetPrototype> Musts = "IonStormMusts";
+    private static readonly ProtoId<DatasetPrototype> Requires = "IonStormRequires";
+    private static readonly ProtoId<DatasetPrototype> Actions = "IonStormActions";
+    private static readonly ProtoId<DatasetPrototype> Allergies = "IonStormAllergies";
+    private static readonly ProtoId<DatasetPrototype> AllergySeverities = "IonStormAllergySeverities";
+    private static readonly ProtoId<DatasetPrototype> Concepts = "IonStormConcepts";
+    private static readonly ProtoId<DatasetPrototype> Drinks = "IonStormDrinks";
+    private static readonly ProtoId<DatasetPrototype> Foods = "IonStormFoods";
 
     /// <summary>
     /// Randomly alters the laws of an individual silicon.
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index 4460c82246..d9959b4161 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -279,7 +279,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
         };
         foreach (var law in proto.Laws)
         {
-            laws.Laws.Add(_prototype.Index<SiliconLawPrototype>(law));
+            laws.Laws.Add(_prototype.Index<SiliconLawPrototype>(law).ShallowClone());
         }
         laws.ObeysTo = proto.ObeysTo;
 
diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
index baec24bf73..45b3dda431 100644
--- a/Content.Server/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -1,33 +1,32 @@
-using System.Linq;
-using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
-using Content.Shared.Chat;
-using Content.Shared.Mind;
-using Content.Shared.Roles;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.StationAi;
-using Robust.Shared.Audio;
+using Content.Shared.Turrets;
+using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using static Content.Server.Chat.Systems.ChatSystem;
 
 namespace Content.Server.Silicons.StationAi;
 
 public sealed class StationAiSystem : SharedStationAiSystem
 {
-    [Dependency] private readonly IChatManager _chats = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedTransformSystem _xforms = default!;
-    [Dependency] private readonly SharedMindSystem _mind = default!;
-    [Dependency] private readonly SharedRoleSystem _roles = default!;
 
-    private readonly HashSet<Entity<StationAiCoreComponent>> _ais = new();
+    private readonly HashSet<Entity<StationAiCoreComponent>> _stationAiCores = new();
+    private readonly ProtoId<ChatNotificationPrototype> _turretIsAttackingChatNotificationPrototype = "TurretIsAttacking";
+    private readonly ProtoId<ChatNotificationPrototype> _aiWireSnippedChatNotificationPrototype = "AiWireSnipped";
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<ExpandICChatRecipientsEvent>(OnExpandICChatRecipients);
+        SubscribeLocalEvent<StationAiTurretComponent, AmmoShotEvent>(OnAmmoShot);
     }
 
     private void OnExpandICChatRecipients(ExpandICChatRecipientsEvent ev)
@@ -37,7 +36,7 @@ public sealed class StationAiSystem : SharedStationAiSystem
         var sourcePos = _xforms.GetWorldPosition(sourceXform, xformQuery);
 
         // This function ensures that chat popups appear on camera views that have connected microphones.
-        var query = EntityManager.EntityQueryEnumerator<StationAiCoreComponent, TransformComponent>();
+        var query = EntityQueryEnumerator<StationAiCoreComponent, TransformComponent>();
         while (query.MoveNext(out var ent, out var entStationAiCore, out var entXform))
         {
             var stationAiCore = new Entity<StationAiCoreComponent?>(ent, entStationAiCore);
@@ -61,15 +60,33 @@ public sealed class StationAiSystem : SharedStationAiSystem
         }
     }
 
+    private void OnAmmoShot(Entity<StationAiTurretComponent> ent, ref AmmoShotEvent args)
+    {
+        var xform = Transform(ent);
+
+        if (!TryComp(xform.GridUid, out MapGridComponent? grid))
+            return;
+
+        var ais = GetStationAIs(xform.GridUid.Value);
+
+        foreach (var ai in ais)
+        {
+            var ev = new ChatNotificationEvent(_turretIsAttackingChatNotificationPrototype, ent);
+
+            if (TryComp<DeviceNetworkComponent>(ent, out var deviceNetwork))
+                ev.SourceNameOverride = Loc.GetString("station-ai-turret-component-name", ("name", Name(ent)), ("address", deviceNetwork.Address));
+
+            RaiseLocalEvent(ai, ref ev);
+        }
+    }
+
     public override bool SetVisionEnabled(Entity<StationAiVisionComponent> entity, bool enabled, bool announce = false)
     {
         if (!base.SetVisionEnabled(entity, enabled, announce))
             return false;
 
         if (announce)
-        {
             AnnounceSnip(entity.Owner);
-        }
 
         return true;
     }
@@ -80,54 +97,59 @@ public sealed class StationAiSystem : SharedStationAiSystem
             return false;
 
         if (announce)
-        {
             AnnounceSnip(entity.Owner);
-        }
 
         return true;
     }
 
-    public override void AnnounceIntellicardUsage(EntityUid uid, SoundSpecifier? cue = null)
+    private void AnnounceSnip(EntityUid uid)
     {
-        if (!TryComp<ActorComponent>(uid, out var actor))
-            return;
-
-        var msg = Loc.GetString("ai-consciousness-download-warning");
-        var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
-        _chats.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Red);
-
-        if (cue != null && _mind.TryGetMind(uid, out var mindId, out _))
-            _roles.MindPlaySound(mindId, cue);
-    }
-
-    private void AnnounceSnip(EntityUid entity)
-    {
-        var xform = Transform(entity);
+        var xform = Transform(uid);
 
         if (!TryComp(xform.GridUid, out MapGridComponent? grid))
             return;
 
-        _ais.Clear();
-        _lookup.GetChildEntities(xform.GridUid.Value, _ais);
-        var filter = Filter.Empty();
+        var ais = GetStationAIs(xform.GridUid.Value);
 
-        foreach (var ai in _ais)
+        foreach (var ai in ais)
         {
-            // TODO: Filter API?
-            if (TryComp(ai.Owner, out ActorComponent? actorComp))
-            {
-                filter.AddPlayer(actorComp.PlayerSession);
-            }
+            if (!StationAiCanDetectWireSnipping(ai))
+                continue;
+
+            var ev = new ChatNotificationEvent(_aiWireSnippedChatNotificationPrototype, uid);
+
+            var tile = Maps.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates);
+            ev.SourceNameOverride = tile.ToString();
+
+            RaiseLocalEvent(ai, ref ev);
+        }
+    }
+
+    private bool StationAiCanDetectWireSnipping(EntityUid uid)
+    {
+        // TODO: The ability to detect snipped AI interaction wires
+        // should be a MALF ability and/or a purchased upgrade rather
+        // than something available to the station AI by default.
+        // When these systems are added, add the appropriate checks here.
+
+        return false;
+    }
+
+    public HashSet<EntityUid> GetStationAIs(EntityUid gridUid)
+    {
+        _stationAiCores.Clear();
+        _lookup.GetChildEntities(gridUid, _stationAiCores);
+
+        var hashSet = new HashSet<EntityUid>();
+
+        foreach (var stationAiCore in _stationAiCores)
+        {
+            if (!TryGetHeld((stationAiCore, stationAiCore.Comp), out var insertedAi))
+                continue;
+
+            hashSet.Add(insertedAi);
         }
 
-        // TEST
-        // filter = Filter.Broadcast();
-
-        // No easy way to do chat notif embeds atm.
-        var tile = Maps.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates);
-        var msg = Loc.GetString("ai-wire-snipped", ("coords", tile));
-
-        _chats.ChatMessageToMany(ChatChannel.Notifications, msg, msg, entity, false, true, filter.Recipients.Select(o => o.Channel));
-        // Apparently there's no sound for this.
+        return hashSet;
     }
 }
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index 662df43e12..28d3eedd32 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -7,7 +7,6 @@ using Content.Server.Projectiles;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
@@ -15,9 +14,7 @@ using Content.Shared.Power;
 using Content.Shared.Projectiles;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
-using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
-using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -28,7 +25,6 @@ using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Singularity.EntitySystems
 {
-    [UsedImplicitly]
     public sealed class EmitterSystem : SharedEmitterSystem
     {
         [Dependency] private readonly IRobustRandom _random = default!;
@@ -46,8 +42,6 @@ namespace Content.Server.Singularity.EntitySystems
             SubscribeLocalEvent<EmitterComponent, PowerConsumerReceivedChanged>(ReceivedChanged);
             SubscribeLocalEvent<EmitterComponent, PowerChangedEvent>(OnApcChanged);
             SubscribeLocalEvent<EmitterComponent, ActivateInWorldEvent>(OnActivate);
-            SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
-            SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<EmitterComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
             SubscribeLocalEvent<EmitterComponent, SignalReceivedEvent>(OnSignalReceived);
         }
@@ -99,47 +93,6 @@ namespace Content.Server.Singularity.EntitySystems
             }
         }
 
-        private void OnGetVerb(EntityUid uid, EmitterComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract || args.Hands == null)
-                return;
-
-            if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked)
-                return;
-
-            if (component.SelectableTypes.Count < 2)
-                return;
-
-            foreach (var type in component.SelectableTypes)
-            {
-                var proto = _prototype.Index<EntityPrototype>(type);
-
-                var v = new Verb
-                {
-                    Priority = 1,
-                    Category = VerbCategory.SelectType,
-                    Text = proto.Name,
-                    Disabled = type == component.BoltType,
-                    Impact = LogImpact.Medium,
-                    DoContactInteraction = true,
-                    Act = () =>
-                    {
-                        component.BoltType = type;
-                        _popup.PopupEntity(Loc.GetString("emitter-component-type-set", ("type", proto.Name)), uid);
-                    }
-                };
-                args.Verbs.Add(v);
-            }
-        }
-
-        private void OnExamined(EntityUid uid, EmitterComponent component, ExaminedEvent args)
-        {
-            if (component.SelectableTypes.Count < 2)
-                return;
-            var proto = _prototype.Index<EntityPrototype>(component.BoltType);
-            args.PushMarkup(Loc.GetString("emitter-component-current-type", ("type", proto.Name)));
-        }
-
         private void ReceivedChanged(
             EntityUid uid,
             EmitterComponent component,
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 7a15ba3413..7090ca77ef 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -1,15 +1,13 @@
 using System.Numerics;
 using Content.Server.Administration.Logs;
 using Content.Server.Singularity.Events;
-using Content.Server.Station.Components;
 using Content.Shared.Database;
-using Content.Shared.Ghost;
 using Content.Shared.Mind.Components;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
+using Content.Shared.Station.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
@@ -137,7 +135,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
             _adminLogger.Add(LogType.EntityDelete, LogImpact.High, $"{ToPrettyString(morsel):player} entered the event horizon of {ToPrettyString(hungry)} and was deleted");
         }
 
-        EntityManager.QueueDeleteEntity(morsel);
+        QueueDel(morsel);
         var evSelf = new EntityConsumedByEventHorizonEvent(morsel, hungry, eventHorizon, outerContainer);
         var evEaten = new EventHorizonConsumedEntityEvent(morsel, hungry, eventHorizon, outerContainer);
         RaiseLocalEvent(hungry, ref evSelf);
@@ -460,14 +458,14 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
     private void OnEventHorizonContained(EventHorizonContainedEvent args)
     {
         var uid = args.Entity;
-        if (!EntityManager.EntityExists(uid))
+        if (!Exists(uid))
             return;
         var comp = args.EventHorizon;
         if (comp.BeingConsumedByAnotherEventHorizon)
             return;
 
         var containerEntity = args.Args.Container.Owner;
-        if (!EntityManager.EntityExists(containerEntity))
+        if (!Exists(containerEntity))
             return;
         if (AttemptConsumeEntity(uid, containerEntity, comp))
             return; // If we consume the entity we also consume everything in the containers it has.
diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
index 63ff5f8300..6cbe46c759 100644
--- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
@@ -48,7 +48,7 @@ public sealed class RadiationCollectorSystem : EntitySystem
         if (!_containerSystem.TryGetContainer(uid, GasTankContainer, out var container) || container.ContainedEntities.Count == 0)
             return false;
 
-        if (!EntityManager.TryGetComponent(container.ContainedEntities.First(), out gasTankComponent))
+        if (!TryComp(container.ContainedEntities.First(), out gasTankComponent))
             return false;
 
         return true;
diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
index 95722449b8..8e33410561 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
@@ -53,7 +53,7 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste
             return;
 
         SetPower(uid, 0, comp);
-        EntityManager.SpawnEntity(comp.SpawnPrototype, Transform(uid).Coordinates);
+        Spawn(comp.SpawnPrototype, Transform(uid).Coordinates);
     }
 
     #region Getters/Setters
@@ -109,12 +109,12 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste
     /// <param name="args">The state of the beginning of the collision.</param>
     private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, ref StartCollideEvent args)
     {
-        if (!EntityManager.TryGetComponent<SingularityGeneratorComponent>(args.OtherEntity, out var generatorComp))
+        if (!TryComp<SingularityGeneratorComponent>(args.OtherEntity, out var generatorComp))
             return;
 
         if (_timing.CurTime < _metadata.GetPauseTime(uid) + generatorComp.NextFailsafe && !generatorComp.FailsafeDisabled)
         {
-            EntityManager.QueueDeleteEntity(uid);
+            QueueDel(uid);
             return;
         }
 
@@ -152,7 +152,7 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste
             );
         }
 
-        EntityManager.QueueDeleteEntity(uid);
+        QueueDel(uid);
     }
     #endregion Event Handlers
 
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index f28502fc75..f86faf9ee4 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -240,7 +240,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
     private void OnConsumed(EntityUid uid, SingularityComponent comp, ref EventHorizonConsumedEntityEvent args)
     {
         // Should be slightly more efficient than checking literally everything we consume for a singularity component and doing the reverse.
-        if (EntityManager.TryGetComponent<SingularityComponent>(args.EventHorizonUid, out var singulo))
+        if (TryComp<SingularityComponent>(args.EventHorizonUid, out var singulo))
         {
             AdjustEnergy(args.EventHorizonUid, comp.Energy, singularity: singulo);
             SetEnergy(uid, 0.0f, comp);
@@ -255,7 +255,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="args">The event arguments.</param>
     public void OnConsumed(EntityUid uid, SinguloFoodComponent comp, ref EventHorizonConsumedEntityEvent args)
     {
-        if (EntityManager.TryGetComponent<SingularityComponent>(args.EventHorizonUid, out var singulo))
+        if (TryComp<SingularityComponent>(args.EventHorizonUid, out var singulo))
         {
             // Calculate the percentage change (positive or negative)
             var percentageChange = singulo.Energy * (comp.EnergyFactor - 1f);
diff --git a/Content.Server/Singularity/StartSingularityEngineCommand.cs b/Content.Server/Singularity/StartSingularityEngineCommand.cs
index a373c0da5e..0eb8e5ff46 100644
--- a/Content.Server/Singularity/StartSingularityEngineCommand.cs
+++ b/Content.Server/Singularity/StartSingularityEngineCommand.cs
@@ -12,57 +12,53 @@ using Robust.Shared.Console;
 namespace Content.Server.Singularity
 {
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class StartSingularityEngineCommand : IConsoleCommand
+    public sealed class StartSingularityEngineCommand : LocalizedEntityCommands
     {
-        public string Command => "startsingularityengine";
-        public string Description => "Automatically turns on the particle accelerator and containment field emitters.";
-        public string Help => $"{Command}";
+        [Dependency] private readonly EmitterSystem _emitterSystem = default!;
+        [Dependency] private readonly MultipartMachineSystem _multipartSystem = default!;
+        [Dependency] private readonly ParticleAcceleratorSystem  _paSystem = default!;
+        [Dependency] private readonly RadiationCollectorSystem _radCollectorSystem = default!;
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override string Command => "startsingularityengine";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 0)
             {
-                shell.WriteLine($"Invalid amount of arguments: {args.Length}.\n{Help}");
+                shell.WriteLine(Loc.GetString($"shell-need-exactly-zero-arguments"));
                 return;
             }
 
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var entitySystemManager = IoCManager.Resolve<IEntitySystemManager>();
-
             // Turn on emitters
-            var emitterQuery = entityManager.EntityQueryEnumerator<EmitterComponent>();
-            var emitterSystem = entitySystemManager.GetEntitySystem<EmitterSystem>();
+            var emitterQuery = EntityManager.EntityQueryEnumerator<EmitterComponent>();
             while (emitterQuery.MoveNext(out var uid, out var emitterComponent))
             {
                 //FIXME: This turns on ALL emitters, including APEs. It should only turn on the containment field emitters.
-                emitterSystem.SwitchOn(uid, emitterComponent);
+                _emitterSystem.SwitchOn(uid, emitterComponent);
             }
 
             // Turn on radiation collectors
-            var radiationCollectorQuery = entityManager.EntityQueryEnumerator<RadiationCollectorComponent>();
-            var radiationCollectorSystem = entitySystemManager.GetEntitySystem<RadiationCollectorSystem>();
+            var radiationCollectorQuery = EntityManager.EntityQueryEnumerator<RadiationCollectorComponent>();
             while (radiationCollectorQuery.MoveNext(out var uid, out var radiationCollectorComponent))
             {
-                radiationCollectorSystem.SetCollectorEnabled(uid, enabled: true, user: null, radiationCollectorComponent);
+                _radCollectorSystem.SetCollectorEnabled(uid, enabled: true, user: null, radiationCollectorComponent);
             }
 
             // Setup PA
-            var multipartMachineManager = entitySystemManager.GetEntitySystem<MultipartMachineSystem>();
-            var paSystem = entitySystemManager.GetEntitySystem<ParticleAcceleratorSystem>();
-            var paQuery = entityManager.EntityQueryEnumerator<ParticleAcceleratorControlBoxComponent>();
+            var paQuery = EntityManager.EntityQueryEnumerator<ParticleAcceleratorControlBoxComponent>();
             while (paQuery.MoveNext(out var paId, out var paControl))
             {
-                if (!entityManager.TryGetComponent<MultipartMachineComponent>(paId, out var machine))
+                if (!EntityManager.TryGetComponent<MultipartMachineComponent>(paId, out var machine))
                     continue;
 
-                if (!multipartMachineManager.Rescan((paId, machine)))
+                if (!_multipartSystem.Rescan((paId, machine)))
                     continue;
 
-                paSystem.SetStrength(paId, ParticleAcceleratorPowerState.Level0, comp: paControl);
-                paSystem.SwitchOn(paId, comp: paControl);
+                _paSystem.SetStrength(paId, ParticleAcceleratorPowerState.Level0, comp: paControl);
+                _paSystem.SwitchOn(paId, comp: paControl);
             }
 
-            shell.WriteLine("Done!");
+            shell.WriteLine(Loc.GetString($"shell-command-success"));
         }
     }
 }
diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
index 4f1cdb0eb0..d6c048d13f 100644
--- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
@@ -122,7 +122,7 @@ namespace Content.Server.Solar.EntitySystems
         private void UpdatePanelCoverage(Entity<SolarPanelComponent> panel)
         {
             var entity = panel.Owner;
-            var xform = EntityManager.GetComponent<TransformComponent>(entity);
+            var xform = Comp<TransformComponent>(entity);
 
             // So apparently, and yes, I *did* only find this out later,
             // this is just a really fancy way of saying "Lambert's law of cosines".
diff --git a/Content.Server/Sound/Components/EmitSoundOnTriggerComponent.cs b/Content.Server/Sound/Components/EmitSoundOnTriggerComponent.cs
deleted file mode 100644
index 5338351948..0000000000
--- a/Content.Server/Sound/Components/EmitSoundOnTriggerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Sound.Components;
-
-namespace Content.Server.Sound.Components
-{
-    /// <summary>
-    /// Whenever a <see cref="TriggerEvent"/> is run play a sound in PVS range.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class EmitSoundOnTriggerComponent : BaseEmitSoundComponent
-    {
-    }
-}
diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs
index 9d7e8496c3..1720d67d02 100644
--- a/Content.Server/Sound/EmitSoundSystem.cs
+++ b/Content.Server/Sound/EmitSoundSystem.cs
@@ -1,6 +1,3 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Sound.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.Sound;
 using Content.Shared.Sound.Components;
 using Robust.Shared.Timing;
@@ -38,16 +35,9 @@ public sealed class EmitSoundSystem : SharedEmitSoundSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(HandleEmitSoundOnTrigger);
         SubscribeLocalEvent<SpamEmitSoundComponent, MapInitEvent>(HandleSpamEmitSoundMapInit);
     }
 
-    private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args)
-    {
-        TryEmitSound(uid, component, args.User, false);
-        args.Handled = true;
-    }
-
     private void HandleSpamEmitSoundMapInit(Entity<SpamEmitSoundComponent> entity, ref MapInitEvent args)
     {
         SpamEmitSoundReset(entity);
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 7331894bcf..96deb70b47 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -89,14 +89,14 @@ namespace Content.Server.Spawners.EntitySystems
             }
 
             if (!Deleted(uid))
-                EntityManager.SpawnEntity(_robustRandom.Pick(component.Prototypes), Transform(uid).Coordinates);
+                Spawn(_robustRandom.Pick(component.Prototypes), Transform(uid).Coordinates);
         }
 
         private void Spawn(EntityUid uid, RandomSpawnerComponent component)
         {
             if (component.RarePrototypes.Count > 0 && (component.RareChance == 1.0f || _robustRandom.Prob(component.RareChance)))
             {
-                EntityManager.SpawnEntity(_robustRandom.Pick(component.RarePrototypes), Transform(uid).Coordinates);
+                Spawn(_robustRandom.Pick(component.RarePrototypes), Transform(uid).Coordinates);
                 return;
             }
 
@@ -118,7 +118,7 @@ namespace Content.Server.Spawners.EntitySystems
 
             var coordinates = Transform(uid).Coordinates.Offset(new Vector2(xOffset, yOffset));
 
-            EntityManager.SpawnEntity(_robustRandom.Pick(component.Prototypes), coordinates);
+            Spawn(_robustRandom.Pick(component.Prototypes), coordinates);
         }
 
         private void Spawn(Entity<EntityTableSpawnerComponent> ent)
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
index d491b957bf..11493b65b3 100644
--- a/Content.Server/Species/Systems/NymphSystem.cs
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -35,7 +35,7 @@ public sealed partial class NymphSystem : EntitySystem
 
         // Get the organs' position & spawn a nymph there
         var coords = Transform(uid).Coordinates;
-        var nymph = EntityManager.SpawnAtPosition(entityProto.ID, coords);
+        var nymph = SpawnAtPosition(entityProto.ID, coords);
 
         if (HasComp<ZombieComponent>(args.OldBody)) // Zombify the new nymph if old one is a zombie
             _zombie.ZombifyEntity(nymph);
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs
index 7e29f02cae..e413dd52f8 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Server/Speech/AccentSystem.cs
@@ -1,44 +1,23 @@
 using System.Text.RegularExpressions;
-using Content.Server.Chat;
 using Content.Server.Chat.Systems;
+using Content.Shared.Speech;
 
-namespace Content.Server.Speech
+namespace Content.Server.Speech;
+
+public sealed class AccentSystem : EntitySystem
 {
-    public sealed class AccentSystem : EntitySystem
+    public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled);
+
+    public override void Initialize()
     {
-        public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled);
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<TransformSpeechEvent>(AccentHandler);
-        }
-
-        private void AccentHandler(TransformSpeechEvent args)
-        {
-            var accentEvent = new AccentGetEvent(args.Sender, args.Message);
-
-            RaiseLocalEvent(args.Sender, accentEvent, true);
-            args.Message = accentEvent.Message;
-        }
+        SubscribeLocalEvent<TransformSpeechEvent>(AccentHandler);
     }
 
-    public sealed class AccentGetEvent : EntityEventArgs
+    private void AccentHandler(TransformSpeechEvent args)
     {
-        /// <summary>
-        ///     The entity to apply the accent to.
-        /// </summary>
-        public EntityUid Entity { get; }
+        var accentEvent = new AccentGetEvent(args.Sender, args.Message);
 
-        /// <summary>
-        ///     The message to apply the accent transformation to.
-        ///     Modify this to apply the accent.
-        /// </summary>
-        public string Message { get; set; }
-
-        public AccentGetEvent(EntityUid entity, string message)
-        {
-            Entity = entity;
-            Message = message;
-        }
+        RaiseLocalEvent(args.Sender, accentEvent, true);
+        args.Message = accentEvent.Message;
     }
 }
diff --git a/Content.Server/Speech/Components/ActiveListenerComponent.cs b/Content.Server/Speech/Components/ActiveListenerComponent.cs
deleted file mode 100644
index 4553fafa51..0000000000
--- a/Content.Server/Speech/Components/ActiveListenerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Server.Chat.Systems;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     This component is used to relay speech events to other systems.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ActiveListenerComponent : Component
-{
-    [DataField("range")]
-    public float Range = ChatSystem.VoiceRange;
-}
diff --git a/Content.Server/Speech/Components/EmoteBlockerComponent.cs b/Content.Server/Speech/Components/EmoteBlockerComponent.cs
new file mode 100644
index 0000000000..603fd1b258
--- /dev/null
+++ b/Content.Server/Speech/Components/EmoteBlockerComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+/// Suppresses emotes with the given categories or ID.
+/// Additionally, if the Scream Emote would be blocked, also blocks the Scream Action.
+/// </summary>
+[RegisterComponent]
+public sealed partial class EmoteBlockerComponent : Component
+{
+    /// <summary>
+    /// Which categories of emotes are blocked by this component.
+    /// </summary>
+    [DataField]
+    public HashSet<EmoteCategory> BlocksCategories = [];
+
+    /// <summary>
+    /// IDs of which specific emotes are blocked by this component.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<EmotePrototype>> BlocksEmotes = [];
+}
diff --git a/Content.Server/Speech/Components/SlowAccentComponent.cs b/Content.Server/Speech/Components/SlowAccentComponent.cs
new file mode 100644
index 0000000000..1222475cb2
--- /dev/null
+++ b/Content.Server/Speech/Components/SlowAccentComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+/// Makes... the... entity... talk... like... this...
+/// </summary>
+[RegisterComponent]
+public sealed partial class SlowAccentComponent : Component;
diff --git a/Content.Server/Speech/EntitySystems/AddAccentClothingSystem.cs b/Content.Server/Speech/EntitySystems/AddAccentClothingSystem.cs
index 98d35efae4..261377a14a 100644
--- a/Content.Server/Speech/EntitySystems/AddAccentClothingSystem.cs
+++ b/Content.Server/Speech/EntitySystems/AddAccentClothingSystem.cs
@@ -39,7 +39,7 @@ public sealed class AddAccentClothingSystem : EntitySystem
 
         // try to remove accent
         var componentType = Factory.GetRegistration(component.Accent).Type;
-        EntityManager.RemoveComponent(args.Wearer, componentType);
+        RemComp(args.Wearer, componentType);
 
         component.IsActive = false;
     }
diff --git a/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs b/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
index db69c86995..cad96e7d04 100644
--- a/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems
 {
diff --git a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
index 2f387a1924..9ee8cbd4e5 100644
--- a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
diff --git a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
index 903377477e..8dc358a4b4 100644
--- a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
index a13eda1f73..6b09877512 100644
--- a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
index 47f36cafc4..d4a37a07cd 100644
--- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.PowerCell;
 using Content.Shared.Speech.Components;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs b/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs
new file mode 100644
index 0000000000..3599268359
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Speech.Components;
+using Content.Shared.Emoting;
+using Content.Shared.Inventory;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class EmoteBlockerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmoteBlockerComponent, BeforeEmoteEvent>(OnEmoteEvent);
+        SubscribeLocalEvent<EmoteBlockerComponent, InventoryRelayedEvent<BeforeEmoteEvent>>(OnRelayedEmoteEvent);
+    }
+
+    private static void OnRelayedEmoteEvent(Entity<EmoteBlockerComponent> entity, ref InventoryRelayedEvent<BeforeEmoteEvent> args)
+    {
+        OnEmoteEvent(entity, ref args.Args);
+    }
+
+    private static void OnEmoteEvent(Entity<EmoteBlockerComponent> entity, ref BeforeEmoteEvent args)
+    {
+        if (entity.Comp.BlocksEmotes.Contains(args.Emote))
+        {
+            args.Cancel();
+            args.Blocker = entity;
+            return;
+        }
+
+        foreach (var blockedCat in entity.Comp.BlocksCategories)
+        {
+            if (blockedCat == args.Emote.Category)
+            {
+                args.Cancel();
+                args.Blocker = entity;
+                return;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
index 7fb0ee2082..aaeac4a8f6 100644
--- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -1,5 +1,6 @@
-using Content.Server.Speech.Components;
 using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
index 0322c47781..1ad13e61cd 100644
--- a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
 using Robust.Shared.Random; // Russian-Localization
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs b/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
index 1973d38afb..94a5606178 100644
--- a/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
@@ -1,7 +1,8 @@
 using System.Text;
-using Content.Server.Speech.Components;
-using Robust.Shared.Random;
 using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
index ea3569e055..17513d80e7 100644
--- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
index 40328d420a..0556728349 100644
--- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
 using Robust.Shared.Random;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
index 5906bf3ed4..6048db5eb2 100644
--- a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs b/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
index 157ead9225..9cce2b4c94 100644
--- a/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
index b67cbf138a..300d04a867 100644
--- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
 using Robust.Shared.Random;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
index 6b1af5c227..27679c9134 100644
--- a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
@@ -1,7 +1,9 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech.Components;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Speech.EntitySystems;
 
@@ -9,6 +11,7 @@ public sealed class MumbleAccentSystem : EntitySystem
 {
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public override void Initialize()
     {
@@ -23,10 +26,14 @@ public sealed class MumbleAccentSystem : EntitySystem
         if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Vocal))
             return;
 
-        if (TryComp<VocalComponent>(ent.Owner, out var vocalComp))
+        if (TryComp<VocalComponent>(ent.Owner, out var vocalComp) && vocalComp.EmoteSounds is { } sounds)
         {
             // play a muffled version of the vocal emote
-            args.Handled = _chat.TryPlayEmoteSound(ent.Owner, vocalComp.EmoteSounds, args.Emote, ent.Comp.EmoteAudioParams);
+            args.Handled = _chat.TryPlayEmoteSound(
+                ent.Owner,
+                _prototype.Index(sounds),
+                args.Emote,
+                ent.Comp.EmoteAudioParams);
         }
     }
 
diff --git a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
index 072c4a0621..9e5fec54e1 100644
--- a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
@@ -1,4 +1,6 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
 {
diff --git a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
index ae8fe522b9..9bd3be25ae 100644
--- a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
index 84298cbf01..ff2c5913e0 100644
--- a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 using System.Text.RegularExpressions;
 
diff --git a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
index baa4f6f347..39b040b75f 100644
--- a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
+++ b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
@@ -1,8 +1,10 @@
 using System.Text;
 using System.Text.RegularExpressions;
+using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Speech.EntitySystems;
 
@@ -10,9 +12,7 @@ public sealed class RatvarianLanguageSystem : SharedRatvarianLanguageSystem
 {
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
-
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string RatvarianKey = "RatvarianLanguage";
+    private static readonly ProtoId<StatusEffectPrototype> RatvarianKey = "RatvarianLanguage";
 
     // This is the word of Ratvar and those who speak it shall abide by His rules:
     /*
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index 656a72b3f9..c285063d2d 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.Prototypes;
+using Content.Shared.Speech;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -18,9 +19,21 @@ namespace Content.Server.Speech.EntitySystems
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
+        private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
+            _cachedReplacements = new();
+
         public override void Initialize()
         {
             SubscribeLocalEvent<ReplacementAccentComponent, AccentGetEvent>(OnAccent);
+
+            _proto.PrototypesReloaded += OnPrototypesReloaded;
+        }
+
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _proto.PrototypesReloaded -= OnPrototypesReloaded;
         }
 
         private void OnAccent(EntityUid uid, ReplacementAccentComponent component, AccentGetEvent args)
@@ -47,27 +60,22 @@ namespace Content.Server.Speech.EntitySystems
                 return prototype.FullReplacements.Length != 0 ? Loc.GetString(_random.Pick(prototype.FullReplacements)) : "";
             }
 
-            if (prototype.WordReplacements == null)
-                return message;
-
             // Prohibition of repeated word replacements.
             // All replaced words placed in the final message are placed here as dashes (___) with the same length.
             // The regex search goes through this buffer message, from which the already replaced words are crossed out,
             // ensuring that the replaced words cannot be replaced again.
             var maskMessage = message;
 
-            foreach (var (first, replace) in prototype.WordReplacements)
+            foreach (var (regex, replace) in GetCachedReplacements(prototype))
             {
-                var f = _loc.GetString(first);
-                var r = _loc.GetString(replace);
                 // this is kind of slow but its not that bad
                 // essentially: go over all matches, try to match capitalization where possible, then replace
                 // rather than using regex.replace
-                for (int i = Regex.Count(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase); i > 0; i--)
+                for (int i = regex.Count(maskMessage); i > 0; i--)
                 {
                     // fetch the match again as the character indices may have changed
-                    Match match = Regex.Match(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase);
-                    var replacement = r;
+                    Match match = regex.Match(maskMessage);
+                    var replacement = replace;
 
                     // Intelligently replace capitalization
                     // two cases where we will do so:
@@ -97,5 +105,40 @@ namespace Content.Server.Speech.EntitySystems
 
             return message;
         }
+
+        private (Regex regex, string replacement)[] GetCachedReplacements(ReplacementAccentPrototype prototype)
+        {
+            if (!_cachedReplacements.TryGetValue(prototype.ID, out var replacements))
+            {
+                replacements = GenerateCachedReplacements(prototype);
+                _cachedReplacements.Add(prototype.ID, replacements);
+            }
+
+            return replacements;
+        }
+
+        private (Regex regex, string replacement)[] GenerateCachedReplacements(ReplacementAccentPrototype prototype)
+        {
+            if (prototype.WordReplacements is not { } replacements)
+                return [];
+
+            return replacements.Select(kv =>
+                {
+                    var (first, replace) = kv;
+                    var firstLoc = _loc.GetString(first);
+                    var replaceLoc = _loc.GetString(replace);
+
+                    var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
+
+                    return (regex, replaceLoc);
+
+                })
+                .ToArray();
+        }
+
+        private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
+        {
+            _cachedReplacements.Clear();
+        }
     }
 }
diff --git a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
index 49aab38e2b..5c49ecbde7 100644
--- a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
index 8a61c0ea50..d685edc38b 100644
--- a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
diff --git a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs b/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
index 1b773f1a5a..73d8c0665e 100644
--- a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
diff --git a/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs b/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
new file mode 100644
index 0000000000..0a4ac02f3f
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
@@ -0,0 +1,42 @@
+using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed partial class SlowAccentSystem : EntitySystem
+{
+    /// <summary>
+    /// Matches whitespace characters or commas (with or without a space after them).
+    /// </summary>
+    private static readonly Regex WordEndings = new("\\s|, |,");
+
+    /// <summary>
+    /// Matches the end of the string only if the last character is a "word" character.
+    /// </summary>
+    private static readonly Regex NoFinalPunctuation = new("\\w\\z");
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SlowAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    private void OnAccentGet(Entity<SlowAccentComponent> ent, ref AccentGetEvent args)
+    {
+        args.Message = Accentuate(ent, args.Message);
+    }
+
+    public string Accentuate(Entity<SlowAccentComponent> ent, string message)
+    {
+        // Add... some... delay... between... each... word
+        message = WordEndings.Replace(message, "... ");
+
+        // Add "..." to the end, if the last character is part of a word...
+        if (NoFinalPunctuation.IsMatch(message))
+            message += "...";
+
+        return message;
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/SlurredSystem.cs b/Content.Server/Speech/EntitySystems/SlurredSystem.cs
index 7f6e249ecd..8bb1bd6ff1 100644
--- a/Content.Server/Speech/EntitySystems/SlurredSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SlurredSystem.cs
@@ -1,8 +1,10 @@
 using System.Text;
 using Content.Server.Speech.Components;
 using Content.Shared.Drunk;
+using Content.Shared.Speech;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -14,10 +16,7 @@ public sealed class SlurredSystem : SharedSlurredSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-
-
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string SlurKey = "SlurredSpeech";
+    private static readonly ProtoId<StatusEffectPrototype> SlurKey = "SlurredSpeech";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
index c1f8a0be30..6bf64ccabd 100644
--- a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
index 08642014c9..cf0c7dfcd2 100644
--- a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems
 {
diff --git a/Content.Server/Speech/EntitySystems/StutteringSystem.cs b/Content.Server/Speech/EntitySystems/StutteringSystem.cs
index e19b04edb9..b6836da01a 100644
--- a/Content.Server/Speech/EntitySystems/StutteringSystem.cs
+++ b/Content.Server/Speech/EntitySystems/StutteringSystem.cs
@@ -1,6 +1,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs
index e6afafa17b..f4ef86de61 100644
--- a/Content.Server/Speech/EntitySystems/VocalSystem.cs
+++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Actions;
 using Content.Server.Chat.Systems;
 using Content.Server.Speech.Components;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Cloning.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
@@ -31,6 +32,25 @@ public sealed class VocalSystem : EntitySystem
         SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnScreamAction);
     }
 
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because of the ScreamActionEntity DataField, which should not be copied.
+    /// <summary>
+    public void CopyComponent(Entity<VocalComponent?> source, EntityUid target)
+    {
+        if (!Resolve(source, ref source.Comp))
+            return;
+
+        var targetComp = EnsureComp<VocalComponent>(target);
+        targetComp.Sounds = source.Comp.Sounds;
+        targetComp.ScreamId = source.Comp.ScreamId;
+        targetComp.Wilhelm = source.Comp.Wilhelm;
+        targetComp.WilhelmProbability = source.Comp.WilhelmProbability;
+        LoadSounds(target, targetComp);
+
+        Dirty(target, targetComp);
+    }
+
     private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
     {
         // try to add scream action when vocal comp added
@@ -65,8 +85,11 @@ public sealed class VocalSystem : EntitySystem
             return;
         }
 
+        if (component.EmoteSounds is not { } sounds)
+            return;
+
         // just play regular sound based on emote proto
-        args.Handled = _chat.TryPlayEmoteSound(uid, component.EmoteSounds, args.Emote);
+        args.Handled = _chat.TryPlayEmoteSound(uid, _proto.Index(sounds), args.Emote);
     }
 
     private void OnScreamAction(EntityUid uid, VocalComponent component, ScreamActionEvent args)
@@ -86,7 +109,10 @@ public sealed class VocalSystem : EntitySystem
             return true;
         }
 
-        return _chat.TryPlayEmoteSound(uid, component.EmoteSounds, component.ScreamId);
+        if (component.EmoteSounds is not { } sounds)
+            return false;
+
+        return _chat.TryPlayEmoteSound(uid, _proto.Index(sounds), component.ScreamId);
     }
 
     private void LoadSounds(EntityUid uid, VocalComponent component, Sex? sex = null)
@@ -98,6 +124,10 @@ public sealed class VocalSystem : EntitySystem
 
         if (!component.Sounds.TryGetValue(sex.Value, out var protoId))
             return;
-        _proto.TryIndex(protoId, out component.EmoteSounds);
+
+        if (!_proto.HasIndex(protoId))
+            return;
+
+        component.EmoteSounds = protoId;
     }
 }
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
index edf82bbfb2..f588e2238d 100644
--- a/Content.Server/Speech/Muting/MutingSystem.cs
+++ b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Mime;
+using Content.Shared.Abilities.Mime;
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Server.Speech.Components;
diff --git a/Content.Server/Spider/SpiderSystem.cs b/Content.Server/Spider/SpiderSystem.cs
index 449e43984c..33142b19b1 100644
--- a/Content.Server/Spider/SpiderSystem.cs
+++ b/Content.Server/Spider/SpiderSystem.cs
@@ -2,14 +2,25 @@ using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.Spider;
 using Content.Shared.Maps;
+using Content.Shared.Mobs.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Spider;
 
 public sealed class SpiderSystem : SharedSpiderSystem
 {
     [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+
+    /// <summary>
+    ///     A recycled hashset used to check turfs for spiderwebs.
+    /// </summary>
+    private readonly HashSet<EntityUid> _webs = [];
 
     public override void Initialize()
     {
@@ -17,6 +28,30 @@ public sealed class SpiderSystem : SharedSpiderSystem
         SubscribeLocalEvent<SpiderComponent, SpiderWebActionEvent>(OnSpawnNet);
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<SpiderComponent>();
+        while (query.MoveNext(out var uid, out var spider))
+        {
+            spider.NextWebSpawn ??= _timing.CurTime + spider.WebSpawnCooldown;
+
+            if (_timing.CurTime < spider.NextWebSpawn)
+                continue;
+
+            spider.NextWebSpawn += spider.WebSpawnCooldown;
+
+            if (HasComp<ActorComponent>(uid)
+                || _mobState.IsDead(uid)
+                || !spider.SpawnsWebsAsNonPlayer)
+                continue;
+
+            var transform = Transform(uid);
+            SpawnWeb((uid, spider), transform.Coordinates);
+        }
+    }
+
     private void OnSpawnNet(EntityUid uid, SpiderComponent component, SpiderWebActionEvent args)
     {
         if (args.Handled)
@@ -30,30 +65,7 @@ public sealed class SpiderSystem : SharedSpiderSystem
             return;
         }
 
-        var coords = transform.Coordinates;
-
-        // TODO generic way to get certain coordinates
-
-        var result = false;
-        // Spawn web in center
-        if (!IsTileBlockedByWeb(coords))
-        {
-            Spawn(component.WebPrototype, coords);
-            result = true;
-        }
-
-        // Spawn web in other directions
-        for (var i = 0; i < 4; i++)
-        {
-            var direction = (DirectionFlag) (1 << i);
-            coords = transform.Coordinates.Offset(direction.AsDir().ToVec());
-
-            if (!IsTileBlockedByWeb(coords))
-            {
-                Spawn(component.WebPrototype, coords);
-                result = true;
-            }
-        }
+        var result = SpawnWeb((uid, component), transform.Coordinates);
 
         if (result)
         {
@@ -64,9 +76,38 @@ public sealed class SpiderSystem : SharedSpiderSystem
             _popup.PopupEntity(Loc.GetString("spider-web-action-fail"), args.Performer, args.Performer);
     }
 
+    private bool SpawnWeb(Entity<SpiderComponent> ent, EntityCoordinates coords)
+    {
+        var result = false;
+
+        // Spawn web in center
+        if (!IsTileBlockedByWeb(coords))
+        {
+            Spawn(ent.Comp.WebPrototype, coords);
+            result = true;
+        }
+
+        // Spawn web in other directions
+        for (var i = 0; i < 4; i++)
+        {
+            var direction = (DirectionFlag)(1 << i);
+            var outerSpawnCoordinates = coords.Offset(direction.AsDir().ToVec());
+
+            if (IsTileBlockedByWeb(outerSpawnCoordinates))
+                continue;
+
+            Spawn(ent.Comp.WebPrototype, outerSpawnCoordinates);
+            result = true;
+        }
+
+        return result;
+    }
+
     private bool IsTileBlockedByWeb(EntityCoordinates coords)
     {
-        foreach (var entity in coords.GetEntitiesInTile())
+        _webs.Clear();
+        _turf.GetEntitiesInTile(coords, _webs);
+        foreach (var entity in _webs)
         {
             if (HasComp<SpiderWebObjectComponent>(entity))
                 return true;
@@ -74,4 +115,3 @@ public sealed class SpiderSystem : SharedSpiderSystem
         return false;
     }
 }
-
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index 9f6da20fda..24ab5e0ea2 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -1,27 +1,134 @@
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.EntitySystems;
+using Content.Server.Charges;
+using Content.Server.Decals;
+using Content.Server.Destructible;
+using Content.Server.Popups;
+using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.Charges.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Database;
+using Content.Shared.Decals;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
 using Content.Shared.SprayPainter;
 using Content.Shared.SprayPainter.Components;
+using Robust.Server.Audio;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.SprayPainter;
 
 /// <summary>
-/// Handles spraying pipes using a spray painter.
-/// Airlocks are handled in shared.
+/// Handles spraying pipes and decals using a spray painter.
+/// Other paintable objects are handled in shared.
 /// </summary>
 public sealed class SprayPainterSystem : SharedSprayPainterSystem
 {
     [Dependency] private readonly AtmosPipeColorSystem _pipeColor = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly DecalSystem _decals = default!;
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly ChargesSystem _charges = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<SprayPainterComponent, SprayPainterPipeDoAfterEvent>(OnPipeDoAfter);
-
+        SubscribeLocalEvent<SprayPainterComponent, AfterInteractEvent>(OnFloorAfterInteract);
         SubscribeLocalEvent<AtmosPipeColorComponent, InteractUsingEvent>(OnPipeInteract);
+        SubscribeLocalEvent<GasCanisterComponent, EntityPaintedEvent>(OnCanisterPainted);
+    }
+
+    /// <summary>
+    /// Handles drawing decals when a spray painter is used to interact with the floor.
+    /// Spray painter must have decal painting enabled and enough charges of paint to paint on the floor.
+    /// </summary>
+    private void OnFloorAfterInteract(Entity<SprayPainterComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target != null)
+            return;
+
+        // Includes both off and all other don't cares
+        if (ent.Comp.DecalMode != DecalPaintMode.Add && ent.Comp.DecalMode != DecalPaintMode.Remove)
+            return;
+
+        args.Handled = true;
+        if (TryComp(ent, out LimitedChargesComponent? charges) && charges.LastCharges < ent.Comp.DecalChargeCost)
+        {
+            _popup.PopupEntity(Loc.GetString("spray-painter-interact-no-charges"), args.User, args.User);
+            return;
+        }
+
+        var position = args.ClickLocation;
+        if (ent.Comp.SnapDecals)
+            position = position.SnapToGrid(EntityManager);
+
+        if (ent.Comp.DecalMode == DecalPaintMode.Add)
+        {
+            // Offset painting for adding decals
+            position = position.Offset(new(-0.5f));
+
+            if (!_decals.TryAddDecal(ent.Comp.SelectedDecal, position, out _, ent.Comp.SelectedDecalColor, Angle.FromDegrees(ent.Comp.SelectedDecalAngle), 0, false))
+                return;
+        }
+        else
+        {
+            var gridUid = _transform.GetGrid(args.ClickLocation);
+            if (gridUid is not { } grid || !TryComp<DecalGridComponent>(grid, out var decalGridComp))
+            {
+                _popup.PopupEntity(Loc.GetString("spray-painter-interact-nothing-to-remove"), args.User, args.User);
+                return;
+            }
+
+            var decals = _decals.GetDecalsInRange(grid, position.Position, validDelegate: IsDecalRemovable);
+            if (decals.Count <= 0)
+            {
+                _popup.PopupEntity(Loc.GetString("spray-painter-interact-nothing-to-remove"), args.User, args.User);
+                return;
+            }
+
+            foreach (var decal in decals)
+            {
+                _decals.RemoveDecal(grid, decal.Index, decalGridComp);
+            }
+        }
+
+        _audio.PlayPvs(ent.Comp.SpraySound, ent);
+
+        _charges.TryUseCharges((ent, charges), ent.Comp.DecalChargeCost);
+
+        AdminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} painted a {ent.Comp.SelectedDecal}");
+    }
+
+    /// <summary>
+    /// Handles drawing decals when a spray painter is used to interact with the floor.
+    /// Spray painter must have decal painting enabled and enough charges of paint to paint on the floor.
+    /// </summary>
+    private bool IsDecalRemovable(Decal decal)
+    {
+        if (!Proto.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
+            return false;
+
+        return (decalProto.Tags.Contains("station")
+            || decalProto.Tags.Contains("markings"))
+            && !decalProto.Tags.Contains("dirty");
+    }
+
+    /// <summary>
+    /// Event handler when gas canisters are painted.
+    /// The canister's color should not change when it's destroyed.
+    /// </summary>
+    private void OnCanisterPainted(Entity<GasCanisterComponent> ent, ref EntityPaintedEvent args)
+    {
+        var dummy = Spawn(args.Prototype);
+
+        var destructibleComp = EnsureComp<DestructibleComponent>(dummy);
+        CopyComp(dummy, ent, destructibleComp);
+
+        Del(dummy);
     }
 
     private void OnPipeDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterPipeDoAfterEvent args)
@@ -29,14 +136,17 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
         if (args.Handled || args.Cancelled)
             return;
 
-        if (args.Args.Target is not {} target)
+        if (args.Args.Target is not { } target)
             return;
 
         if (!TryComp<AtmosPipeColorComponent>(target, out var color))
             return;
 
-        Audio.PlayPvs(ent.Comp.SpraySound, ent);
+        if (TryComp<LimitedChargesComponent>(ent, out var charges) &&
+            !_charges.TryUseCharges((ent, charges), ent.Comp.PipeChargeCost))
+            return;
 
+        Audio.PlayPvs(ent.Comp.SpraySound, ent);
         _pipeColor.SetColor(target, color, args.Color);
 
         args.Handled = true;
@@ -47,13 +157,28 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
         if (args.Handled)
             return;
 
-        if (!TryComp<SprayPainterComponent>(args.Used, out var painter) || painter.PickedColor is not {} colorName)
+        if (!TryComp<SprayPainterComponent>(args.Used, out var painter) ||
+            painter.PickedColor is not { } colorName)
             return;
 
         if (!painter.ColorPalette.TryGetValue(colorName, out var color))
             return;
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.PipeSprayTime, new SprayPainterPipeDoAfterEvent(color), args.Used, target: ent, used: args.Used)
+        if (TryComp<LimitedChargesComponent>(args.Used, out var charges)
+            && charges.LastCharges < painter.PipeChargeCost)
+        {
+            var msg = Loc.GetString("spray-painter-interact-no-charges");
+            _popup.PopupEntity(msg, args.User, args.User);
+            return;
+        }
+
+        var doAfterEventArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            painter.PipeSprayTime,
+            new SprayPainterPipeDoAfterEvent(color),
+            args.Used,
+            target: ent,
+            used: args.Used)
         {
             BreakOnMove = true,
             BreakOnDamage = true,
diff --git a/Content.Server/Spreader/KudzuSystem.cs b/Content.Server/Spreader/KudzuSystem.cs
index dc176ebc2a..fbc809c15b 100644
--- a/Content.Server/Spreader/KudzuSystem.cs
+++ b/Content.Server/Spreader/KudzuSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Spreader;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -14,8 +15,7 @@ public sealed class KudzuSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
-    [ValidatePrototypeId<EdgeSpreaderPrototype>]
-    private const string KudzuGroup = "Kudzu";
+    private static readonly ProtoId<EdgeSpreaderPrototype> KudzuGroup = "Kudzu";
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -36,7 +36,7 @@ public sealed class KudzuSystem : EntitySystem
                 component.GrowthLevel = 3;
 
             component.GrowthLevel = Math.Max(1, component.GrowthLevel - growthDamage);
-            if (EntityManager.TryGetComponent<AppearanceComponent>(uid, out var appearance))
+            if (TryComp<AppearanceComponent>(uid, out var appearance))
             {
                 _appearance.SetData(uid, KudzuVisuals.GrowthLevel, component.GrowthLevel, appearance);
             }
@@ -79,7 +79,7 @@ public sealed class KudzuSystem : EntitySystem
 
     private void SetupKudzu(EntityUid uid, KudzuComponent component, ComponentStartup args)
     {
-        if (!EntityManager.TryGetComponent<AppearanceComponent>(uid, out var appearance))
+        if (!TryComp<AppearanceComponent>(uid, out var appearance))
         {
             return;
         }
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 50f5d81183..328f4f0504 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -23,6 +23,7 @@ public sealed class SpreaderSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     /// <summary>
     /// Cached maximum number of updates per spreader prototype. This is applied per-grid.
@@ -246,7 +247,7 @@ public sealed class SpreaderSystem : EntitySystem
             if (!_map.TryGetTileRef(neighborEnt, neighborGrid, neighborPos, out var tileRef) || tileRef.Tile.IsEmpty)
                 continue;
 
-            if (spreaderPrototype.PreventSpreadOnSpaced && tileRef.Tile.IsSpace())
+            if (spreaderPrototype.PreventSpreadOnSpaced && _turf.IsSpace(tileRef))
                 continue;
 
             var directionEnumerator = _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
diff --git a/Content.Server/Sprite/ScaleVisualsSystem.cs b/Content.Server/Sprite/ScaleVisualsSystem.cs
new file mode 100644
index 0000000000..53e9233e60
--- /dev/null
+++ b/Content.Server/Sprite/ScaleVisualsSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Sprite;
+
+namespace Content.Server.Sprite;
+
+public sealed class ScaleVisualsSystem : SharedScaleVisualsSystem;
diff --git a/Content.Server/Station/Commands/StationCommand.cs b/Content.Server/Station/Commands/StationCommand.cs
index 8fe8c67646..f9dcb83d93 100644
--- a/Content.Server/Station/Commands/StationCommand.cs
+++ b/Content.Server/Station/Commands/StationCommand.cs
@@ -2,12 +2,12 @@ using System.Diagnostics;
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.Cargo.Systems;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Station;
+using Content.Shared.Station.Components;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Errors;
-using Robust.Shared.Toolshed.Syntax;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Station.Commands;
@@ -54,7 +54,7 @@ public sealed class StationsCommand : ToolshedCommand
     public EntityUid? LargestGrid([PipedArgument] EntityUid input)
     {
         _station ??= GetSys<StationSystem>();
-        return _station.GetLargestGrid(Comp<StationDataComponent>(input));
+        return _station.GetLargestGrid(input);
     }
 
     [CommandImplementation("largestgrid")]
diff --git a/Content.Server/Station/Events/StationPostInitEvent.cs b/Content.Server/Station/Events/StationPostInitEvent.cs
index 54b8eeeb31..934d482bf2 100644
--- a/Content.Server/Station/Events/StationPostInitEvent.cs
+++ b/Content.Server/Station/Events/StationPostInitEvent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Station.Components;
+using Content.Shared.Station.Components;
 
 namespace Content.Server.Station.Events;
 
diff --git a/Content.Server/Station/Systems/StationBiomeSystem.cs b/Content.Server/Station/Systems/StationBiomeSystem.cs
index c12e2f47e4..61bc70794a 100644
--- a/Content.Server/Station/Systems/StationBiomeSystem.cs
+++ b/Content.Server/Station/Systems/StationBiomeSystem.cs
@@ -20,12 +20,10 @@ public sealed partial class StationBiomeSystem : EntitySystem
 
     private void OnStationPostInit(Entity<StationBiomeComponent> map, ref StationPostInitEvent args)
     {
-        if (!TryComp(map, out StationDataComponent? dataComp))
+        var station = _station.GetLargestGrid(map.Owner);
+        if (station == null)
             return;
 
-        var station = _station.GetLargestGrid(dataComp);
-        if (station == null) return;
-
         var mapId = Transform(station.Value).MapID;
         var mapUid = _map.GetMapOrInvalid(mapId);
 
diff --git a/Content.Server/Station/Systems/StationNameSystem.cs b/Content.Server/Station/Systems/StationNameSystem.cs
index fbbf690465..ea17830a47 100644
--- a/Content.Server/Station/Systems/StationNameSystem.cs
+++ b/Content.Server/Station/Systems/StationNameSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Station.Components;
+using Content.Shared.Station.Components;
 
 namespace Content.Server.Station.Systems;
 
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index c6bc885c46..88f1da1b15 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -2,7 +2,7 @@ using Content.Server.Access.Systems;
 using Content.Server.Holiday;
 using Content.Server.Humanoid;
 using Content.Server.IdentityManagement;
-using Content.Server.Mind.Commands;
+using Content.Server.Mind;
 using Content.Server.PDA;
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
@@ -46,6 +46,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!;
     private ISharedSponsorsManager? _sponsorsManager; // Sunrise-Sponsors
 
     private bool _randomizeCharacters;
@@ -138,8 +139,8 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
         if (prototype?.JobEntity != null)
         {
             DebugTools.Assert(entity is null);
-            var jobEntity = EntityManager.SpawnEntity(prototype.JobEntity, coordinates);
-            MakeSentientCommand.MakeSentient(jobEntity, EntityManager);
+            var jobEntity = Spawn(prototype.JobEntity, coordinates);
+            _mindSystem.MakeSentient(jobEntity);
 
             // Make sure custom names get handled, what is gameticker control flow whoopy.
             if (loadout != null)
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index 456d3c6b80..dc2ec49dce 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -3,20 +3,16 @@ using Content.Server.Chat.Systems;
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
-using Content.Shared.CCVar;
 using Content.Shared.Station;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
 using Robust.Server.Player;
 using Robust.Shared.Collections;
-using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
-using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Station.Systems;
@@ -34,7 +30,6 @@ public sealed partial class StationSystem : SharedStationSystem
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
-    [Dependency] private readonly MapSystem _map = default!;
     [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!;
 
     private ISawmill _sawmill = default!;
@@ -42,8 +37,8 @@ public sealed partial class StationSystem : SharedStationSystem
     private EntityQuery<MapGridComponent> _gridQuery;
     private EntityQuery<TransformComponent> _xformQuery;
 
-    private ValueList<MapId> _mapIds = new();
-    private ValueList<(Box2Rotated Bounds, MapId MapId)> _gridBounds = new();
+    private ValueList<MapId> _mapIds;
+    private ValueList<(Box2Rotated Bounds, MapId MapId)> _gridBounds;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -79,6 +74,7 @@ public sealed partial class StationSystem : SharedStationSystem
             return;
 
         stationData.Grids.Remove(uid);
+        Dirty(uid, component);
     }
 
     public override void Shutdown()
@@ -193,44 +189,6 @@ public sealed partial class StationSystem : SharedStationSystem
 
     #endregion Event handlers
 
-    /// <summary>
-    /// Gets the largest member grid from a station.
-    /// </summary>
-    public EntityUid? GetLargestGrid(StationDataComponent component)
-    {
-        EntityUid? largestGrid = null;
-        Box2 largestBounds = new Box2();
-
-        foreach (var gridUid in component.Grids)
-        {
-            if (!TryComp<MapGridComponent>(gridUid, out var grid) ||
-                grid.LocalAABB.Size.LengthSquared() < largestBounds.Size.LengthSquared())
-                continue;
-
-            largestBounds = grid.LocalAABB;
-            largestGrid = gridUid;
-        }
-
-        return largestGrid;
-    }
-
-    /// <summary>
-    /// Returns the total number of tiles contained in the station's grids.
-    /// </summary>
-    public int GetTileCount(StationDataComponent component)
-    {
-        var count = 0;
-        foreach (var gridUid in component.Grids)
-        {
-            if (!TryComp<MapGridComponent>(gridUid, out var grid))
-                continue;
-
-            count += _map.GetAllTiles(gridUid, grid).Count();
-        }
-
-        return count;
-    }
-
     /// <summary>
     /// Tries to retrieve a filter for everything in the station the source is on.
     /// </summary>
@@ -384,6 +342,8 @@ public sealed partial class StationSystem : SharedStationSystem
         var stationMember = EnsureComp<StationMemberComponent>(mapGrid);
         stationMember.Station = station;
         stationData.Grids.Add(mapGrid);
+        Dirty(station, stationData);
+        Dirty(mapGrid, stationMember);
 
         RaiseLocalEvent(station, new StationGridAddedEvent(mapGrid, station, false), true);
 
@@ -407,6 +367,7 @@ public sealed partial class StationSystem : SharedStationSystem
 
         RemComp<StationMemberComponent>(mapGrid);
         stationData.Grids.Remove(mapGrid);
+        Dirty(station, stationData);
 
         RaiseLocalEvent(station, new StationGridRemovedEvent(mapGrid, station), true);
         _sawmill.Info($"Removing grid {mapGrid} from station {Name(station)} ({station})");
@@ -450,110 +411,6 @@ public sealed partial class StationSystem : SharedStationSystem
 
         QueueDel(station);
     }
-
-    public EntityUid? GetOwningStation(EntityUid? entity, TransformComponent? xform = null)
-    {
-        if (entity == null)
-            return null;
-
-        return GetOwningStation(entity.Value, xform);
-    }
-
-    /// <summary>
-    /// Gets the station that "owns" the given entity (essentially, the station the grid it's on is attached to)
-    /// </summary>
-    /// <param name="entity">Entity to find the owner of.</param>
-    /// <param name="xform">Resolve pattern, transform of the entity.</param>
-    /// <returns>The owning station, if any.</returns>
-    /// <remarks>
-    /// This does not remember what station an entity started on, it simply checks where it is currently located.
-    /// </remarks>
-    public EntityUid? GetOwningStation(EntityUid entity, TransformComponent? xform = null)
-    {
-        if (!Resolve(entity, ref xform))
-            throw new ArgumentException("Tried to use an abstract entity!", nameof(entity));
-
-        if (TryComp<StationDataComponent>(entity, out _))
-        {
-            // We are the station, just return ourselves.
-            return entity;
-        }
-
-        if (TryComp<MapGridComponent>(entity, out _))
-        {
-            // We are the station, just check ourselves.
-            return CompOrNull<StationMemberComponent>(entity)?.Station;
-        }
-
-        if (xform.GridUid == EntityUid.Invalid)
-        {
-            Log.Debug("Unable to get owning station - GridUid invalid.");
-            return null;
-        }
-
-        return CompOrNull<StationMemberComponent>(xform.GridUid)?.Station;
-    }
-
-    public List<EntityUid> GetStations()
-    {
-        var stations = new List<EntityUid>();
-        var query = EntityQueryEnumerator<StationDataComponent>();
-        while (query.MoveNext(out var uid, out _))
-        {
-            stations.Add(uid);
-        }
-
-        return stations;
-    }
-
-    public HashSet<EntityUid> GetStationsSet()
-    {
-        var stations = new HashSet<EntityUid>();
-        var query = EntityQueryEnumerator<StationDataComponent>();
-        while (query.MoveNext(out var uid, out _))
-        {
-            stations.Add(uid);
-        }
-
-        return stations;
-    }
-
-    public List<(string Name, NetEntity Entity)> GetStationNames()
-    {
-        var stations = GetStationsSet();
-        var stats = new List<(string Name, NetEntity Station)>();
-
-        foreach (var weh in stations)
-        {
-            stats.Add((MetaData(weh).EntityName, GetNetEntity(weh)));
-        }
-
-        return stats;
-    }
-
-    /// <summary>
-    /// Returns the first station that has a grid in a certain map.
-    /// If the map has no stations, null is returned instead.
-    /// </summary>
-    /// <remarks>
-    /// If there are multiple stations on a map it is probably arbitrary which one is returned.
-    /// </remarks>
-    public EntityUid? GetStationInMap(MapId map)
-    {
-        var query = EntityQueryEnumerator<StationDataComponent>();
-        while (query.MoveNext(out var uid, out var data))
-        {
-            foreach (var gridUid in data.Grids)
-            {
-                if (Transform(gridUid).MapID == map)
-                {
-                    return uid;
-                }
-            }
-        }
-
-        return null;
-    }
 }
 
 /// <summary>
diff --git a/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs b/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
index 577d7777d7..a47c1925e2 100644
--- a/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.StationEvents.Events;
 using Content.Shared.Radio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
 namespace Content.Server.StationEvents.Components;
@@ -29,8 +29,8 @@ public sealed partial class SolarFlareRuleComponent : Component
     /// <remarks>
     ///     Channels are not removed from this, so its possible to roll the same channel multiple times.
     /// </remarks>
-    [DataField("extraChannels", customTypeSerializer: typeof(PrototypeIdListSerializer<RadioChannelPrototype>))]
-    public List<String> ExtraChannels = new();
+    [DataField]
+    public List<ProtoId<RadioChannelPrototype>> ExtraChannels = new();
 
     /// <summary>
     ///     Number of times to roll a channel from ExtraChannels.
diff --git a/Content.Server/StationEvents/Components/VentClogRuleComponent.cs b/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
index afb3a36326..d51c48b4ae 100644
--- a/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/VentClogRuleComponent.cs
@@ -1,7 +1,7 @@
 using Content.Server.StationEvents.Events;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents.Components;
 
@@ -12,8 +12,8 @@ public sealed partial class VentClogRuleComponent : Component
     /// Somewhat safe chemicals to put in foam that probably won't instantly kill you.
     /// There is a small chance of using any reagent, ignoring this.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    public IReadOnlyList<string> SafeishVentChemicals = new[]
+    [DataField]
+    public IReadOnlyList<ProtoId<ReagentPrototype>> SafeishVentChemicals = new ProtoId<ReagentPrototype>[]
     {
         "Water", "Blood", "Slime", "SpaceDrugs", "SpaceCleaner", "Nutriment", "Sugar", "SpaceLube", "Ephedrine", "Ale", "Beer", "SpaceGlue"
     };
@@ -45,8 +45,8 @@ public sealed partial class VentClogRuleComponent : Component
     /// <summary>
     /// Reagents that gets the weak numbers used instead of regular ones.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    public IReadOnlyList<string> WeakReagents = new[]
+    [DataField]
+    public IReadOnlyList<ProtoId<ReagentPrototype>> WeakReagents = new ProtoId<ReagentPrototype>[]
     {
         "SpaceLube", "SpaceGlue"
     };
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index 06da91e256..4c9cfd87ea 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,7 +1,7 @@
 using Content.Server.Anomaly;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
-using Content.Shared.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -31,7 +31,7 @@ public sealed class AnomalySpawnRule : StationEventSystem<AnomalySpawnRuleCompon
         if (!TryComp<StationDataComponent>(chosenStation, out var stationData))
             return;
 
-        var grid = StationSystem.GetLargestGrid(stationData);
+        var grid = StationSystem.GetLargestGrid((chosenStation.Value, stationData));
 
         if (grid is null)
             return;
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index 91baf2ecad..d38de1e0d8 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -2,9 +2,9 @@ using System.Linq;
 using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
 using Content.Server.GameTicking;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
index fd680d8989..c5970d0db7 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
@@ -2,7 +2,6 @@ using System.Numerics;
 using Content.Server._Sunrise.Station;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Rules;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
@@ -57,8 +56,8 @@ public sealed class MeteorSwarmSystem : GameRuleSystem<MeteorSwarmComponent>
         if (validStations.Count == 0)
             return;
 
-        var station = RobustRandom.Pick(validStations);
-        if (_station.GetLargestGrid(Comp<StationDataComponent>(station)) is not { } grid)
+        var station = RobustRandom.Pick(_station.GetStations());
+        if (_station.GetLargestGrid(station) is not { } grid)
             return;
 
         var mapId = Transform(grid).MapID;
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index 5c18685018..de6e547ee5 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -11,6 +11,9 @@ namespace Content.Server.StationEvents.Events;
 
 public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRuleComponent>
 {
+    private static readonly ProtoId<LocalizedDatasetPrototype> DataSourceNames = "RandomSentienceEventData";
+    private static readonly ProtoId<LocalizedDatasetPrototype> IntelligenceLevelNames = "RandomSentienceEventStrength";
+
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
@@ -72,8 +75,8 @@ public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRule
             station.Value,
             Loc.GetString("station-event-random-sentience-announcement",
                 ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count),
-                ("data", _random.Pick(_prototype.Index<LocalizedDatasetPrototype>("RandomSentienceEventData"))),
-                ("strength", _random.Pick(_prototype.Index<LocalizedDatasetPrototype>("RandomSentienceEventStrength")))
+                ("data", _random.Pick(_prototype.Index(DataSourceNames))),
+                ("strength", _random.Pick(_prototype.Index(IntelligenceLevelNames)))
             ),
             playDefault: false,
             colorOverride: Color.Gold
diff --git a/Content.Server/StationEvents/Events/SpaceSpawnRule.cs b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
index 6fccaaa5cf..08e43b4c68 100644
--- a/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
@@ -1,6 +1,4 @@
 using Content.Server.Antag;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
@@ -32,10 +30,8 @@ public sealed class SpaceSpawnRule : StationEventSystem<SpaceSpawnRuleComponent>
             return;
         }
 
-        var stationData = Comp<StationDataComponent>(station.Value);
-
         // find a station grid
-        var gridUid = StationSystem.GetLargestGrid(stationData);
+        var gridUid = StationSystem.GetLargestGrid(station.Value);
         if (gridUid == null || !TryComp<MapGridComponent>(gridUid, out var grid))
         {
             Sawmill.Warning("Chosen station has no grids, cannot pick location for {ToPrettyString(uid):rule}");
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index 3b6eeebe85..d93c67ef92 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -1,14 +1,15 @@
+using System.Linq;
 using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using System.Linq;
-using Content.Shared.Chemistry.Reaction;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -27,9 +28,9 @@ public sealed class VentClogRule : StationEventSystem<VentClogRuleComponent>
         // TODO: "safe random" for chems. Right now this includes admin chemicals.
         var allReagents = PrototypeManager.EnumeratePrototypes<ReagentPrototype>()
             .Where(x => !x.Abstract)
-            .Select(x => x.ID).ToList();
+            .Select(x => new ProtoId<ReagentPrototype>(x.ID)).ToList();
 
-        foreach (var (_, transform) in EntityManager.EntityQuery<GasVentPumpComponent, TransformComponent>())
+        foreach (var (_, transform) in EntityQuery<GasVentPumpComponent, TransformComponent>())
         {
             if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation)
             {
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index de5ab7a6ca..11f3fb1bdb 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -95,7 +95,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
             if (component.BehaviorProperties.TransportEntities || component.BehaviorProperties.TransportSentient)
                 foreach (var entity in target.Value.storageComponent.Contents.ContainedEntities.ToArray())
                 {
-                    if (EntityManager.HasComponent<MindContainerComponent>(entity))
+                    if (HasComp<MindContainerComponent>(entity))
                     {
                         if (!component.BehaviorProperties.TransportSentient)
                             continue;
@@ -312,7 +312,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
         if (component.BehaviorProperties.TransportEntities || component.BehaviorProperties.TransportSentient)
             foreach (var entity in entityStorageComponent.Contents.ContainedEntities.ToArray())
             {
-                if (EntityManager.HasComponent<MindContainerComponent>(entity))
+                if (HasComp<MindContainerComponent>(entity))
                 {
                     if (!component.BehaviorProperties.TransportSentient)
                         continue;
diff --git a/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs b/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
index 43fcb32d1f..a1ac2bfdbb 100644
--- a/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
+++ b/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
@@ -13,7 +13,7 @@ namespace Content.Server.Storage.EntitySystems
         [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
         protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
         {
-            if (!EntityManager.TryGetComponent(msg.Container.Owner, out StorageComponent? component))
+            if (!TryComp(msg.Container.Owner, out StorageComponent? component))
             {
                 return null;
             }
diff --git a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
index 859b5a1ebe..683b34e92c 100644
--- a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
+++ b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
@@ -40,7 +40,7 @@ namespace Content.Server.Storage.EntitySystems
                 // Calculate the average price of the possible spawned items
                 args.Price += _pricing.GetPrice(protUid) * entry.SpawnProbability * entry.GetAmount(getAverage: true);
 
-                EntityManager.DeleteEntity(protUid);
+                Del(protUid);
             }
 
             foreach (var group in orGroups)
@@ -54,7 +54,7 @@ namespace Content.Server.Storage.EntitySystems
                                   (entry.SpawnProbability / group.CumulativeProbability) *
                                   entry.GetAmount(getAverage: true);
 
-                    EntityManager.DeleteEntity(protUid);
+                    Del(protUid);
                 }
             }
 
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 4bd8489386..b767cd3689 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -365,7 +365,7 @@ public sealed partial class StoreSystem
 
             _actionContainer.RemoveAction(purchase, logMissing: false);
 
-            EntityManager.DeleteEntity(purchase);
+            Del(purchase);
         }
 
         component.BoughtEntities.Clear();
diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
index b3802b47fe..3983291150 100644
--- a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
+++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
@@ -14,8 +14,7 @@ namespace Content.Server.StoreDiscount.Systems;
 /// </summary>
 public sealed class StoreDiscountSystem : EntitySystem
 {
-    [ValidatePrototypeId<StoreCategoryPrototype>]
-    private const string DiscountedStoreCategoryPrototypeKey = "DiscountedItems";
+    private static readonly ProtoId<StoreCategoryPrototype> DiscountedStoreCategoryPrototypeKey = "DiscountedItems";
 
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Server/Stunnable/Components/StunOnCollideComponent.cs b/Content.Server/Stunnable/Components/StunOnCollideComponent.cs
index 15b41b8271..363fb78b75 100644
--- a/Content.Server/Stunnable/Components/StunOnCollideComponent.cs
+++ b/Content.Server/Stunnable/Components/StunOnCollideComponent.cs
@@ -8,21 +8,47 @@ namespace Content.Server.Stunnable.Components
     {
         // TODO: Can probably predict this.
 
-        // See stunsystem for what these do
-        [DataField("stunAmount")]
-        public float StunAmount;
+        /// <summary>
+        /// How long we are stunned for
+        /// </summary>
+        [DataField]
+        public TimeSpan StunAmount;
 
-        [DataField("knockdownAmount")]
-        public float KnockdownAmount;
+        /// <summary>
+        /// How long we are knocked down for
+        /// </summary>
+        [DataField]
+        public TimeSpan KnockdownAmount;
 
-        [DataField("slowdownAmount")]
-        public float SlowdownAmount;
+        /// <summary>
+        /// How long we are slowed down for
+        /// </summary>
+        [DataField]
+        public TimeSpan SlowdownAmount;
 
-        [DataField("walkSpeedMultiplier")]
-        public float WalkSpeedMultiplier = 1f;
+        /// <summary>
+        /// Multiplier for a mob's walking speed
+        /// </summary>
+        [DataField]
+        public float WalkSpeedModifier = 1f;
 
-        [DataField("runSpeedMultiplier")]
-        public float RunSpeedMultiplier = 1f;
+        /// <summary>
+        /// Multiplier for a mob's sprinting speed
+        /// </summary>
+        [DataField]
+        public float SprintSpeedModifier = 1f;
+
+        /// <summary>
+        /// Refresh Stun or Slowdown on hit
+        /// </summary>
+        [DataField]
+        public bool Refresh = true;
+
+        /// <summary>
+        /// Should the entity try and stand automatically after being knocked down?
+        /// </summary>
+        [DataField]
+        public bool AutoStand = true;
 
         /// <summary>
         /// Fixture we track for the collision.
diff --git a/Content.Server/Stunnable/StunSystem.cs b/Content.Server/Stunnable/StunSystem.cs
new file mode 100644
index 0000000000..5637ad54a7
--- /dev/null
+++ b/Content.Server/Stunnable/StunSystem.cs
@@ -0,0 +1,6 @@
+using Content.Shared.Stunnable;
+
+namespace Content.Server.Stunnable;
+
+public sealed class StunSystem : SharedStunSystem;
+
diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index 52e3cab79c..18c386d4ac 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,18 +21,19 @@ namespace Content.Server.Stunnable
 
         private void TryDoCollideStun(EntityUid uid, StunOnCollideComponent component, EntityUid target)
         {
+            _stunSystem.TryUpdateStunDuration(target, component.StunAmount);
 
-            if (EntityManager.TryGetComponent<StatusEffectsComponent>(target, out var status))
-            {
-                _stunSystem.TryStun(target, TimeSpan.FromSeconds(component.StunAmount), true, status);
+            _stunSystem.TryKnockdown(target, component.KnockdownAmount, component.Refresh, component.AutoStand, force: true);
 
-                _stunSystem.TryKnockdown(target, TimeSpan.FromSeconds(component.KnockdownAmount), true,
-                    status);
-
-                _stunSystem.TrySlowdown(target, TimeSpan.FromSeconds(component.SlowdownAmount), true,
-                    component.WalkSpeedMultiplier, component.RunSpeedMultiplier, status);
-            }
+            _movementMod.TryUpdateMovementSpeedModDuration(
+                target,
+                MovementModStatusSystem.TaserSlowdown,
+                component.SlowdownAmount,
+                component.WalkSpeedModifier,
+                component.SprintSpeedModifier
+            );
         }
+
         private void HandleCollide(EntityUid uid, StunOnCollideComponent component, ref StartCollideEvent args)
         {
             if (args.OurFixtureId != component.FixtureID)
diff --git a/Content.Server/Stunnable/Systems/StunSystem.cs b/Content.Server/Stunnable/Systems/StunSystem.cs
deleted file mode 100644
index 8f793a0a13..0000000000
--- a/Content.Server/Stunnable/Systems/StunSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Stunnable;
-
-namespace Content.Server.Stunnable
-{
-    public sealed class StunSystem : SharedStunSystem
-    {}
-}
diff --git a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
index 8473462f80..b0d41e52c7 100644
--- a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
+++ b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.DeviceNetwork;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.SurveillanceCamera;
 
@@ -43,6 +43,6 @@ public sealed partial class SurveillanceCameraComponent : Component
     public bool NetworkSet { get; set; }
 
     // This has to be device network frequency prototypes.
-    [DataField("setupAvailableNetworks", customTypeSerializer:typeof(PrototypeIdListSerializer<DeviceFrequencyPrototype>))]
-    public List<string> AvailableNetworks { get; private set; } = new();
+    [DataField("setupAvailableNetworks")]
+    public List<ProtoId<DeviceFrequencyPrototype>> AvailableNetworks { get; private set; } = new();
 }
diff --git a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
index 74b2a1b6a2..edd7b092c7 100644
--- a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
+++ b/Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.DeviceNetwork;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.SurveillanceCamera;
 
@@ -26,8 +26,8 @@ public sealed partial class SurveillanceCameraRouterComponent : Component
     [DataField("subnetFrequency", customTypeSerializer:typeof(PrototypeIdSerializer<DeviceFrequencyPrototype>))]
     public string? SubnetFrequencyId { get; set;  }
 
-    [DataField("setupAvailableNetworks", customTypeSerializer:typeof(PrototypeIdListSerializer<DeviceFrequencyPrototype>))]
-    public List<string> AvailableNetworks { get; private set; } = new();
+    [DataField("setupAvailableNetworks")]
+    public List<ProtoId<DeviceFrequencyPrototype>> AvailableNetworks { get; private set; } = new();
 
     // Sunrise-start
     [DataField("subnetColor")]
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index 4deb5238a5..4029488159 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Chat.Systems;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Player;
 using static Content.Server.Chat.Systems.ChatSystem;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index 806c26dec3..0c81cb0474 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -58,7 +58,7 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
             if (monitor.LastHeartbeat > _maxHeartbeatTime)
             {
                 DisconnectCamera(uid, true, monitor);
-                EntityManager.RemoveComponent<ActiveSurveillanceCameraMonitorComponent>(uid);
+                RemComp<ActiveSurveillanceCameraMonitorComponent>(uid);
             }
         }
     }
@@ -294,7 +294,7 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
 
         monitor.ActiveCamera = null;
         monitor.ActiveCameraAddress = string.Empty;
-        EntityManager.RemoveComponent<ActiveSurveillanceCameraMonitorComponent>(uid);
+        RemComp<ActiveSurveillanceCameraMonitorComponent>(uid);
         UpdateUserInterface(uid, monitor);
     }
 
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 58eb8742ba..a7b9c11847 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.
@@ -183,6 +187,7 @@ public sealed class SurveillanceCameraSystem : EntitySystem
         component.CameraId = args.Name;
         component.NameSet = true;
         UpdateSetupInterface(uid, component);
+        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(args.Actor)} set the name of {ToPrettyString(uid)} to \"{args.Name}.\"");
     }
 
     private void OnSetNetwork(EntityUid uid, SurveillanceCameraComponent component,
diff --git a/Content.Server/Tabletop/TabletopSystem.Map.cs b/Content.Server/Tabletop/TabletopSystem.Map.cs
index 837ab2df24..89563ec6bf 100644
--- a/Content.Server/Tabletop/TabletopSystem.Map.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Map.cs
@@ -37,7 +37,7 @@ namespace Content.Server.Tabletop
         /// <returns></returns>
         private Vector2 GetNextTabletopPosition()
         {
-            return UlamSpiral(_tabletops++) * TabletopSeparation;
+            return UlamSpiral(++_tabletops) * TabletopSeparation;
         }
 
         /// <summary>
@@ -52,7 +52,7 @@ namespace Content.Server.Tabletop
             TabletopMap = mapId;
             _tabletops = 0;
 
-            var mapComp = EntityManager.GetComponent<MapComponent>(mapUid);
+            var mapComp = Comp<MapComponent>(mapUid);
 
             // Lighting is always disabled in tabletop world.
             mapComp.LightingEnabled = false;
@@ -62,11 +62,11 @@ namespace Content.Server.Tabletop
         /// <summary>
         ///     Algorithm for mapping scalars to 2D positions in the same pattern as an Ulam Spiral.
         /// </summary>
-        /// <param name="n">Scalar to map to a 2D position.</param>
+        /// <param name="n">Scalar to map to a 2D position. Must be greater than or equal to 1.</param>
         /// <returns>The mapped 2D position for the scalar.</returns>
         private Vector2i UlamSpiral(int n)
         {
-            var k = (int)MathF.Ceiling(MathF.Sqrt(n) - 1) / 2;
+            var k = (int)MathF.Ceiling((MathF.Sqrt(n) - 1) / 2);
             var t = 2 * k + 1;
             var m = (int)MathF.Pow(t, 2);
             t--;
diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs
index c2bb8426fc..2f271b4b66 100644
--- a/Content.Server/Tabletop/TabletopSystem.Session.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Session.cs
@@ -42,7 +42,7 @@ namespace Content.Server.Tabletop
         /// <param name="uid">The UID of the tabletop game entity.</param>
         public void CleanupSession(EntityUid uid)
         {
-            if (!EntityManager.TryGetComponent(uid, out TabletopGameComponent? tabletop))
+            if (!TryComp(uid, out TabletopGameComponent? tabletop))
                 return;
 
             if (tabletop.Session is not { } session)
@@ -55,7 +55,7 @@ namespace Content.Server.Tabletop
 
             foreach (var euid in session.Entities)
             {
-                EntityManager.QueueDeleteEntity(euid);
+                QueueDel(euid);
             }
 
             tabletop.Session = null;
@@ -68,7 +68,7 @@ namespace Content.Server.Tabletop
         /// <param name="uid">The UID of the tabletop game entity.</param>
         public void OpenSessionFor(ICommonSession player, EntityUid uid)
         {
-            if (!EntityManager.TryGetComponent(uid, out TabletopGameComponent? tabletop) || player.AttachedEntity is not {Valid: true} attachedEntity)
+            if (!TryComp(uid, out TabletopGameComponent? tabletop) || player.AttachedEntity is not {Valid: true} attachedEntity)
                 return;
 
             // Make sure we have a session, and add the player to it if not added already.
@@ -77,7 +77,7 @@ namespace Content.Server.Tabletop
             if (session.Players.ContainsKey(player))
                 return;
 
-            if(EntityManager.TryGetComponent(attachedEntity, out TabletopGamerComponent? gamer))
+            if(TryComp(attachedEntity, out TabletopGamerComponent? gamer))
                 CloseSessionFor(player, gamer.Tabletop, false);
 
             // Set the entity as an absolute GAMER.
@@ -100,26 +100,26 @@ namespace Content.Server.Tabletop
         /// <param name="removeGamerComponent">Whether to remove the <see cref="TabletopGamerComponent"/> from the player's attached entity.</param>
         public void CloseSessionFor(ICommonSession player, EntityUid uid, bool removeGamerComponent = true)
         {
-            if (!EntityManager.TryGetComponent(uid, out TabletopGameComponent? tabletop) || tabletop.Session is not { } session)
+            if (!TryComp(uid, out TabletopGameComponent? tabletop) || tabletop.Session is not { } session)
                 return;
 
             if (!session.Players.TryGetValue(player, out var data))
                 return;
 
-            if(removeGamerComponent && player.AttachedEntity is {} attachedEntity && EntityManager.TryGetComponent(attachedEntity, out TabletopGamerComponent? gamer))
+            if(removeGamerComponent && player.AttachedEntity is {} attachedEntity && TryComp(attachedEntity, out TabletopGamerComponent? gamer))
             {
                 // We invalidate this to prevent an infinite feedback from removing the component.
                 gamer.Tabletop = EntityUid.Invalid;
 
                 // You stop being a gamer.......
-                EntityManager.RemoveComponent<TabletopGamerComponent>(attachedEntity);
+                RemComp<TabletopGamerComponent>(attachedEntity);
             }
 
             session.Players.Remove(player);
             session.Entities.Remove(data.Camera);
 
             // Deleting the view subscriber automatically cleans up subscriptions, no need to do anything else.
-            EntityManager.QueueDeleteEntity(data.Camera);
+            QueueDel(data.Camera);
         }
 
         /// <summary>
diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index 6938372233..e771add0e4 100644
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Hands.Systems;
 using Content.Server.Popups;
 using Content.Server.Tabletop.Components;
 using Content.Shared.CCVar;
@@ -22,6 +23,7 @@ namespace Content.Server.Tabletop
     {
         [Dependency] private readonly SharedMapSystem _map = default!;
         [Dependency] private readonly EyeSystem _eye = default!;
+        [Dependency] private readonly HandsSystem _hands = default!;
         [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -78,24 +80,19 @@ namespace Content.Server.Tabletop
             if (!_cfg.GetCVar(CCVars.GameTabletopPlace))
                 return;
 
-            if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands))
+            if (!TryComp(args.User, out HandsComponent? hands))
                 return;
 
             if (component.Session is not { } session)
                 return;
 
-            if (hands.ActiveHand == null)
+            if (!_hands.TryGetActiveItem(uid, out var handEnt))
                 return;
 
-            if (hands.ActiveHand.HeldEntity == null)
-                return;
-
-            var handEnt = hands.ActiveHand.HeldEntity.Value;
-
             if (!TryComp<ItemComponent>(handEnt, out var item))
                 return;
 
-            var meta = MetaData(handEnt);
+            var meta = MetaData(handEnt.Value);
             var protoId = meta.EntityPrototype?.ID;
 
             var hologram = Spawn(protoId, session.Position.Offset(-1, 0));
@@ -131,7 +128,7 @@ namespace Content.Server.Tabletop
             if (!args.CanAccess || !args.CanInteract)
                 return;
 
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            if (!TryComp(args.User, out ActorComponent? actor))
                 return;
 
             var playVerb = new ActivationVerb()
@@ -150,7 +147,7 @@ namespace Content.Server.Tabletop
                 return;
 
             // Check that a player is attached to the entity.
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            if (!TryComp(args.User, out ActorComponent? actor))
                 return;
 
             OpenSessionFor(actor.PlayerSession, uid);
@@ -174,7 +171,7 @@ namespace Content.Server.Tabletop
 
         private void OnGamerShutdown(EntityUid uid, TabletopGamerComponent component, ComponentShutdown args)
         {
-            if (!EntityManager.TryGetComponent(uid, out ActorComponent? actor))
+            if (!TryComp(uid, out ActorComponent? actor))
                 return;
 
             if(component.Tabletop.IsValid())
@@ -193,7 +190,7 @@ namespace Content.Server.Tabletop
 
                 if (!TryComp(uid, out ActorComponent? actor))
                 {
-                    EntityManager.RemoveComponent<TabletopGamerComponent>(uid);
+                    RemComp<TabletopGamerComponent>(uid);
                     return;
                 }
 
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index dd068612f7..46f45d1286 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -3,8 +3,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Labels.Components;
@@ -13,6 +11,7 @@ using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -124,7 +123,7 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
     {
         base.Update(frameTime);
 
-        var query = EntityManager.EntityQueryEnumerator<TelephoneComponent>();
+        var query = EntityQueryEnumerator<TelephoneComponent>();
         while (query.MoveNext(out var uid, out var telephone))
         {
             var entity = new Entity<TelephoneComponent>(uid, telephone);
@@ -490,6 +489,6 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
 
     public bool IsTelephonePowered(Entity<TelephoneComponent> entity)
     {
-        return this.IsPowered(entity, EntityManager) || !entity.Comp.RequiresPower;
+        return this.IsPowered(entity, EntityManager);
     }
 }
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index d2f6baf6f9..6290e8231a 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -36,8 +36,7 @@ public sealed class TemperatureSystem : EntitySystem
 
     private float _accumulatedFrametime;
 
-    [ValidatePrototypeId<AlertCategoryPrototype>]
-    public const string TemperatureAlertCategory = "Temperature";
+    public static readonly ProtoId<AlertCategoryPrototype> TemperatureAlertCategory = "Temperature";
 
     public override void Initialize()
     {
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 36ccd75e5d..66d9383891 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -80,9 +80,13 @@ public sealed class TipsSystem : EntitySystem
     {
         return args.Length switch
         {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("cmd-tippy-auto-1")),
+            1 => CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("cmd-tippy-auto-1")),
             2 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-2")),
-            3 => CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<EntityPrototype>(), Loc.GetString("cmd-tippy-auto-3")),
+            3 => CompletionResult.FromHintOptions(
+                CompletionHelper.PrototypeIdsLimited<EntityPrototype>(args[2], _prototype),
+                Loc.GetString("cmd-tippy-auto-3")),
             4 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-4")),
             5 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-5")),
             6 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-6")),
diff --git a/Content.Server/Toilet/ToiletSystem.cs b/Content.Server/Toilet/ToiletSystem.cs
deleted file mode 100644
index e184ddf0d5..0000000000
--- a/Content.Server/Toilet/ToiletSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Toilet.Systems;
-
-namespace Content.Server.Toilet;
-
-public sealed class ToiletSystem : SharedToiletSystem
-{
-
-}
diff --git a/Content.Server/Tools/Innate/InnateToolSystem.cs b/Content.Server/Tools/Innate/InnateToolSystem.cs
index b8d1dd935c..6afe886303 100644
--- a/Content.Server/Tools/Innate/InnateToolSystem.cs
+++ b/Content.Server/Tools/Innate/InnateToolSystem.cs
@@ -90,9 +90,9 @@ public sealed class InnateToolSystem : EntitySystem
 
             if (TryComp<HandsComponent>(uid, out var hands))
             {
-                foreach (var hand in hands.Hands)
+                foreach (var hand in hands.Hands.Keys)
                 {
-                    _sharedHandsSystem.TryDrop(uid, hand.Value, checkActionBlocker: false, handsComp: hands);
+                    _sharedHandsSystem.TryDrop((uid, hands), hand, checkActionBlocker: false);
                 }
             }
         }
diff --git a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs
index a88dbd3653..c8defb5ef9 100644
--- a/Content.Server/Tools/ToolSystem.cs
+++ b/Content.Server/Tools/ToolSystem.cs
@@ -1,47 +1,5 @@
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.FixedPoint;
-using Content.Shared.Tools.Components;
-
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+using Content.Shared.Tools.Systems;
 
 namespace Content.Server.Tools;
 
-public sealed class ToolSystem : SharedToolSystem
-{
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        UpdateWelders(frameTime);
-    }
-
-    //todo move to shared once you can remove reagents from shared without it freaking out.
-    private void UpdateWelders(float frameTime)
-    {
-        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
-        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
-        {
-            if (!welder.Enabled)
-                continue;
-
-            welder.WelderTimer += frameTime;
-
-            if (welder.WelderTimer < welder.WelderUpdateTimer)
-                continue;
-
-            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
-                continue;
-
-            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderTimer);
-
-            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
-            {
-                ItemToggle.Toggle(uid, predicted: false);
-            }
-
-            Dirty(uid, welder);
-            welder.WelderTimer -= welder.WelderUpdateTimer;
-        }
-    }
-}
-
+public sealed class ToolSystem : SharedToolSystem;
diff --git a/Content.Server/Toolshed/Commands/Misc/ScaleCommand.cs b/Content.Server/Toolshed/Commands/Misc/ScaleCommand.cs
new file mode 100644
index 0000000000..67bd21737f
--- /dev/null
+++ b/Content.Server/Toolshed/Commands/Misc/ScaleCommand.cs
@@ -0,0 +1,82 @@
+using System.Numerics;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Sprite;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Toolshed.Commands.Misc;
+
+/// <summary>
+/// Used to change an entity's sprite scale.
+/// </summary>
+[ToolshedCommand, AdminCommand(AdminFlags.VarEdit)]
+public sealed class ScaleCommand : ToolshedCommand
+{
+    private SharedScaleVisualsSystem? _scaleVisuals;
+    private SharedPhysicsSystem? _physics;
+
+    [CommandImplementation("set")]
+    public IEnumerable<EntityUid> Set([PipedArgument] IEnumerable<EntityUid> input, Vector2 scale)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("multiply")]
+    public IEnumerable<EntityUid> Multiply([PipedArgument] IEnumerable<EntityUid> input, float factor)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            var scale = _scaleVisuals.GetSpriteScale(ent) * factor;
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("multiplyvector")]
+    public IEnumerable<EntityUid> Multiply([PipedArgument] IEnumerable<EntityUid> input, Vector2 factor)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            var scale = _scaleVisuals.GetSpriteScale(ent) * factor;
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("multiplywithfixture")]
+    public IEnumerable<EntityUid> MultiplyWithFixture([PipedArgument] IEnumerable<EntityUid> input, float factor)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+        _physics ??= GetSys<SharedPhysicsSystem>();
+
+        foreach (var ent in input)
+        {
+            var scale = _scaleVisuals.GetSpriteScale(ent) * factor;
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            _physics.ScaleFixtures(ent, factor);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("get")]
+    public IEnumerable<Vector2> Get([PipedArgument] IEnumerable<EntityUid> input)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            yield return _scaleVisuals.GetSpriteScale(ent);
+        }
+    }
+}
diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
index d251d66898..5204aa01be 100644
--- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
+++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
@@ -14,9 +14,9 @@ public sealed class RunVerbAsCommand : ToolshedCommand
     private SharedVerbSystem? _verb;
 
     [CommandImplementation]
-    public IEnumerable<NetEntity> RunVerbAs(
+    public IEnumerable<EntityUid> RunVerbAs(
             IInvocationContext ctx,
-            [PipedArgument] IEnumerable<NetEntity> input,
+            [PipedArgument] IEnumerable<EntityUid> input,
             EntityUid runner,
             string verb
         )
@@ -24,7 +24,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand
         _verb ??= GetSys<SharedVerbSystem>();
         verb = verb.ToLowerInvariant();
 
-        foreach (var i in input)
+        foreach (var eId in input)
         {
             if (EntityManager.Deleted(runner) && runner.IsValid())
                 ctx.ReportError(new DeadEntity(runner));
@@ -32,7 +32,6 @@ public sealed class RunVerbAsCommand : ToolshedCommand
             if (ctx.GetErrors().Any())
                 yield break;
 
-            var eId = EntityManager.GetEntity(i);
             var verbs = _verb.GetLocalVerbs(eId, runner, Verb.VerbTypes, true);
 
             // if the "verb name" is actually a verb-type, try run any verb of that type.
@@ -43,7 +42,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand
                 if (verbTy != null)
                 {
                     _verb.ExecuteVerb(verbTy, runner, eId, forced: true);
-                    yield return i;
+                    yield return eId;
                 }
             }
 
@@ -52,7 +51,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand
                 if (verbTy.Text.ToLowerInvariant() == verb)
                 {
                     _verb.ExecuteVerb(verbTy, runner, eId, forced: true);
-                    yield return i;
+                    yield return eId;
                 }
             }
         }
diff --git a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
index f5fde87c11..8350c01f7a 100644
--- a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
+++ b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
@@ -1,104 +1,90 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.CCVar;
-using Content.Shared.FixedPoint;
 using Robust.Server.Player;
-using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Player;
 
-namespace Content.Server.Traitor.Uplink.Commands
+namespace Content.Server.Traitor.Uplink.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AddUplinkCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class AddUplinkCommand : IConsoleCommand
+    [Dependency] private readonly UplinkSystem _uplinkSystem = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    public override string Command => "adduplink";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-
-        public string Command => "adduplink";
-
-        public string Description => Loc.GetString("add-uplink-command-description");
-
-        public string Help => Loc.GetString("add-uplink-command-help");
-
-
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        if (args.Length > 3)
         {
-            return args.Length switch
-            {
-                1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("add-uplink-command-completion-1")),
-                2 => CompletionResult.FromHint(Loc.GetString("add-uplink-command-completion-2")),
-                3 => CompletionResult.FromHint(Loc.GetString("add-uplink-command-completion-3")),
-                _ => CompletionResult.Empty
-            };
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
         }
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        ICommonSession? session;
+        if (args.Length > 0)
         {
-            if (args.Length > 3)
+            // Get player entity
+            if (!_playerManager.TryGetSessionByUsername(args[0], out session))
             {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+                shell.WriteLine(Loc.GetString("shell-target-player-does-not-exist"));
+                return;
+            }
+        }
+        else
+            session = shell.Player;
+
+        if (session?.AttachedEntity is not { } user)
+        {
+            shell.WriteLine(Loc.GetString("add-uplink-command-error-1"));
+            return;
+        }
+
+        // Get target item
+        EntityUid? uplinkEntity = null;
+        if (args.Length >= 2)
+        {
+            if (!int.TryParse(args[1], out var itemId))
+            {
+                shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number"));
                 return;
             }
 
-            ICommonSession? session;
-            if (args.Length > 0)
-            {
-                // Get player entity
-                if (!_playerManager.TryGetSessionByUsername(args[0], out session))
-                {
-                    shell.WriteLine(Loc.GetString("shell-target-player-does-not-exist"));
-                    return;
-                }
-            }
-            else
-            {
-                session = shell.Player;
-            }
+            var eNet = new NetEntity(itemId);
 
-            if (session?.AttachedEntity is not { } user)
+            if (!EntityManager.TryGetEntity(eNet, out var eUid))
             {
-                shell.WriteLine(Loc.GetString("add-uplink-command-error-1"));
+                shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
                 return;
             }
 
-            // Get target item
-            EntityUid? uplinkEntity = null;
-            if (args.Length >= 2)
+            uplinkEntity = eUid;
+        }
+
+        var isDiscounted = false;
+        if (args.Length >= 3)
+        {
+            if (!bool.TryParse(args[2], out isDiscounted))
             {
-                if (!int.TryParse(args[1], out var itemID))
-                {
-                    shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number"));
-                    return;
-                }
-
-                var eNet = new NetEntity(itemID);
-
-                if (!_entManager.TryGetEntity(eNet, out var eUid))
-                {
-                    shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
-                    return;
-                }
-
-                uplinkEntity = eUid;
-            }
-
-            bool isDiscounted = false;
-            if (args.Length >= 3)
-            {
-                if (!bool.TryParse(args[2], out isDiscounted))
-                {
-                    shell.WriteLine(Loc.GetString("shell-invalid-bool"));
-                    return;
-                }
-            }
-
-            // Finally add uplink
-            var uplinkSys = _entManager.System<UplinkSystem>();
-            if (!uplinkSys.AddUplink(user, 20, uplinkEntity: uplinkEntity, giveDiscounts: isDiscounted))
-            {
-                shell.WriteLine(Loc.GetString("add-uplink-command-error-2"));
+                shell.WriteLine(Loc.GetString("shell-invalid-bool"));
+                return;
             }
         }
+
+        // Finally add uplink
+        if (!_uplinkSystem.AddUplink(user, 20, uplinkEntity: uplinkEntity, giveDiscounts: isDiscounted))
+            shell.WriteLine(Loc.GetString("add-uplink-command-error-2"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        return args.Length switch
+        {
+            1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("add-uplink-command-completion-1")),
+            2 => CompletionResult.FromHint(Loc.GetString("add-uplink-command-completion-2")),
+            3 => CompletionResult.FromHint(Loc.GetString("add-uplink-command-completion-3")),
+            _ => CompletionResult.Empty,
+        };
     }
 }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 87092b4476..06c3c10ff5 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -24,10 +24,9 @@ public sealed class UplinkSystem : EntitySystem
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
 
-    [ValidatePrototypeId<CurrencyPrototype>]
-    public const string TelecrystalCurrencyPrototype = "Telecrystal";
-    private const string FallbackUplinkImplant = "UplinkImplant";
-    private const string FallbackUplinkCatalog = "UplinkUplinkImplanter";
+    public static readonly ProtoId<CurrencyPrototype> TelecrystalCurrencyPrototype = "Telecrystal";
+    private static readonly EntProtoId FallbackUplinkImplant = "UplinkImplant";
+    private static readonly ProtoId<ListingPrototype> FallbackUplinkCatalog = "UplinkUplinkImplanter";
 
     /// <summary>
     /// Adds an uplink to the target
@@ -91,8 +90,6 @@ public sealed class UplinkSystem : EntitySystem
     /// </summary>
     private bool ImplantUplink(EntityUid user, FixedPoint2 balance, bool giveDiscounts)
     {
-        var implantProto = new string(FallbackUplinkImplant);
-
         if (!_proto.TryIndex<ListingPrototype>(FallbackUplinkCatalog, out var catalog))
             return false;
 
@@ -104,7 +101,7 @@ public sealed class UplinkSystem : EntitySystem
         else
             balance = balance - cost;
 
-        var implant = _subdermalImplant.AddImplant(user, implantProto);
+        var implant = _subdermalImplant.AddImplant(user, FallbackUplinkImplant);
 
         if (!HasComp<StoreComponent>(implant))
             return false;
diff --git a/Content.Server/Traits/Assorted/NarcolepsySystem.cs b/Content.Server/Traits/Assorted/NarcolepsySystem.cs
index 893e440dae..eccbee6a4f 100644
--- a/Content.Server/Traits/Assorted/NarcolepsySystem.cs
+++ b/Content.Server/Traits/Assorted/NarcolepsySystem.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 using Content.Shared.Bed.Sleep;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.Random;
 using System.Numerics;
 
@@ -11,9 +11,6 @@ namespace Content.Server.Traits.Assorted;
 /// </summary>
 public sealed class NarcolepsySystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string StatusEffectKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
-
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
@@ -66,8 +63,7 @@ public sealed class NarcolepsySystem : EntitySystem
             // Make sure the sleep time doesn't cut into the time to next incident.
             narcolepsy.NextIncidentTime += duration;
 
-            _statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(uid, StatusEffectKey,
-                TimeSpan.FromSeconds(duration), false);
+            _statusEffects.TryAddStatusEffectDuration(uid, SleepingSystem.StatusEffectForcedSleeping, TimeSpan.FromSeconds(duration));
         }
     }
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 38cbc1859c..59cb9537f2 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -55,7 +55,7 @@ public sealed class TraitSystem : EntitySystem
                 continue;
 
             var coords = Transform(args.Mob).Coordinates;
-            var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
+            var inhandEntity = Spawn(traitPrototype.TraitGear, coords);
             _sharedHandsSystem.TryPickup(args.Mob,
                 inhandEntity,
                 checkActionBlocker: false,
diff --git a/Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
similarity index 74%
rename from Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
index 0c9734b943..1a3e49dd44 100644
--- a/Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
@@ -1,8 +1,9 @@
 using Content.Server.AlertLevel;
-using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Content.Server.Station.Systems;
 
-namespace Content.Server.AlertLevel.Systems;
+namespace Content.Server.Trigger.Systems;
 
 public sealed class AlertLevelChangeOnTriggerSystem : EntitySystem
 {
@@ -18,10 +19,14 @@ public sealed class AlertLevelChangeOnTriggerSystem : EntitySystem
 
     private void OnTrigger(Entity<AlertLevelChangeOnTriggerComponent> ent, ref TriggerEvent args)
     {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
         var stationUid = _station.GetOwningStation(ent.Owner);
-        if (!stationUid.HasValue)
+        if (stationUid == null)
             return;
 
         _alertLevelSystem.SetLevel(stationUid.Value, ent.Comp.Level, ent.Comp.PlaySound, ent.Comp.Announce, ent.Comp.Force);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs
new file mode 100644
index 0000000000..0fae6ff1c5
--- /dev/null
+++ b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Server.GhostKick;
+using Robust.Shared.Player;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class GhostKickUserOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly GhostKickManager _ghostKickManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GhostKickOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<GhostKickOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp(target, out ActorComponent? actor))
+            return;
+
+        _ghostKickManager.DoDisconnect(
+            actor.PlayerSession.Channel,
+            Loc.GetString(ent.Comp.Reason));
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
similarity index 66%
rename from Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
index 0e9dd56622..f4d88b774a 100644
--- a/Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
@@ -1,10 +1,9 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.IgnitionSource;
-using Content.Shared.Timing;
-using Robust.Shared.Audio.Systems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Timing;
 
-namespace Content.Server.IgnitionSource;
+namespace Content.Server.Trigger.Systems;
 
 /// <summary>
 /// Handles igniting when triggered and stopping ignition after the delay.
@@ -13,8 +12,6 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedIgnitionSourceSystem _source = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
@@ -23,6 +20,8 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
         SubscribeLocalEvent<IgniteOnTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
+    // TODO: move this into ignition source component
+    // it already has an update loop
     public override void Update(float deltaTime)
     {
         base.Update(deltaTime);
@@ -42,14 +41,18 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
 
     private void OnTrigger(Entity<IgniteOnTriggerComponent> ent, ref TriggerEvent args)
     {
-        // prevent spamming sound and ignition
-        if (!TryComp(ent.Owner, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((ent.Owner, useDelay)))
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
             return;
 
-        _source.SetIgnited(ent.Owner);
-        _audio.PlayPvs(ent.Comp.IgniteSound, ent);
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
 
-        _useDelay.TryResetDelay((ent.Owner, useDelay));
+        if (target == null)
+            return;
+
+        _source.SetIgnited(target.Value);
         ent.Comp.IgnitedUntil = _timing.CurTime + ent.Comp.IgnitedTime;
+        Dirty(ent);
+
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs
new file mode 100644
index 0000000000..8b4741b9ad
--- /dev/null
+++ b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs
@@ -0,0 +1,51 @@
+using Content.Server.Polymorph.Systems;
+using Content.Shared.Polymorph;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed partial class PolymorphOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+
+    /// <summary>
+    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
+    /// an entity we're colliding with in case of TriggerOnCollide.
+    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
+    /// </summary>
+    private Queue<(EntityUid Uid, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _queuedPolymorphUpdates.Enqueue((target.Value, ent.Comp.Polymorph));
+        args.Handled = true;
+    }
+
+    public override void Update(float frametime)
+    {
+        while (_queuedPolymorphUpdates.TryDequeue(out var data))
+        {
+            if (TerminatingOrDeleted(data.Uid))
+                continue;
+
+            _polymorph.PolymorphEntity(data.Uid, data.Polymorph);
+        }
+    }
+}
diff --git a/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs
new file mode 100644
index 0000000000..963ac36b7f
--- /dev/null
+++ b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs
@@ -0,0 +1,49 @@
+using Content.Server.Radio.EntitySystems;
+using Content.Server.Pinpointer;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class RattleOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly RadioSystem _radio = default!;
+    [Dependency] private readonly NavMapSystem _navMap = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RattleOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<RattleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<MobStateComponent>(target.Value, out var mobstate))
+            return;
+
+        args.Handled = true;
+
+        if (!ent.Comp.Messages.TryGetValue(mobstate.CurrentState, out var messageId))
+            return;
+
+        // Gets the location of the user
+        var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(target.Value));
+
+        var message = Loc.GetString(messageId, ("user", target.Value), ("position", posText));
+        // Sends a message to the radio channel specified by the implant
+        _radio.SendRadioMessage(ent.Owner, message, _prototypeManager.Index(ent.Comp.RadioChannel), ent.Owner);
+    }
+}
diff --git a/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
new file mode 100644
index 0000000000..a38ca2a759
--- /dev/null
+++ b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,48 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ReleaseGasOnTriggerComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (!comp.Active || comp.NextReleaseTime > curTime)
+                continue;
+
+            var giverGasMix = comp.Air.Remove(comp.StartingTotalMoles * comp.RemoveFraction);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, false, true);
+
+            if (environment == null)
+            {
+                _appearance.SetData(uid, ReleaseGasOnTriggerVisuals.Key, false);
+                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
+                continue;
+            }
+
+            _atmosphereSystem.Merge(environment, giverGasMix);
+            comp.NextReleaseTime += comp.ReleaseInterval;
+
+            if (comp.PressureLimit != 0 && environment.Pressure >= comp.PressureLimit ||
+                comp.Air.TotalMoles <= 0)
+            {
+                _appearance.SetData(uid, ReleaseGasOnTriggerVisuals.Key, false);
+                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs
new file mode 100644
index 0000000000..97799b9cc6
--- /dev/null
+++ b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs
@@ -0,0 +1,68 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Maps;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map;
+
+namespace Content.Server.Trigger.Systems;
+
+/// <summary>
+/// Handles creating smoke when <see cref="SmokeOnTriggerComponent"/> is triggered.
+/// </summary>
+public sealed class SmokeOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmokeOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<SmokeOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        // TODO: move all of this into an API function in SmokeSystem
+        var xform = Transform(target.Value);
+        var mapCoords = _transform.GetMapCoordinates(target.Value, xform);
+        if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var gridComp) ||
+            !_map.TryGetTileRef(gridUid, gridComp, xform.Coordinates, out var tileRef) ||
+            tileRef.Tile.IsEmpty)
+        {
+            return;
+        }
+
+        if (_spreader.RequiresFloorToSpread(ent.Comp.SmokePrototype.ToString()) && _turf.IsSpace(tileRef))
+            return;
+
+        var coords = _map.MapToGrid(gridUid, mapCoords);
+        var smoke = Spawn(ent.Comp.SmokePrototype, coords.SnapToGrid());
+        if (!TryComp<SmokeComponent>(smoke, out var smokeComp))
+        {
+            Log.Error($"Smoke prototype {ent.Comp.SmokePrototype} was missing SmokeComponent");
+            Del(smoke);
+            return;
+        }
+
+        _smoke.StartSmoke(smoke, ent.Comp.Solution, (float)ent.Comp.Duration.TotalSeconds, ent.Comp.SpreadAmount, smokeComp);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
similarity index 53%
rename from Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
index 28be6a5373..6da6f707c1 100644
--- a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
@@ -1,13 +1,13 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Timing;
+using Content.Server.Chat.Systems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Chat.Systems;
+namespace Content.Server.Trigger.Systems;
 
 public sealed class SpeakOnTriggerSystem : EntitySystem
 {
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
@@ -15,32 +15,34 @@ public sealed class SpeakOnTriggerSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<SpeakOnTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
     private void OnTrigger(Entity<SpeakOnTriggerComponent> ent, ref TriggerEvent args)
     {
-        TrySpeak(ent);
-        args.Handled = true;
-    }
-
-    private void TrySpeak(Entity<SpeakOnTriggerComponent> ent)
-    {
-        // If it doesn't have the use delay component, still send the message.
-        if (TryComp<UseDelayComponent>(ent.Owner, out var useDelay) && _useDelay.IsDelayed((ent.Owner, useDelay)))
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
             return;
 
-        var message = Loc.GetString(_random.Pick(messagePack.Values));
+        string message;
+        if (ent.Comp.Text != null)
+            message = Loc.GetString(ent.Comp.Text);
+        else
+        {
+            if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+                return;
+            message = Loc.GetString(_random.Pick(messagePack.Values));
+        }
         // Chatcode moment: messages starting with "." are considered radio messages.
         // Prepending ">" forces the message to be spoken instead.
         // TODO chat refactor: remove this
         message = '>' + message;
-        _chat.TrySendInGameICMessage(ent.Owner, message, InGameICChatType.Speak, true);
-
-        if (useDelay != null)
-            _useDelay.TryResetDelay((ent.Owner, useDelay));
+        _chat.TrySendInGameICMessage(target.Value, message, InGameICChatType.Speak, true);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Turrets/DeployableTurretSystem.cs b/Content.Server/Turrets/DeployableTurretSystem.cs
index 9bb382badf..2599285bdc 100644
--- a/Content.Server/Turrets/DeployableTurretSystem.cs
+++ b/Content.Server/Turrets/DeployableTurretSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.DeviceNetwork.Systems;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Ranged;
 using Content.Server.Power.Components;
-using Content.Server.Repairable;
 using Content.Server.TurretController;
 using Content.Shared.Access;
 using Content.Shared.Destructible;
@@ -11,6 +10,7 @@ using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
+using Content.Shared.Repairable;
 using Content.Shared.Turrets;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
diff --git a/Content.Server/UserInterface/StatValuesCommand.cs b/Content.Server/UserInterface/StatValuesCommand.cs
index d64984b574..263dfa8b9e 100644
--- a/Content.Server/UserInterface/StatValuesCommand.cs
+++ b/Content.Server/UserInterface/StatValuesCommand.cs
@@ -6,10 +6,12 @@ using Content.Server.EUI;
 using Content.Server.Item;
 using Content.Server.Power.Components;
 using Content.Shared.Administration;
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.Item;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.UserInterface;
 using Content.Shared.Weapons.Melee;
+using Content.Shared.Wieldable.Components;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -170,10 +172,13 @@ public sealed class StatValuesCommand : IConsoleCommand
         return state;
     }
 
+    private static readonly ProtoId<DamageTypePrototype> StructuralDamageType = "Structural";
+
     private StatValuesEuiMessage GetMelee()
     {
         var values = new List<string[]>();
         var meleeName = _entManager.ComponentFactory.GetComponentName<MeleeWeaponComponent>();
+        var increaseDamageName = _entManager.ComponentFactory.GetComponentName<IncreaseDamageOnWieldComponent>();
 
         foreach (var proto in _proto.EnumeratePrototypes<EntityPrototype>())
         {
@@ -186,26 +191,45 @@ public sealed class StatValuesCommand : IConsoleCommand
 
             var comp = (MeleeWeaponComponent) meleeComp.Component;
 
-            // TODO: Wielded damage
             // TODO: Esword damage
 
+            var structuralDamage = comp.Damage.DamageDict.GetValueOrDefault(StructuralDamageType);
+            var baseDamage = comp.Damage.GetTotal() - comp.Damage.DamageDict.GetValueOrDefault(StructuralDamageType);
+
+            var wieldedStructuralDamage = "-";
+            var wieldedDamage = "-";
+            if (proto.Components.TryGetValue(increaseDamageName, out var increaseDamageComp))
+            {
+                var comp2 = (IncreaseDamageOnWieldComponent) increaseDamageComp.Component;
+
+                wieldedStructuralDamage = (structuralDamage + comp2.BonusDamage.DamageDict.GetValueOrDefault(StructuralDamageType)).ToString();
+                wieldedDamage = (baseDamage + comp2.BonusDamage.GetTotal() - comp2.BonusDamage.DamageDict.GetValueOrDefault(StructuralDamageType)).ToString();
+            }
+
             values.Add(new[]
             {
                 proto.ID,
-                (comp.Damage.GetTotal() * comp.AttackRate).ToString(),
-                comp.AttackRate.ToString(CultureInfo.CurrentCulture),
-                comp.Damage.GetTotal().ToString(),
-                comp.Range.ToString(CultureInfo.CurrentCulture),
+                baseDamage.ToString(),
+                wieldedDamage,
+                comp.AttackRate.ToString("0.00", CultureInfo.CurrentCulture),
+                (comp.AttackRate * baseDamage).Float().ToString("0.00", CultureInfo.CurrentCulture),
+                structuralDamage.ToString(),
+                wieldedStructuralDamage,
             });
         }
 
-        var state = new StatValuesEuiMessage()
+        var state = new StatValuesEuiMessage
         {
-            Title = "Cargo sell prices",
-            Headers = new List<string>()
+            Title = Loc.GetString("stat-melee-values"),
+            Headers = new List<string>
             {
-                "ID",
-                "Price",
+                Loc.GetString("stat-melee-id"),
+                Loc.GetString("stat-melee-base-damage"),
+                Loc.GetString("stat-melee-wield-damage"),
+                Loc.GetString("stat-melee-attack-rate"),
+                Loc.GetString("stat-melee-dps"),
+                Loc.GetString("stat-melee-structural-damage"),
+                Loc.GetString("stat-melee-structural-wield-damage"),
             },
             Values = values,
         };
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index fda8f06820..23a744ddd6 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Cargo.Systems;
 using Content.Server.Emp;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Vocalization.Systems;
 using Content.Shared.Cargo;
 using Content.Shared.Damage;
 using Content.Shared.Destructible;
@@ -42,6 +43,7 @@ namespace Content.Server.VendingMachines
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamageChanged);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
             SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse);
+            SubscribeLocalEvent<VendingMachineComponent, TryVocalizeEvent>(OnTryVocalize);
 
             SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
 
@@ -309,5 +311,10 @@ namespace Content.Server.VendingMachines
                 component.NextEmpEject = _timing.CurTime;
             }
         }
+
+        private void OnTryVocalize(Entity<VendingMachineComponent> ent, ref TryVocalizeEvent args)
+        {
+            args.Cancelled |= ent.Comp.Broken;
+        }
     }
 }
diff --git a/Content.Server/Verbs/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs
index a0ca0a80df..871b75f7f0 100644
--- a/Content.Server/Verbs/VerbSystem.cs
+++ b/Content.Server/Verbs/VerbSystem.cs
@@ -1,10 +1,10 @@
 using System.Linq;
 using Content.Server.Administration.Managers;
+using Content.Server.Hands.Systems;
 using Content.Server.Popups;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
-using Content.Shared.Hands.Components;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
@@ -14,6 +14,7 @@ namespace Content.Server.Verbs
     public sealed class VerbSystem : SharedVerbSystem
     {
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly HandsSystem _hands = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IAdminManager _adminMgr = default!;
 
@@ -28,7 +29,7 @@ namespace Content.Server.Verbs
         {
             var player = eventArgs.SenderSession;
 
-            if (!EntityManager.EntityExists(GetEntity(args.EntityUid)))
+            if (!Exists(GetEntity(args.EntityUid)))
             {
                 Log.Warning($"{nameof(HandleVerbRequest)} called on a non-existent entity with id {args.EntityUid} by player {player}.");
                 return;
@@ -91,8 +92,7 @@ namespace Content.Server.Verbs
         {
             // first get the held item. again.
             EntityUid? holding = null;
-            if (TryComp(user, out HandsComponent? hands) &&
-                hands.ActiveHandEntity is EntityUid heldEntity)
+            if (_hands.GetActiveItem(user) is { } heldEntity)
             {
                 holding = heldEntity;
             }
diff --git a/Content.Server/Vocalization/Components/DatasetVocalizerComponent.cs b/Content.Server/Vocalization/Components/DatasetVocalizerComponent.cs
new file mode 100644
index 0000000000..c64fe017da
--- /dev/null
+++ b/Content.Server/Vocalization/Components/DatasetVocalizerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// A simple message provider for <see cref="VocalizationSystem"/> that randomly selects
+/// messages from a <see cref="LocalizedDatasetPrototype"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class DatasetVocalizerComponent : Component
+{
+    /// <summary>
+    /// ID of the <see cref="LocalizedDatasetPrototype"/> that will provide messages.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype> Dataset;
+}
diff --git a/Content.Server/Vocalization/Components/RadioVocalizerComponent.cs b/Content.Server/Vocalization/Components/RadioVocalizerComponent.cs
new file mode 100644
index 0000000000..1344beaa73
--- /dev/null
+++ b/Content.Server/Vocalization/Components/RadioVocalizerComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// Makes an entity able to vocalize through an equipped radio
+/// </summary>
+[RegisterComponent]
+public sealed partial class RadioVocalizerComponent : Component
+{
+    /// <summary>
+    /// chance the vocalizing entity speaks on the radio.
+    /// </summary>
+    [DataField]
+    public float RadioAttemptChance = 0.6f;
+}
diff --git a/Content.Server/Vocalization/Components/VocalizerComponent.cs b/Content.Server/Vocalization/Components/VocalizerComponent.cs
new file mode 100644
index 0000000000..f5bb37a335
--- /dev/null
+++ b/Content.Server/Vocalization/Components/VocalizerComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// Makes an entity vocalize at set intervals
+/// </summary>
+[RegisterComponent]
+[AutoGenerateComponentPause]
+public sealed partial class VocalizerComponent : Component
+{
+    /// <summary>
+    /// Minimum time to wait after speaking to vocalize again
+    /// </summary>
+    [DataField]
+    public TimeSpan MinVocalizeInterval = TimeSpan.FromMinutes(2);
+
+    /// <summary>
+    /// Maximum time to wait after speaking to vocalize again
+    /// </summary>
+    [DataField]
+    public TimeSpan MaxVocalizeInterval = TimeSpan.FromMinutes(6);
+
+    /// <summary>
+    /// Next time at which to vocalize
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextVocalizeInterval = TimeSpan.Zero;
+
+    /// <summary>
+    /// If true, messages spoken by this vocalizer will not be logged in the chat window
+    /// and will only be shown as speech bubbles.
+    /// </summary>
+    [DataField]
+    public bool HideChat;
+}
diff --git a/Content.Server/Vocalization/Components/VocalizerRequiresPowerComponent.cs b/Content.Server/Vocalization/Components/VocalizerRequiresPowerComponent.cs
new file mode 100644
index 0000000000..69de671787
--- /dev/null
+++ b/Content.Server/Vocalization/Components/VocalizerRequiresPowerComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Server.Vocalization.Components;
+
+/// <summary>
+/// Used in combination with <see cref="VocalizerComponent"/>.
+/// Blocks any attempts to vocalize if the entity has an <see cref="ApcPowerReceiverComponent"/>
+/// and is currently unpowered.
+/// </summary>
+[RegisterComponent]
+public sealed partial class VocalizerRequiresPowerComponent : Component;
diff --git a/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs b/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs
new file mode 100644
index 0000000000..fcca5605f4
--- /dev/null
+++ b/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Vocalization.Components;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Vocalization.Systems;
+
+/// <inheritdoc cref="DatasetVocalizerComponent"/>
+public sealed class DatasetVocalizationSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DatasetVocalizerComponent, TryVocalizeEvent>(OnTryVocalize);
+    }
+
+    private void OnTryVocalize(Entity<DatasetVocalizerComponent> ent, ref TryVocalizeEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var dataset = _protoMan.Index(ent.Comp.Dataset);
+
+        args.Message = _random.Pick(dataset);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs b/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs
new file mode 100644
index 0000000000..bdb14168bb
--- /dev/null
+++ b/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs
@@ -0,0 +1,98 @@
+using Content.Server.Chat.Systems;
+using Content.Server.Radio.Components;
+using Content.Server.Vocalization.Components;
+using Content.Shared.Chat;
+using Content.Shared.Inventory;
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Vocalization.Systems;
+
+/// <summary>
+/// RadioVocalizationSystem handles vocalizing things via equipped radios when a VocalizeEvent is fired
+/// </summary>
+public sealed partial class RadioVocalizationSystem : EntitySystem
+{
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RadioVocalizerComponent, VocalizeEvent>(OnVocalize);
+    }
+
+    /// <summary>
+    /// Called whenever an entity with a VocalizerComponent tries to speak
+    /// </summary>
+    private void OnVocalize(Entity<RadioVocalizerComponent> entity, ref VocalizeEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // set to handled if we succeed in speaking on the radio
+        args.Handled = TrySpeakRadio(entity.Owner, args.Message);
+    }
+
+    /// <summary>
+    /// Selects a random radio channel from all ActiveRadio entities in a given entity's inventory
+    /// If no channels are found, this returns false and sets channel to an empty string
+    /// </summary>
+    private bool TryPickRandomRadioChannel(EntityUid entity, out string channel)
+    {
+        HashSet<string> potentialChannels = [];
+
+        // we don't have to check if this entity has an inventory. GetHandOrInventoryEntities will not yield anything
+        // if an entity has no inventory or inventory slots
+        foreach (var item in _inventory.GetHandOrInventoryEntities(entity))
+        {
+            if (!TryComp<ActiveRadioComponent>(item, out var radio))
+                continue;
+
+            potentialChannels.UnionWith(radio.Channels);
+        }
+
+        if (potentialChannels.Count == 0)
+        {
+            channel = string.Empty;
+            return false;
+        }
+
+        channel = _random.Pick(potentialChannels);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to speak on the radio. Returns false if there is no radio or talking on radio fails somehow
+    /// </summary>
+    /// <param name="entity">Entity to try and make speak on the radio</param>
+    /// <param name="message">Message to speak</param>
+    private bool TrySpeakRadio(Entity<RadioVocalizerComponent?> entity, string message)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        if (!_random.Prob(entity.Comp.RadioAttemptChance))
+            return false;
+
+        if (!TryPickRandomRadioChannel(entity, out var channel))
+            return false;
+
+        var channelPrefix = _proto.Index<RadioChannelPrototype>(channel).KeyCode;
+
+        // send a whisper using the radio channel prefix and whatever relevant radio channel character
+        // along with the message. This is analogous to how radio messages are sent by players
+        _chat.TrySendInGameICMessage(
+            entity,
+            $"{SharedChatSystem.RadioChannelPrefix}{channelPrefix} {message}",
+            InGameICChatType.Whisper,
+            ChatTransmitRange.Normal);
+
+        return true;
+    }
+}
diff --git a/Content.Server/Vocalization/Systems/VocalizationSystem.cs b/Content.Server/Vocalization/Systems/VocalizationSystem.cs
new file mode 100644
index 0000000000..49dfaf4281
--- /dev/null
+++ b/Content.Server/Vocalization/Systems/VocalizationSystem.cs
@@ -0,0 +1,137 @@
+using Content.Server.Chat.Systems;
+using Content.Server.Power.Components;
+using Content.Server.Vocalization.Components;
+using Content.Shared.ActionBlocker;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Vocalization.Systems;
+
+/// <summary>
+/// VocalizationSystem raises VocalizeEvents to make entities speak at certain intervals
+/// This is used in combination with systems like ParrotMemorySystem to randomly say messages from memory,
+/// or can be used by other systems to speak pre-set messages
+/// </summary>
+public sealed partial class VocalizationSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<VocalizerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<VocalizerRequiresPowerComponent, TryVocalizeEvent>(OnRequiresPowerTryVocalize);
+    }
+
+    private void OnMapInit(Entity<VocalizerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextVocalizeInterval = _random.Next(ent.Comp.MinVocalizeInterval, ent.Comp.MaxVocalizeInterval);
+    }
+
+    private void OnRequiresPowerTryVocalize(Entity<VocalizerRequiresPowerComponent> ent, ref TryVocalizeEvent args)
+    {
+        if (!TryComp<ApcPowerReceiverComponent>(ent, out var receiver))
+            return;
+
+        args.Cancelled |= !receiver.Powered;
+    }
+
+    /// <summary>
+    /// Try speaking by raising a TryVocalizeEvent
+    /// This event is passed to systems adding a message to it and setting it to handled
+    /// </summary>
+    private void TrySpeak(Entity<VocalizerComponent> entity)
+    {
+        var tryVocalizeEvent = new TryVocalizeEvent();
+        RaiseLocalEvent(entity.Owner, ref tryVocalizeEvent);
+
+        // If the event was cancelled, don't speak
+        if (tryVocalizeEvent.Cancelled)
+            return;
+
+        // if the event was never handled, return
+        // this happens if there are no components that trigger systems to add a message to this event
+        if (!tryVocalizeEvent.Handled)
+            return;
+
+        // if the event's message is null for whatever reason, return.
+        // this would mean a system didn't set the message properly but did set the event to handled
+        if (tryVocalizeEvent.Message is not { } message)
+            return;
+
+        Speak(entity, message);
+    }
+
+    /// <summary>
+    /// Actually say something.
+    /// </summary>
+    private void Speak(Entity<VocalizerComponent> entity, string message)
+    {
+        // raise a VocalizeEvent
+        // this can be handled by other systems to speak using a method other than local chat
+        var vocalizeEvent = new VocalizeEvent(message);
+        RaiseLocalEvent(entity.Owner, ref vocalizeEvent);
+
+        // if the event is handled, don't try speaking
+        if (vocalizeEvent.Handled)
+            return;
+
+        // default to local chat if no other system handles the event
+        // first check if the entity can speak
+        if (!_actionBlocker.CanSpeak(entity))
+            return;
+
+        // send the message
+        _chat.TrySendInGameICMessage(entity, message, InGameICChatType.Speak, entity.Comp.HideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // get current game time for delay
+        var currentGameTime = _gameTiming.CurTime;
+
+        // query to get all entities with a VocalizeComponent
+        var query = EntityQueryEnumerator<VocalizerComponent>();
+        while (query.MoveNext(out var uid, out var vocalizer))
+        {
+            // go to next entity if it is too early for this one to speak
+            if (currentGameTime < vocalizer.NextVocalizeInterval)
+                continue;
+
+            // set a new time for the speak interval, regardless of whether speaking works
+            var randomSpeakInterval = _random.Next(vocalizer.MinVocalizeInterval, vocalizer.MaxVocalizeInterval);
+            vocalizer.NextVocalizeInterval += randomSpeakInterval;
+
+            // if an admin updates the speak interval to be immediate, this loop will spam messages until the
+            // nextspeakinterval catches up with the current game time. Prevent this from happening
+            if (vocalizer.NextVocalizeInterval < _gameTiming.CurTime)
+                vocalizer.NextVocalizeInterval = _gameTiming.CurTime + randomSpeakInterval;
+
+            // try to speak
+            TrySpeak((uid, vocalizer));
+        }
+    }
+}
+
+/// <summary>
+/// Fired when the entity wants to try vocalizing, but doesn't have a message yet
+/// </summary>
+/// <param name="Message">Message to send, this is null when the event is just fired and should be set by a system</param>
+/// <param name="Handled">Whether the message was handled by a system</param>
+[ByRefEvent]
+public record struct TryVocalizeEvent(string? Message = null, bool Handled = false, bool Cancelled = false);
+
+/// <summary>
+/// Fired when the entity wants to vocalize and has a message. Allows for interception by other systems if the
+/// vocalization needs to be done some other way
+/// </summary>
+/// <param name="Message">Message to send</param>
+/// <param name="Handled">Whether the message was handled by a system</param>
+[ByRefEvent]
+public record struct VocalizeEvent(string Message, bool Handled = false);
diff --git a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
index c3fde14517..ade861af98 100644
--- a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
+++ b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
@@ -2,10 +2,10 @@ using Content.Server.Hands.Systems;
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
-using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
+using Content.Shared.Trigger;
 using Robust.Server.Containers;
 
 namespace Content.Server.VoiceTrigger;
@@ -40,24 +40,20 @@ public sealed class StorageVoiceControlSystem : EntitySystem
         if (!TryComp<StorageComponent>(ent, out var storage))
             return;
 
-        // Get the hands component
-        if (!TryComp<HandsComponent>(args.Source, out var hands))
-            return;
-
         // If the player has something in their hands, try to insert it into the storage
-        if (hands.ActiveHand != null && hands.ActiveHand.HeldEntity.HasValue)
+        if (_hands.TryGetActiveItem(args.Source, out var activeItem))
         {
             // Disallow insertion and provide a reason why if the person decides to insert the item into itself
-            if (ent.Owner.Equals(hands.ActiveHand.HeldEntity.Value))
+            if (ent.Owner.Equals(activeItem.Value))
             {
-                _popup.PopupEntity(Loc.GetString("comp-storagevoicecontrol-self-insert", ("entity", hands.ActiveHand.HeldEntity.Value)), ent, args.Source);
+                _popup.PopupEntity(Loc.GetString("comp-storagevoicecontrol-self-insert", ("entity", activeItem.Value)), ent, args.Source);
                 return;
             }
-            if (_storage.CanInsert(ent, hands.ActiveHand.HeldEntity.Value, out var failedReason))
+            if (_storage.CanInsert(ent, activeItem.Value, out var failedReason))
             {
                 // We adminlog before insertion, otherwise the logger will attempt to pull info on an entity that no longer is present and throw an exception
-                _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Source)} inserted {ToPrettyString(hands.ActiveHand.HeldEntity.Value)} into {ToPrettyString(ent)} via voice control");
-                _storage.Insert(ent, hands.ActiveHand.HeldEntity.Value, out _);
+                _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Source)} inserted {ToPrettyString(activeItem.Value)} into {ToPrettyString(ent)} via voice control");
+                _storage.Insert(ent, activeItem.Value, out _);
                 return;
             }
             {
@@ -67,7 +63,7 @@ public sealed class StorageVoiceControlSystem : EntitySystem
                 _popup.PopupEntity(Loc.GetString(failedReason), ent, args.Source);
                 _adminLogger.Add(LogType.Action,
                     LogImpact.Low,
-                    $"{ToPrettyString(args.Source)} failed to insert {ToPrettyString(hands.ActiveHand.HeldEntity.Value)} into {ToPrettyString(ent)} via voice control");
+                    $"{ToPrettyString(args.Source)} failed to insert {ToPrettyString(activeItem.Value)} into {ToPrettyString(ent)} via voice control");
             }
             return;
         }
@@ -80,7 +76,7 @@ public sealed class StorageVoiceControlSystem : EntitySystem
             // E.g "go go s" would give you the screwdriver because "screwdriver" contains "s"
             if (Name(item).Contains(args.MessageWithoutPhrase))
             {
-                ExtractItemFromStorage(ent, item, args.Source, hands);
+                ExtractItemFromStorage(ent, item, args.Source);
                 break;
             }
         }
@@ -92,16 +88,14 @@ public sealed class StorageVoiceControlSystem : EntitySystem
     /// <param name="ent">The entity with the <see cref="StorageVoiceControlComponent"/></param>
     /// <param name="item">The entity to be extracted from the attached storage</param>
     /// <param name="source">The entity wearing the item</param>
-    /// <param name="hands">The <see cref="HandsComponent"/> of the person wearing the item</param>
     private void ExtractItemFromStorage(Entity<StorageVoiceControlComponent> ent,
         EntityUid item,
-        EntityUid source,
-        HandsComponent hands)
+        EntityUid source)
     {
         _container.RemoveEntity(ent, item);
         _adminLogger.Add(LogType.Action,
             LogImpact.Low,
             $"{ToPrettyString(source)} retrieved {ToPrettyString(item)} from {ToPrettyString(ent)} via voice control");
-        _hands.TryPickup(source, item, handsComp: hands);
+        _hands.TryPickup(source, item);
     }
 }
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index 71bd543ca3..c000dd7e8c 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -63,7 +63,7 @@ namespace Content.Server.Voting
         }
     }
 
-    [AdminCommand(AdminFlags.Moderator)]
+    [AdminCommand(AdminFlags.Round)]
     public sealed class CreateCustomCommand : LocalizedEntityCommands
     {
         [Dependency] private readonly IVoteManager _voteManager = default!;
@@ -114,12 +114,12 @@ namespace Content.Server.Voting
                 {
                     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);
@@ -218,7 +218,7 @@ namespace Content.Server.Voting
         }
     }
 
-    [AdminCommand(AdminFlags.Moderator)]
+    [AdminCommand(AdminFlags.Round)]
     public sealed class CancelVoteCommand : LocalizedEntityCommands
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -249,10 +249,9 @@ namespace Content.Server.Voting
 
         public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
-            var mgr = IoCManager.Resolve<IVoteManager>();
             if (args.Length == 1)
             {
-                var options = mgr.ActiveVotes
+                var options = _voteManager.ActiveVotes
                     .OrderBy(v => v.Id)
                     .Select(v => new CompletionOption(v.Id.ToString(), v.Title));
 
diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs
index 7ccc19e20c..88b82a9ca5 100644
--- a/Content.Server/Wagging/WaggingSystem.cs
+++ b/Content.Server/Wagging/WaggingSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Actions;
 using Content.Server.Humanoid;
+using Content.Shared.Cloning.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Mobs;
@@ -26,6 +27,15 @@ public sealed class WaggingSystem : EntitySystem
         SubscribeLocalEvent<WaggingComponent, ComponentShutdown>(OnWaggingShutdown);
         SubscribeLocalEvent<WaggingComponent, ToggleActionEvent>(OnWaggingToggle);
         SubscribeLocalEvent<WaggingComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<WaggingComponent, CloningEvent>(OnCloning);
+    }
+
+    private void OnCloning(Entity<WaggingComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        EnsureComp<WaggingComponent>(args.CloneUid);
     }
 
     private void OnWaggingMapInit(EntityUid uid, WaggingComponent component, MapInitEvent args)
diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs
index 09df1d1419..6e24831fe4 100644
--- a/Content.Server/Whitelist/WhitelistCommands.cs
+++ b/Content.Server/Whitelist/WhitelistCommands.cs
@@ -12,6 +12,8 @@ namespace Content.Server.Whitelist;
 [AdminCommand(AdminFlags.Ban)]
 public sealed class AddWhitelistCommand : LocalizedCommands
 {
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly IServerDbManager _dbManager = default!;
     public override string Command => "whitelistadd";
 
     public override async void Execute(IConsoleShell shell, string argStr, string[] args)
@@ -23,23 +25,20 @@ public sealed class AddWhitelistCommand : LocalizedCommands
             return;
         }
 
-        var db = IoCManager.Resolve<IServerDbManager>();
-        var loc = IoCManager.Resolve<IPlayerLocator>();
-
         var name = string.Join(' ', args).Trim();
-        var data = await loc.LookupIdByNameOrIdAsync(name);
+        var data = await _locator.LookupIdByNameOrIdAsync(name);
 
         if (data != null)
         {
             var guid = data.UserId;
-            var isWhitelisted = await db.GetWhitelistStatusAsync(guid);
+            var isWhitelisted = await _dbManager.GetWhitelistStatusAsync(guid);
             if (isWhitelisted)
             {
                 shell.WriteLine(Loc.GetString("cmd-whitelistadd-existing", ("username", data.Username)));
                 return;
             }
 
-            await db.AddToWhitelistAsync(guid);
+            await _dbManager.AddToWhitelistAsync(guid);
             shell.WriteLine(Loc.GetString("cmd-whitelistadd-added", ("username", data.Username)));
             return;
         }
@@ -61,6 +60,9 @@ public sealed class AddWhitelistCommand : LocalizedCommands
 [AdminCommand(AdminFlags.Ban)]
 public sealed class RemoveWhitelistCommand : LocalizedCommands
 {
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly IServerDbManager _dbManager = default!;
+
     public override string Command => "whitelistremove";
 
     public override async void Execute(IConsoleShell shell, string argStr, string[] args)
@@ -72,23 +74,20 @@ public sealed class RemoveWhitelistCommand : LocalizedCommands
             return;
         }
 
-        var db = IoCManager.Resolve<IServerDbManager>();
-        var loc = IoCManager.Resolve<IPlayerLocator>();
-
         var name = string.Join(' ', args).Trim();
-        var data = await loc.LookupIdByNameOrIdAsync(name);
+        var data = await _locator.LookupIdByNameOrIdAsync(name);
 
         if (data != null)
         {
             var guid = data.UserId;
-            var isWhitelisted = await db.GetWhitelistStatusAsync(guid);
+            var isWhitelisted = await _dbManager.GetWhitelistStatusAsync(guid);
             if (!isWhitelisted)
             {
                 shell.WriteLine(Loc.GetString("cmd-whitelistremove-existing", ("username", data.Username)));
                 return;
             }
 
-            await db.RemoveFromWhitelistAsync(guid);
+            await _dbManager.RemoveFromWhitelistAsync(guid);
             shell.WriteLine(Loc.GetString("cmd-whitelistremove-removed", ("username", data.Username)));
             return;
         }
@@ -110,6 +109,11 @@ public sealed class RemoveWhitelistCommand : LocalizedCommands
 [AdminCommand(AdminFlags.Ban)]
 public sealed class KickNonWhitelistedCommand : LocalizedCommands
 {
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
+    [Dependency] private readonly IServerNetManager _netManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IServerDbManager _dbManager = default!;
+
     public override string Command => "kicknonwhitelisted";
 
     public override async void Execute(IConsoleShell shell, string argStr, string[] args)
@@ -121,24 +125,16 @@ public sealed class KickNonWhitelistedCommand : LocalizedCommands
             return;
         }
 
-        var cfg = IoCManager.Resolve<IConfigurationManager>();
-
-        if (!cfg.GetCVar(CCVars.WhitelistEnabled))
+        if (!_configManager.GetCVar(CCVars.WhitelistEnabled))
             return;
 
-        var player = IoCManager.Resolve<IPlayerManager>();
-        var db = IoCManager.Resolve<IServerDbManager>();
-        var net = IoCManager.Resolve<IServerNetManager>();
-
-        foreach (var session in player.NetworkedSessions)
+        foreach (var session in _playerManager.NetworkedSessions)
         {
-            if (await db.GetAdminDataForAsync(session.UserId) is not null)
+            if (await _dbManager.GetAdminDataForAsync(session.UserId) is not null)
                 continue;
 
-            if (!await db.GetWhitelistStatusAsync(session.UserId))
-            {
-                net.DisconnectChannel(session.Channel, Loc.GetString("whitelist-not-whitelisted"));
-            }
+            if (!await _dbManager.GetWhitelistStatusAsync(session.UserId))
+                _netManager.DisconnectChannel(session.Channel, Loc.GetString("whitelist-not-whitelisted"));
         }
     }
 }
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index a24291ded8..6d36590547 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading;
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
+using Content.Server.Hands.Systems;
 using Content.Server.Power.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.GameTicking;
@@ -25,6 +26,7 @@ public sealed class WiresSystem : SharedWiresSystem
 {
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
@@ -395,7 +397,7 @@ public sealed class WiresSystem : SharedWiresSystem
     {
         var player = args.Actor;
 
-        if (!EntityManager.TryGetComponent(player, out HandsComponent? handsComponent))
+        if (!TryComp(player, out HandsComponent? handsComponent))
         {
             _popupSystem.PopupEntity(Loc.GetString("wires-component-ui-on-receive-message-no-hands"), uid, player);
             return;
@@ -407,19 +409,13 @@ public sealed class WiresSystem : SharedWiresSystem
             return;
         }
 
-        var activeHand = handsComponent.ActiveHand;
-
-        if (activeHand == null)
+        if (!_hands.TryGetActiveItem((player, handsComponent), out var heldEntity))
             return;
 
-        if (activeHand.HeldEntity == null)
+        if (!TryComp(heldEntity, out ToolComponent? tool))
             return;
 
-        var activeHandEntity = activeHand.HeldEntity.Value;
-        if (!EntityManager.TryGetComponent(activeHandEntity, out ToolComponent? tool))
-            return;
-
-        TryDoWireAction(uid, player, activeHandEntity, args.Id, args.Action, component, tool);
+        TryDoWireAction(uid, player, heldEntity.Value, args.Id, args.Action, component, tool);
     }
 
     private void OnDoAfter(EntityUid uid, WiresComponent component, WireDoAfterEvent args)
diff --git a/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs b/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs
index f6b4c82ebb..08571cd588 100644
--- a/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs
+++ b/Content.Server/Worldgen/Components/BiomeSelectionComponent.cs
@@ -1,6 +1,6 @@
-using Content.Server.Worldgen.Systems.Biomes;
-using Content.Server.Worldgen.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Content.Server.Worldgen.Prototypes;
+using Content.Server.Worldgen.Systems.Biomes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Worldgen.Components;
 
@@ -15,7 +15,7 @@ public sealed partial class BiomeSelectionComponent : Component
     ///     The list of biomes available to this selector.
     /// </summary>
     /// <remarks>This is always sorted by priority after ComponentStartup.</remarks>
-    [DataField("biomes", required: true,
-        customTypeSerializer: typeof(PrototypeIdListSerializer<BiomePrototype>))] public List<string> Biomes = new();
+    [DataField(required: true)]
+    public List<ProtoId<BiomePrototype>> Biomes = new();
 }
 
diff --git a/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs b/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs
index 6d1fa5d957..a1317ae2ed 100644
--- a/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs
+++ b/Content.Server/Worldgen/Components/Debris/BlobFloorPlanBuilderComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Worldgen.Systems.Debris;
 using Content.Shared.Maps;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Worldgen.Components.Debris;
 
@@ -24,9 +24,8 @@ public sealed partial class BlobFloorPlanBuilderComponent : Component
     /// <summary>
     ///     The tiles to be used for the floor plan.
     /// </summary>
-    [DataField("floorTileset", required: true,
-        customTypeSerializer: typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> FloorTileset { get; private set;  } = default!;
+    [DataField(required: true)]
+    public List<ProtoId<ContentTileDefinition>> FloorTileset { get; private set;  } = default!;
 
     /// <summary>
     ///     The number of floor tiles to place when drawing the asteroid layout.
diff --git a/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs b/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
index ed26053114..dcb7b7fc8f 100644
--- a/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
+++ b/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs
@@ -12,8 +12,8 @@ namespace Content.Server.Worldgen.Systems.Debris;
 public sealed class SimpleFloorPlanPopulatorSystem : BaseWorldSystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefinition = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     /// <inheritdoc />
     public override void Initialize()
@@ -30,7 +30,7 @@ public sealed class SimpleFloorPlanPopulatorSystem : BaseWorldSystem
         while (enumerator.MoveNext(out var tile))
         {
             var coords = _map.GridTileToLocal(uid, grid, tile.Value.GridIndices);
-            var selector = tile.Value.Tile.GetContentTileDefinition(_tileDefinition).ID;
+            var selector = _turf.GetContentTileDefinition(tile.Value).ID;
             if (!component.Caches.TryGetValue(selector, out var cache))
                 continue;
 
diff --git a/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs b/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs
new file mode 100644
index 0000000000..ea86186782
--- /dev/null
+++ b/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs
@@ -0,0 +1,68 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Robust.Shared.Console;
+
+namespace Content.Server.Xenoarchaeology.Artifact;
+
+/// <summary> Command for unlocking a specific node of a xeno artifact. </summary>
+[AdminCommand(AdminFlags.Debug)]
+public sealed class UnlockNodeCommand : LocalizedEntityCommands
+{
+    [Dependency] private readonly XenoArtifactSystem _artiSystem = default!;
+
+    public override string Command => "unlocknode";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[1], out var netNode) || !EntityManager.TryGetEntity(netNode, out var entityUid))
+        {
+            shell.WriteError(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[1])));
+            return;
+        }
+
+        _artiSystem.SetNodeUnlocked(entityUid.Value);
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        switch (args.Length)
+        {
+            case 1:
+            {
+                var query = EntityManager.EntityQueryEnumerator<XenoArtifactComponent>();
+                var completionOptions = new List<CompletionOption>();
+                while (query.MoveNext(out var uid, out _))
+                {
+                    completionOptions.Add(new CompletionOption(uid.ToString()));
+                }
+
+                return CompletionResult.FromHintOptions(completionOptions, Loc.GetString("cmd-unlocknode-artifact-hint"));
+            }
+            case 2 when
+                NetEntity.TryParse(args[0], out var netEnt) &&
+                EntityManager.TryGetEntity(netEnt, out var artifactUid) &&
+                EntityManager.TryGetComponent<XenoArtifactComponent>(artifactUid, out var comp):
+            {
+                var result = new List<CompletionOption>();
+                foreach (var node in _artiSystem.GetAllNodes((artifactUid.Value, comp)))
+                {
+                    var metaData = EntityManager.MetaQuery.Comp(artifactUid.Value);
+                    var entityUidStr = EntityManager.GetNetEntity(node).ToString();
+                    var completionOption = new CompletionOption(entityUidStr, metaData.EntityName);
+                    result.Add(completionOption);
+                }
+
+                return CompletionResult.FromHintOptions(result, Loc.GetString("cmd-unlocknode-node-hint"));
+            }
+            default:
+                return CompletionResult.Empty;
+        }
+    }
+}
diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
index b9e23f036b..faef4d5078 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.Explosion.Components.OnTrigger;
+using Content.Shared.Explosion.Components;
 
 namespace Content.Server.Xenoarchaeology.Artifact.XAE.Components;
 
 /// <summary>
-/// Activates 'trigger' for <see cref="ExplodeOnTriggerComponent"/>.
+/// Activates <see cref="ExplosiveComponent"/> to explode.
 /// </summary>
 [RegisterComponent, Access(typeof(XAETriggerExplosivesSystem))]
 public sealed partial class XAETriggerExplosivesComponent : Component;
diff --git a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs
index 31d079e3ad..7fd7acca4b 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactCommands.cs
@@ -14,8 +14,7 @@ namespace Content.Server.Xenoarchaeology.Artifact;
 [ToolshedCommand, AdminCommand(AdminFlags.Debug)]
 public sealed class XenoArtifactCommand : ToolshedCommand
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string ArtifactPrototype = "BaseXenoArtifact";
+    public static readonly EntProtoId ArtifactPrototype = "BaseXenoArtifact";
 
     /// <summary> List existing artifacts. </summary>
     [CommandImplementation("list")]
diff --git a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactUnlockNodeCommand.cs b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactUnlockNodeCommand.cs
deleted file mode 100644
index 1782619780..0000000000
--- a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactUnlockNodeCommand.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Content.Server.Administration;
-using Content.Shared.Administration;
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Robust.Shared.Console;
-
-namespace Content.Server.Xenoarchaeology.Artifact;
-
-/// <summary> Command for unlocking specific node of xeno artifact. </summary>
-[AdminCommand(AdminFlags.Debug)]
-public sealed class XenoArtifactUnlockNodeCommand : LocalizedCommands
-{
-    [Dependency] private readonly EntityManager _entities = default!;
-
-    /// <inheritdoc />
-    public override string Command => "unlocknode";
-
-    /// <inheritdoc />
-    public override string Description => Loc.GetString("cmd-unlocknode-desc");
-
-    /// <inheritdoc />
-    public override string Help => Loc.GetString("cmd-unlocknode-help");
-
-    /// <inheritdoc />
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (args.Length != 2)
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-unlocknode-arg-num"));
-            return;
-        }
-
-        if (!NetEntity.TryParse(args[1], out var netNode))
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-unlocknode-invalid-entity"));
-            return;
-        }
-
-        if (!_entities.TryGetEntity(netNode, out var entityUid))
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-unlocknode-invalid-entity"));
-            return;
-        }
-        _entities.System<XenoArtifactSystem>()
-                 .SetNodeUnlocked(entityUid.Value);
-    }
-
-    /// <inheritdoc />
-    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-    {
-        if (args.Length == 1)
-        {
-            var query = _entities.EntityQueryEnumerator<XenoArtifactComponent>();
-            var completionOptions = new List<CompletionOption>();
-            while (query.MoveNext(out var uid, out _))
-            {
-                completionOptions.Add(new CompletionOption(uid.ToString()));
-            }
-
-            return CompletionResult.FromHintOptions(completionOptions, "<artifact uid>");
-        }
-
-        if (args.Length == 2 &&
-            NetEntity.TryParse(args[0], out var netEnt) &&
-            _entities.TryGetEntity(netEnt, out var artifactUid) &&
-            _entities.TryGetComponent<XenoArtifactComponent>(artifactUid, out var comp))
-        {
-            var artifactSystem = _entities.System<XenoArtifactSystem>();
-
-            var result = new List<CompletionOption>();
-            foreach (var node in artifactSystem.GetAllNodes((artifactUid.Value, comp)))
-            {
-                var metaData = _entities.MetaQuery.Comp(artifactUid.Value);
-                var entityUidStr = _entities.GetNetEntity(node)
-                                            .ToString();
-                var completionOption = new CompletionOption(entityUidStr, metaData.EntityName);
-                result.Add(completionOption);
-            }
-
-            return CompletionResult.FromHintOptions(result, "<node uid>");
-        }
-
-        return CompletionResult.Empty;
-    }
-}
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 530d31c383..e190741449 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -10,12 +10,12 @@ using Content.Server.Humanoid;
 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;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
+using Content.Shared.Body.Components;
 using Content.Shared._Sunrise.CollectiveMind;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
@@ -234,7 +234,7 @@ public sealed partial class ZombieSystem
         _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/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 9ccc0ae981..1dcfff80d7 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -308,7 +308,10 @@ namespace Content.Server.Zombies
             // always play zombie emote sounds and ignore others
             if (args.Handled)
                 return;
-            args.Handled = _chat.TryPlayEmoteSound(uid, component.EmoteSounds, args.Emote);
+
+            _protoManager.TryIndex(component.EmoteSoundsId, out var sounds);
+
+            args.Handled = _chat.TryPlayEmoteSound(uid, sounds, args.Emote);
         }
 
         private void OnMobState(EntityUid uid, ZombieComponent component, MobStateChangedEvent args)
diff --git a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
index e0a0453285..039891a3ba 100644
--- a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
+++ b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
@@ -34,7 +34,7 @@ public sealed class GoliathTentacleSystem : EntitySystem
         // TODO: animation
 
         _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));
 
         var coords = args.Target;
         List<EntityCoordinates> spawnPos = new();
@@ -55,7 +55,7 @@ public sealed class GoliathTentacleSystem : EntitySystem
         foreach (var pos in spawnPos)
         {
             if (!_map.TryGetTileRef(grid, gridComp, pos, out var tileRef) ||
-                tileRef.IsSpace() ||
+                _turf.IsSpace(tileRef) ||
                 _turf.IsTileBlocked(tileRef, CollisionGroup.Impassable))
             {
                 continue;
diff --git a/Content.Shared/Abilities/Mime/MimePowersComponent.cs b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
new file mode 100644
index 0000000000..8414dd7a0d
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Abilities.Mime;
+
+/// <summary>
+/// Lets its owner entity use mime powers, like placing invisible walls.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[AutoGenerateComponentPause]
+public sealed partial class MimePowersComponent : Component
+{
+    /// <summary>
+    /// Whether this component is active or not.
+    /// </summarY>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The wall prototype to use.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntProtoId WallPrototype = "WallInvisible";
+
+    [DataField]
+    public EntProtoId? InvisibleWallAction = "ActionMimeInvisibleWall";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? InvisibleWallActionEntity;
+
+    // The vow zone lies below
+    [DataField, AutoNetworkedField]
+    public bool VowBroken = false;
+
+    /// <summary>
+    /// Whether this mime is ready to take the vow again.
+    /// Note that if they already have the vow, this is also false.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ReadyToRepent = false;
+
+    /// <summary>
+    /// Time when the mime can repent their vow
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan VowRepentTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long it takes the mime to get their powers back
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
+
+    /// <summary>
+    /// Does this component prevent the mime from writing on paper while their vow is active?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventWriting = false;
+
+    /// <summary>
+    /// What message is displayed when the mime fails to write?
+    /// </summary>
+    [DataField]
+    public LocId FailWriteMessage = "paper-component-illiterate-mime";
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Abilities/Mime/MimePowersSystem.cs b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
new file mode 100644
index 0000000000..22ba7a3591
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
@@ -0,0 +1,187 @@
+using Content.Shared.Popups;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Alert;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Maps;
+using Content.Shared.Paper;
+using Content.Shared.Physics;
+using Content.Shared.Speech.Muting;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Abilities.Mime;
+
+public sealed class MimePowersSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<MimePowersComponent, ComponentShutdown>(OnComponentShutdown);
+        SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
+
+        SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
+        SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        // Queue to track whether mimes can retake vows yet
+
+        var query = EntityQueryEnumerator<MimePowersComponent>();
+        while (query.MoveNext(out var uid, out var mime))
+        {
+            if (!mime.VowBroken || mime.ReadyToRepent)
+                continue;
+
+            if (_timing.CurTime < mime.VowRepentTime)
+                continue;
+
+            mime.ReadyToRepent = true;
+            Dirty(uid, mime);
+            _popupSystem.PopupClient(Loc.GetString("mime-ready-to-repent"), uid, uid);
+        }
+    }
+
+    private void OnComponentInit(Entity<MimePowersComponent> ent, ref ComponentInit args)
+    {
+        EnsureComp<MutedComponent>(ent);
+
+        if (ent.Comp.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(ent, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = ent.Comp.FailWriteMessage;
+            Dirty(ent, illiterateComponent);
+        }
+
+        _alertsSystem.ShowAlert(ent, ent.Comp.VowAlert);
+        _actionsSystem.AddAction(ent, ref ent.Comp.InvisibleWallActionEntity, ent.Comp.InvisibleWallAction);
+    }
+
+    private void OnComponentShutdown(Entity<MimePowersComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Creates an invisible wall in a free space after some checks.
+    /// </summary>
+    private void OnInvisibleWall(Entity<MimePowersComponent> ent, ref InvisibleWallActionEvent args)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        if (_container.IsEntityOrParentInContainer(ent))
+            return;
+
+        var xform = Transform(ent);
+        // Get the tile in front of the mime
+        var offsetValue = xform.LocalRotation.ToWorldVec();
+        var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
+        var tile = _turf.GetTileRef(coords);
+        if (tile == null)
+            return;
+
+        // Check if the tile is blocked by a wall or mob, and don't create the wall if so
+        if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-invisible-wall-failed"), ent, ent);
+            return;
+        }
+
+        var messageSelf = Loc.GetString("mime-invisible-wall-popup-self", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        var messageOthers = Loc.GetString("mime-invisible-wall-popup-others", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(messageSelf, messageOthers, ent, ent);
+
+        // Make sure we set the invisible wall to despawn properly
+        PredictedSpawnAtPosition(ent.Comp.WallPrototype, _turf.GetTileCenter(tile.Value));
+        // Handle args so cooldown works
+        args.Handled = true;
+    }
+
+    private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        BreakVow(ent, ent);
+        args.Handled = true;
+    }
+
+    private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        RetakeVow(ent, ent);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Break this mime's vow to not speak.
+    /// </summary>
+    public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (mimePowers.VowBroken)
+            return;
+
+        mimePowers.Enabled = false;
+        mimePowers.VowBroken = true;
+        mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
+        Dirty(uid, mimePowers);
+        RemComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+            RemComp<BlockWritingComponent>(uid);
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
+        _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Retake this mime's vow to not speak.
+    /// </summary>
+    public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (!mimePowers.ReadyToRepent)
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-not-ready-repent"), uid, uid);
+            return;
+        }
+
+        mimePowers.Enabled = true;
+        mimePowers.ReadyToRepent = false;
+        mimePowers.VowBroken = false;
+        Dirty(uid, mimePowers);
+        AddComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = mimePowers.FailWriteMessage;
+            Dirty(uid, illiterateComponent);
+        }
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
+        _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
+    }
+}
diff --git a/Content.Shared/Access/Systems/IdExaminableSystem.cs b/Content.Shared/Access/Systems/IdExaminableSystem.cs
index 807ccc6616..c05262f2f6 100644
--- a/Content.Shared/Access/Systems/IdExaminableSystem.cs
+++ b/Content.Shared/Access/Systems/IdExaminableSystem.cs
@@ -51,13 +51,13 @@ public sealed class IdExaminableSystem : EntitySystem
         if (_inventorySystem.TryGetSlotEntity(uid, "id", out var idUid))
         {
             // PDA
-            if (EntityManager.TryGetComponent(idUid, out PdaComponent? pda) &&
+            if (TryComp(idUid, out PdaComponent? pda) &&
                 TryComp<IdCardComponent>(pda.ContainedId, out var id))
             {
                 return GetNameAndJob(id);
             }
             // ID Card
-            if (EntityManager.TryGetComponent(idUid, out id))
+            if (TryComp(idUid, out id))
             {
                 return GetNameAndJob(id);
             }
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index cfce570f84..68f6adef9d 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -4,7 +4,7 @@ using Content.Shared.Access.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
-using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
@@ -22,6 +22,7 @@ public abstract class SharedIdCardSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedAccessSystem _access = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -84,8 +85,7 @@ public abstract class SharedIdCardSystem : EntitySystem
     public bool TryFindIdCard(EntityUid uid, out Entity<IdCardComponent> idCard)
     {
         // check held item?
-        if (TryComp(uid, out HandsComponent? hands) &&
-            hands.ActiveHandEntity is EntityUid heldItem &&
+        if (_hands.GetActiveItem(uid) is { } heldItem &&
             TryGetIdCard(heldItem, out idCard))
         {
             return true;
diff --git a/Content.Shared/Actions/ActionGrantSystem.cs b/Content.Shared/Actions/ActionGrantSystem.cs
index f73ecf8a46..e5b737f28f 100644
--- a/Content.Shared/Actions/ActionGrantSystem.cs
+++ b/Content.Shared/Actions/ActionGrantSystem.cs
@@ -1,3 +1,5 @@
+using  Content.Shared.Inventory;
+
 namespace Content.Shared.Actions;
 
 /// <summary>
@@ -17,9 +19,13 @@ public sealed class ActionGrantSystem : EntitySystem
 
     private void OnItemGet(Entity<ItemActionGrantComponent> ent, ref GetItemActionsEvent args)
     {
+
         if (!TryComp(ent.Owner, out ActionGrantComponent? grant))
             return;
 
+        if (ent.Comp.ActiveIfWorn && (args.SlotFlags == null || args.SlotFlags == SlotFlags.POCKET))
+            return;
+
         foreach (var action in grant.ActionEntities)
         {
             args.AddAction(action);
diff --git a/Content.Shared/Actions/ActionUpgradeSystem.cs b/Content.Shared/Actions/ActionUpgradeSystem.cs
index 72e412b50f..e2c37be6ff 100644
--- a/Content.Shared/Actions/ActionUpgradeSystem.cs
+++ b/Content.Shared/Actions/ActionUpgradeSystem.cs
@@ -11,7 +11,6 @@ public sealed class ActionUpgradeSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
-    [Dependency] private readonly EntityManager _entityManager = default!;
 
     public override void Initialize()
     {
@@ -54,7 +53,7 @@ public sealed class ActionUpgradeSystem : EntitySystem
 
         // TODO: Preserve ordering of actions
 
-        _entityManager.DeleteEntity(uid);
+        Del(uid);
     }
 
     public bool TryUpgradeAction(EntityUid? actionId, out EntityUid? upgradeActionId, ActionUpgradeComponent? actionUpgradeComponent = null, int newLevel = 0)
@@ -185,7 +184,7 @@ public sealed class ActionUpgradeSystem : EntitySystem
 
         // TODO: Preserve ordering of actions
 
-        _entityManager.DeleteEntity(actionId);
+        Del(actionId);
 
         return upgradedActionId.Value;
     }
diff --git a/Content.Shared/Actions/Components/TargetActionComponent.cs b/Content.Shared/Actions/Components/TargetActionComponent.cs
index 9e53c4c36d..74d22516de 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;
@@ -38,6 +38,16 @@ public sealed partial class TargetActionComponent : Component
     [DataField, AutoNetworkedField]
     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/ItemActionGrantComponent.cs b/Content.Shared/Actions/ItemActionGrantComponent.cs
index d1769b51a2..db722d0c46 100644
--- a/Content.Shared/Actions/ItemActionGrantComponent.cs
+++ b/Content.Shared/Actions/ItemActionGrantComponent.cs
@@ -11,4 +11,10 @@ public sealed partial class ItemActionGrantComponent : Component
 {
     [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance]
     public List<EntProtoId> Actions = new();
+
+    /// <summary>
+    /// Actions will only be available if the item is in the clothing slot.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ActiveIfWorn;
 }
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 83ca42fee4..829ca8df87 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -111,7 +111,7 @@ public abstract class SharedActionsSystem : EntitySystem
     /// </summary>
     public Entity<ActionComponent>? GetAction(Entity<ActionComponent?>? action, bool logError = true)
     {
-        if (action is not {} ent || TerminatingOrDeleted(ent))
+        if (action is not {} ent || Deleted(ent))
             return null;
 
         if (!_actionQuery.Resolve(ent, ref ent.Comp, logError))
@@ -423,17 +423,23 @@ public abstract class SharedActionsSystem : EntitySystem
             return true;
         // Sunrise-end
         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);
 
-        // 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...
+        // Just check normal in range, allowing <= 0 range to mean infinite range.
+        if (targetAction.Range > 0
+            && !_transform.InRange(user, target, targetAction.Range))
+            return false;
 
+        // Sunrise-Start
         if (targetAction.IgnoreContainer)
             return true;
+        // Sunrise-End
 
-        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)
@@ -593,7 +599,7 @@ public abstract class SharedActionsSystem : EntitySystem
     #region AddRemoveActions
 
     public EntityUid? AddAction(EntityUid performer,
-        string? actionPrototypeId,
+        [ForbidLiteral] string? actionPrototypeId,
         EntityUid container = default,
         ActionsComponent? component = null)
     {
@@ -613,7 +619,7 @@ public abstract class SharedActionsSystem : EntitySystem
     /// <param name="container">The entity that contains/enables this action (e.g., flashlight).</param>
     public bool AddAction(EntityUid performer,
         [NotNullWhen(true)] ref EntityUid? actionId,
-        string? actionPrototypeId,
+        [ForbidLiteral] string? actionPrototypeId,
         EntityUid container = default,
         ActionsComponent? component = null)
     {
@@ -624,7 +630,7 @@ public abstract class SharedActionsSystem : EntitySystem
     public bool AddAction(EntityUid performer,
         [NotNullWhen(true)] ref EntityUid? actionId,
         [NotNullWhen(true)] out ActionComponent? action,
-        string? actionPrototypeId,
+        [ForbidLiteral] string? actionPrototypeId,
         EntityUid container = default,
         ActionsComponent? component = null)
     {
@@ -1098,6 +1104,20 @@ public abstract class SharedActionsSystem : EntitySystem
     public bool IsCooldownActive(ActionComponent action, TimeSpan? curTime = null)
     {
         // TODO: Check for charge recovery timer
+        curTime ??= GameTiming.CurTime;
         return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime;
     }
+
+    /// <summary>
+    /// Marks the action as temporary.
+    /// Temporary actions get deleted upon being removed from an entity.
+    /// </summary>
+    public void SetTemporary(Entity<ActionComponent?> ent, bool temporary)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp, false))
+            return;
+
+        ent.Comp.Temporary = temporary;
+        Dirty(ent);
+    }
 }
diff --git a/Content.Shared/Administration/AdminCameraEuiState.cs b/Content.Shared/Administration/AdminCameraEuiState.cs
new file mode 100644
index 0000000000..ae41f3aeb0
--- /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/Administration/Components/SharedHeadstandComponent.cs b/Content.Shared/Administration/Components/SharedHeadstandComponent.cs
index 96a4dfc2dd..25576fc466 100644
--- a/Content.Shared/Administration/Components/SharedHeadstandComponent.cs
+++ b/Content.Shared/Administration/Components/SharedHeadstandComponent.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared.Administration.Components;
 
 /// <summary>
-/// Flips the target's sprite on it's head, so they do a headstand.
+/// Flips the target's sprite on its head, so they do a headstand.
 /// </summary>
-[NetworkedComponent]
-public abstract partial class SharedHeadstandComponent : Component { }
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HeadstandComponent : Component;
diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs
index 948e06ceab..f484327192 100644
--- a/Content.Shared/Administration/PlayerInfo.cs
+++ b/Content.Shared/Administration/PlayerInfo.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Mind;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration;
@@ -11,7 +12,7 @@ public sealed record PlayerInfo(
     string IdentityName,
     string StartingJob,
     bool Antag,
-    RoleTypePrototype RoleProto,
+    ProtoId<RoleTypePrototype>? RoleProto,
     LocId? Subtype,
     int SortWeight,
     NetEntity? NetEntity,
diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs
index 429c0670ad..94085c3a27 100644
--- a/Content.Shared/Alert/AlertsSystem.cs
+++ b/Content.Shared/Alert/AlertsSystem.cs
@@ -15,7 +15,7 @@ public abstract class AlertsSystem : EntitySystem
 
     public IReadOnlyDictionary<AlertKey, AlertState>? GetActiveAlerts(EntityUid euid)
     {
-        return EntityManager.TryGetComponent(euid, out AlertsComponent? comp)
+        return TryComp(euid, out AlertsComponent? comp)
             ? comp.Alerts
             : null;
     }
@@ -38,7 +38,7 @@ public abstract class AlertsSystem : EntitySystem
 
     public bool IsShowingAlert(EntityUid euid, ProtoId<AlertPrototype> alertType)
     {
-        if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
+        if (!TryComp(euid, out AlertsComponent? alertsComponent))
             return false;
 
         if (TryGet(alertType, out var alert))
@@ -53,13 +53,13 @@ public abstract class AlertsSystem : EntitySystem
     /// <returns>true iff an alert of the indicated alert category is currently showing</returns>
     public bool IsShowingAlertCategory(EntityUid euid, ProtoId<AlertCategoryPrototype> alertCategory)
     {
-        return EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent)
+        return TryComp(euid, out AlertsComponent? alertsComponent)
                && alertsComponent.Alerts.ContainsKey(AlertKey.ForCategory(alertCategory));
     }
 
     public bool TryGetAlertState(EntityUid euid, AlertKey key, out AlertState alertState)
     {
-        if (EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
+        if (TryComp(euid, out AlertsComponent? alertsComponent))
             return alertsComponent.Alerts.TryGetValue(key, out alertState);
 
         alertState = default;
@@ -155,7 +155,7 @@ public abstract class AlertsSystem : EntitySystem
         if (_timing.ApplyingState)
             return;
 
-        if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
+        if (!TryComp(euid, out AlertsComponent? alertsComponent))
             return;
 
         if (TryGet(alertType, out var alert))
@@ -311,14 +311,14 @@ public abstract class AlertsSystem : EntitySystem
     private void HandleClickAlert(ClickAlertEvent msg, EntitySessionEventArgs args)
     {
         var player = args.SenderSession.AttachedEntity;
-        if (player is null || !EntityManager.HasComponent<AlertsComponent>(player))
+        if (player is null || !HasComp<AlertsComponent>(player))
             return;
 
         if (!IsShowingAlert(player.Value, msg.Type))
         {
             Log.Debug("User {0} attempted to" +
                                    " click alert {1} which is not currently showing for them",
-                EntityManager.GetComponent<MetaDataComponent>(player.Value).EntityName, msg.Type);
+                Comp<MetaDataComponent>(player.Value).EntityName, msg.Type);
             return;
         }
 
diff --git a/Content.Shared/Alert/Components/GenericCounterAlertComponent.cs b/Content.Shared/Alert/Components/GenericCounterAlertComponent.cs
new file mode 100644
index 0000000000..d0c7fc1ad1
--- /dev/null
+++ b/Content.Shared/Alert/Components/GenericCounterAlertComponent.cs
@@ -0,0 +1,63 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Alert.Components;
+
+/// <summary>
+/// This is used for an alert which simply displays a generic number over a texture.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class GenericCounterAlertComponent : Component
+{
+    /// <summary>
+    /// The width, in pixels, of an individual glyph, accounting for the space between glyphs.
+    /// A 3 pixel wide glyph with one pixel of space between it and the next would be a width of 4.
+    /// </summary>
+    [DataField]
+    public int GlyphWidth = 6;
+
+    /// <summary>
+    /// Whether the numbers should be centered on the glyph or just follow a static position.
+    /// </summary>
+    [DataField]
+    public bool CenterGlyph = true;
+
+    /// <summary>
+    /// Whether leading zeros should be hidden.
+    /// If true, "005" would display as "5".
+    /// </summary>
+    [DataField]
+    public bool HideLeadingZeroes = true;
+
+    /// <summary>
+    /// The size of the alert sprite.
+    /// Used to calculate offsets.
+    /// </summary>
+    [DataField]
+    public Vector2i AlertSize = new(32, 32);
+
+    /// <summary>
+    /// Digits that can be displayed by the alert, represented by their sprite layer.
+    /// Order defined corresponds to the digit it affects. 1st defined will affect 1st digit, 2nd affect 2nd digit and so on.
+    /// In this case ones would be on layer "1", tens on layer "10" etc.
+    /// </summary>
+    [DataField]
+    public List<string> DigitKeys = new()
+    {
+        "1",
+        "10",
+        "100",
+        "1000",
+        "10000"
+    };
+}
+
+/// <summary>
+/// Event raised to gather the amount the alert will display.
+/// </summary>
+/// <param name="Alert">The alert which is currently requesting an update.</param>
+/// <param name="Amount">The number to display on the alert.</param>
+[ByRefEvent]
+public record struct GetGenericAlertCounterAmountEvent(AlertPrototype Alert, int? Amount = null)
+{
+    public bool Handled => Amount.HasValue;
+}
diff --git a/Content.Shared/Animals/Components/ParrotMemoryComponent.cs b/Content.Shared/Animals/Components/ParrotMemoryComponent.cs
new file mode 100644
index 0000000000..e1c5ba8ed9
--- /dev/null
+++ b/Content.Shared/Animals/Components/ParrotMemoryComponent.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Animals.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Animals.Components;
+
+/// <summary>
+/// Makes an entity able to memorize chat/radio messages.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentPause]
+public sealed partial class ParrotMemoryComponent : Component
+{
+    /// <summary>
+    /// List of SpeechMemory records this entity has learned.
+    /// </summary>
+    [DataField]
+    public List<SpeechMemory> SpeechMemories = new();
+
+    /// <summary>
+    /// The % chance an entity with this component learns a phrase when learning is off cooldown.
+    /// </summary>
+    [DataField]
+    public float LearnChance = 0.6f;
+
+    /// <summary>
+    /// Time after which another attempt can be made at learning a phrase.
+    /// </summary>
+    [DataField]
+    public TimeSpan LearnCooldown = TimeSpan.FromMinutes(1);
+
+    /// <summary>
+    /// Next time at which the parrot can attempt to learn something.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextLearnInterval = TimeSpan.Zero;
+
+    /// <summary>
+    /// The number of speech entries that are remembered.
+    /// </summary>
+    [DataField]
+    public int MaxSpeechMemory = 50;
+
+    /// <summary>
+    /// Minimum length of a speech entry.
+    /// </summary>
+    [DataField]
+    public int MinEntryLength = 4;
+
+    /// <summary>
+    /// Maximum length of a speech entry.
+    /// </summary>
+    [DataField]
+    public int MaxEntryLength = 50;
+}
+
+[Serializable, NetSerializable]
+public record struct SpeechMemory(NetUserId? NetUserId, string Message);
diff --git a/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs
new file mode 100644
index 0000000000..fb8e3309ea
--- /dev/null
+++ b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Administration.Managers;
+using Content.Shared.Animals.Components;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Animals.Systems;
+
+public abstract class SharedParrotMemorySystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminManager _admin = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ParrotMemoryComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+    }
+
+    private void OnGetVerbs(Entity<ParrotMemoryComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        var user = args.User;
+
+        // limit this to admins
+        if (!_admin.IsAdmin(user))
+            return;
+
+        // simple verb that just clears the memory list
+        var clearMemoryVerb = new Verb()
+        {
+            Text = Loc.GetString("parrot-verb-clear-memory"),
+            Category = VerbCategory.Admin,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/clear-parrot.png")),
+            Act = () =>
+            {
+                _popup.PopupClient(Loc.GetString("parrot-popup-memory-cleared"), entity.Owner, user);
+
+                if (_net.IsServer)
+                    entity.Comp.SpeechMemories.Clear();
+            },
+        };
+
+        args.Verbs.Add(clearMemoryVerb);
+    }
+}
diff --git a/Content.Shared/Animals/UdderSystem.cs b/Content.Shared/Animals/UdderSystem.cs
index 90cc717321..ad813f259a 100644
--- a/Content.Shared/Animals/UdderSystem.cs
+++ b/Content.Shared/Animals/UdderSystem.cs
@@ -71,7 +71,7 @@ public sealed class UdderSystem : EntitySystem
                 continue;
 
             // Actually there is food digestion so no problem with instant reagent generation "OnFeed"
-            if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger))
+            if (TryComp(uid, out HungerComponent? hunger))
             {
                 // Is there enough nutrition to produce reagent?
                 if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)
@@ -133,7 +133,7 @@ public sealed class UdderSystem : EntitySystem
     {
         if (args.Using == null ||
              !args.CanInteract ||
-             !EntityManager.HasComponent<RefillableSolutionComponent>(args.Using.Value))
+             !HasComp<RefillableSolutionComponent>(args.Using.Value))
             return;
 
         var uid = entity.Owner;
diff --git a/Content.Shared/Animals/WoolySystem.cs b/Content.Shared/Animals/WoolySystem.cs
index 172e3b56e1..203def2257 100644
--- a/Content.Shared/Animals/WoolySystem.cs
+++ b/Content.Shared/Animals/WoolySystem.cs
@@ -23,7 +23,6 @@ public sealed class WoolySystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<WoolyComponent, BeforeFullyEatenEvent>(OnBeforeFullyEaten);
         SubscribeLocalEvent<WoolyComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<WoolyComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
     }
@@ -65,7 +64,7 @@ public sealed class WoolySystem : EntitySystem
                 continue;
 
             // Actually there is food digestion so no problem with instant reagent generation "OnFeed"
-            if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger))
+            if (TryComp(uid, out HungerComponent? hunger))
             {
                 // Is there enough nutrition to produce reagent?
                 if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)
@@ -77,10 +76,4 @@ public sealed class WoolySystem : EntitySystem
             _solutionContainer.TryAddReagent(wooly.Solution.Value, wooly.ReagentId, wooly.Quantity, out _);
         }
     }
-
-    private void OnBeforeFullyEaten(Entity<WoolyComponent> ent, ref BeforeFullyEatenEvent args)
-    {
-        // don't want moths to delete goats after eating them
-        args.Cancel();
-    }
 }
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
similarity index 59%
rename from Content.Server/Anomaly/AnomalySynchronizerSystem.cs
rename to Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
index b1814c2741..32883cd775 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
@@ -1,33 +1,30 @@
 using System.Linq;
-using System.Numerics;
-using Content.Server.Anomaly.Components;
-using Content.Server.DeviceLinking.Systems;
-using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.DeviceLinking;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power;
-using Robust.Shared.Audio.Systems;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.Verbs;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Anomaly;
+namespace Content.Shared.Anomaly;
 
 /// <summary>
-/// a device that allows you to translate anomaly activity into multitool signals.
+/// A device that allows you to translate anomaly activity into multitool signals.
 /// </summary>
 public sealed partial class AnomalySynchronizerSystem : EntitySystem
 {
-    [Dependency] private readonly AnomalySystem _anomaly = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-    [Dependency] private readonly DeviceLinkSystem _signal = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly PowerReceiverSystem _power = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAnomalySystem _anomaly = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -47,27 +44,41 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
     {
         base.Update(frameTime);
 
+        var curTime = _timing.CurTime;
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent, TransformComponent>();
-        while (query.MoveNext(out var uid, out var sync, out var xform))
+        while (query.MoveNext(out var uid, out var sync, out var synchronizerTransform))
         {
-            if (sync.ConnectedAnomaly is null)
+            if (sync.ConnectedAnomaly == null)
                 continue;
 
-            if (_timing.CurTime < sync.NextCheckTime)
+            if (curTime < sync.NextCheckTime)
                 continue;
+
             sync.NextCheckTime += sync.CheckFrequency;
+            Dirty(uid, sync);
 
-            if (Transform(sync.ConnectedAnomaly.Value).MapUid != Transform(uid).MapUid)
+            if (TerminatingOrDeleted(sync.ConnectedAnomaly))
             {
-                DisconnectFromAnomaly((uid, sync), sync.ConnectedAnomaly.Value);
+                DisconnectFromAnomaly((uid, sync));
                 continue;
             }
 
-            if (!xform.Coordinates.TryDistance(EntityManager, Transform(sync.ConnectedAnomaly.Value).Coordinates, out var distance))
+            // Use TryComp instead of Transform(uid) to take care of cases where the anomaly is out of
+            // PVS range on the client, but the synchronizer isn't.
+            if (!TryComp(sync.ConnectedAnomaly.Value, out TransformComponent? anomalyTransform))
+                continue;
+
+            if (anomalyTransform.MapUid != synchronizerTransform.MapUid)
+            {
+                DisconnectFromAnomaly((uid, sync));
+                continue;
+            }
+
+            if (!synchronizerTransform.Coordinates.TryDistance(EntityManager, anomalyTransform.Coordinates, out var distance))
                 continue;
 
             if (distance > sync.AttachRange)
-                DisconnectFromAnomaly((uid, sync), sync.ConnectedAnomaly.Value);
+                DisconnectFromAnomaly((uid, sync));
         }
     }
 
@@ -76,11 +87,9 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
     /// </summary>
     public bool TryAttachNearbyAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid? user = null)
     {
-        if (!_power.IsPowered(ent))
+        if (!_power.IsPowered(ent.Owner))
         {
-            if (user is not null)
-                _popup.PopupEntity(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent)), ent, user.Value);
-
+            _popup.PopupClient(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent)), ent, user);
             return false;
         }
 
@@ -89,13 +98,11 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
 
         if (anomaly.Owner is { Valid: false }) // no anomaly in range
         {
-            if (user is not null)
-                _popup.PopupEntity(Loc.GetString("anomaly-sync-no-anomaly"), ent, user.Value);
-
+            _popup.PopupClient(Loc.GetString("anomaly-sync-no-anomaly"), ent, user);
             return false;
         }
 
-        ConnectToAnomaly(ent, anomaly);
+        ConnectToAnomaly(ent, anomaly, user);
         return true;
     }
 
@@ -104,10 +111,10 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         if (args.Powered)
             return;
 
-        if (ent.Comp.ConnectedAnomaly is null)
+        if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        DisconnectFromAnomaly(ent, ent.Comp.ConnectedAnomaly.Value);
+        DisconnectFromAnomaly(ent);
     }
 
     private void OnExamined(Entity<AnomalySynchronizerComponent> ent, ref ExaminedEvent args)
@@ -117,19 +124,29 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
 
     private void OnGetInteractionVerbs(Entity<AnomalySynchronizerComponent> ent, ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands is null || ent.Comp.ConnectedAnomaly.HasValue)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
 
         var user = args.User;
-        args.Verbs.Add(new()
+
+        if (ent.Comp.ConnectedAnomaly == null)
         {
-            Act = () =>
+            args.Verbs.Add(new()
             {
-                TryAttachNearbyAnomaly(ent, user);
-            },
-            Message = Loc.GetString("anomaly-sync-connect-verb-message", ("machine", ent)),
-            Text = Loc.GetString("anomaly-sync-connect-verb-text"),
-        });
+                Act = () => TryAttachNearbyAnomaly(ent, user),
+                Message = Loc.GetString("anomaly-sync-connect-verb-message", ("machine", ent)),
+                Text = Loc.GetString("anomaly-sync-connect-verb-text"),
+            });
+        }
+        else
+        {
+            args.Verbs.Add(new()
+            {
+                Act = () => DisconnectFromAnomaly(ent, user),
+                Message = Loc.GetString("anomaly-sync-disconnect-verb-message", ("machine", ent)),
+                Text = Loc.GetString("anomaly-sync-disconnect-verb-text"),
+            });
+        }
     }
 
     private void OnInteractHand(Entity<AnomalySynchronizerComponent> ent, ref InteractHandEvent args)
@@ -137,12 +154,13 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         TryAttachNearbyAnomaly(ent, args.User);
     }
 
-    private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<AnomalyComponent> anomaly)
+    private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<AnomalyComponent> anomaly, EntityUid? user = null)
     {
         if (ent.Comp.ConnectedAnomaly == anomaly)
             return;
 
         ent.Comp.ConnectedAnomaly = anomaly;
+        Dirty(ent);
         //move the anomaly to the center of the synchronizer, for aesthetics.
         var targetXform = _transform.GetWorldPosition(ent);
         _transform.SetWorldPosition(anomaly, targetXform);
@@ -150,27 +168,27 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         if (ent.Comp.PulseOnConnect)
             _anomaly.DoAnomalyPulse(anomaly, anomaly);
 
-        _popup.PopupEntity(Loc.GetString("anomaly-sync-connected"), ent, PopupType.Medium);
-        _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
+        _popup.PopupPredicted(Loc.GetString("anomaly-sync-connected"), ent, user, PopupType.Medium);
+        _audio.PlayPredicted(ent.Comp.ConnectedSound, ent, user);
     }
 
     //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
-    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid other)
+    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid? user = null)
     {
         if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        if (TryComp<AnomalyComponent>(other, out var anomaly))
+        if (ent.Comp.PulseOnDisconnect && TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
         {
-            if (ent.Comp.PulseOnDisconnect)
-                _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+            _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
         }
 
-        _popup.PopupEntity(Loc.GetString("anomaly-sync-disconnected"), ent, PopupType.Large);
-        _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
+        _popup.PopupPredicted(Loc.GetString("anomaly-sync-disconnected"), ent, user, PopupType.Large);
+        _audio.PlayPredicted(ent.Comp.DisconnectedSound, ent, user);
 
         ent.Comp.ConnectedAnomaly = null;
+        Dirty(ent);
     }
 
     private void OnAnomalyPulse(ref AnomalyPulseEvent args)
@@ -184,19 +202,19 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
             if (!_power.IsPowered(uid))
                 continue;
 
-            _signal.InvokePort(uid, component.PulsePort);
+            _deviceLink.InvokePort(uid, component.PulsePort);
         }
     }
 
     private void OnAnomalySeverityChanged(ref AnomalySeverityChangedEvent args)
     {
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent>();
-        while (query.MoveNext(out var ent, out var component))
+        while (query.MoveNext(out var uid, out var component))
         {
             if (args.Anomaly != component.ConnectedAnomaly)
                 continue;
 
-            if (!_power.IsPowered(ent))
+            if (!_power.IsPowered(uid))
                 continue;
 
             //The superscritical port is invoked not at the AnomalySupercriticalEvent,
@@ -204,34 +222,34 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
             //ATTENTION! the console command supercriticalanomaly does not work here,
             //as it forcefully causes growth to start without increasing severity.
             if (args.Severity >= 1)
-                _signal.InvokePort(ent, component.SupercritPort);
+                _deviceLink.InvokePort(uid, component.SupercritPort);
         }
     }
 
     private void OnAnomalyStabilityChanged(ref AnomalyStabilityChangedEvent args)
     {
-        Entity<AnomalyComponent> anomaly = (args.Anomaly, Comp<AnomalyComponent>(args.Anomaly));
+        var anomaly = Comp<AnomalyComponent>(args.Anomaly);
 
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent>();
-        while (query.MoveNext(out var ent, out var component))
+        while (query.MoveNext(out var uid, out var sync))
         {
-            if (component.ConnectedAnomaly != anomaly)
+            if (sync.ConnectedAnomaly != args.Anomaly)
                 continue;
 
-            if (!_power.IsPowered(ent))
+            if (!_power.IsPowered(uid))
                 continue;
 
-            if (args.Stability < anomaly.Comp.DecayThreshold)
+            if (args.Stability < anomaly.DecayThreshold)
             {
-                _signal.InvokePort(ent, component.DecayingPort);
+                _deviceLink.InvokePort(uid, sync.DecayingPort);
             }
-            else if (args.Stability > anomaly.Comp.GrowthThreshold)
+            else if (args.Stability > anomaly.GrowthThreshold)
             {
-                _signal.InvokePort(ent, component.GrowingPort);
+                _deviceLink.InvokePort(uid, sync.GrowingPort);
             }
             else
             {
-                _signal.InvokePort(ent, component.StabilizePort);
+                _deviceLink.InvokePort(uid, sync.StabilizePort);
             }
         }
     }
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index f58f9f1d07..fb281ca9a3 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -135,6 +135,14 @@ public sealed partial class AnomalyComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier? SupercriticalSoundAtAnimationStart;
+
+    /// <summary>
+    /// The length of the animation before it goes supercritical in seconds.
+    /// </summary>
+    ///
+    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan SupercriticalDuration = TimeSpan.FromSeconds(10f);
     #endregion
 
     /// <summary>
diff --git a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
index 00ea882ad2..d72bc174be 100644
--- a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
@@ -19,13 +19,6 @@ public sealed partial class AnomalySupercriticalComponent : Component
     [AutoPausedField]
     public TimeSpan EndTime;
 
-    /// <summary>
-    /// The length of the animation before it goes supercritical.
-    /// </summary>
-    [AutoNetworkedField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan SupercriticalDuration = TimeSpan.FromSeconds(10);
-
     /// <summary>
     /// The maximum size the anomaly scales to while going supercritical
     /// </summary>
diff --git a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
similarity index 66%
rename from Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
rename to Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
index 3127f091e5..7e605ba150 100644
--- a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
@@ -1,46 +1,51 @@
 using Content.Shared.DeviceLinking;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Anomaly.Components;
+namespace Content.Shared.Anomaly.Components;
 
 /// <summary>
-/// a device that allows you to translate anomaly activity into multitool signals.
+/// A device that allows you to translate anomaly activity into multitool signals.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause, Access(typeof(AnomalySynchronizerSystem))]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(AnomalySynchronizerSystem))]
 public sealed partial class AnomalySynchronizerComponent : Component
 {
     /// <summary>
     /// The uid of the anomaly to which the synchronizer is connected.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntityUid? ConnectedAnomaly;
 
     /// <summary>
     /// Should the anomaly pulse when connected to the synchronizer?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool PulseOnConnect = true;
 
     /// <summary>
     /// Should the anomaly pulse when disconnected from synchronizer?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool PulseOnDisconnect = false;
 
     /// <summary>
-    /// minimum distance from the synchronizer to the anomaly to be attached
+    /// Minimum distance from the synchronizer to the anomaly to be attached.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float AttachRange = 0.4f;
 
     /// <summary>
-    /// Periodicheski checks to see if the anomaly has moved to disconnect it.
+    /// Periodically checks to see if the anomaly has moved to disconnect it.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan CheckFrequency = TimeSpan.FromSeconds(1f);
 
-    [DataField, AutoPausedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan NextCheckTime = TimeSpan.Zero;
 
     [DataField]
@@ -58,9 +63,9 @@ public sealed partial class AnomalySynchronizerComponent : Component
     [DataField]
     public ProtoId<SourcePortPrototype> SupercritPort = "Supercritical";
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier ConnectedSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier DisconnectedSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");
 }
diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
index a7e07ae2b5..dfc1d561c4 100644
--- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Anomaly.Effects;
 using Content.Shared.Body.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -62,7 +63,7 @@ public sealed partial class InnerBodyAnomalyComponent : Component
     /// Ability to use unique sprites for different body types
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Dictionary<ProtoId<BodyPrototype>, SpriteSpecifier> SpeciesSprites = new();
+    public Dictionary<ProtoId<SpeciesPrototype>, SpriteSpecifier> SpeciesSprites = new();
 
     /// <summary>
     /// The key of the entity layer into which the sprite will be inserted
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 3d00d43f41..ee3903a1d9 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -135,10 +135,10 @@ public abstract class SharedAnomalySystem : EntitySystem
         if (_net.IsServer)
             Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(ent.Owner)}");
 
-        Audio.PlayPvs(ent.Comp.SupercriticalSoundAtAnimationStart, Transform(ent).Coordinates);
+        Audio.PlayPvs(ent.Comp.SupercriticalSoundAtAnimationStart, ent);
 
         var super = AddComp<AnomalySupercriticalComponent>(ent);
-        super.EndTime = Timing.CurTime + super.SupercriticalDuration;
+        super.EndTime = Timing.CurTime + ent.Comp.SupercriticalDuration;
         Appearance.SetData(ent, AnomalyVisuals.Supercritical, true);
         Dirty(ent, super);
     }
diff --git a/Content.Shared/Atmos/Components/GasTankComponent.cs b/Content.Shared/Atmos/Components/GasTankComponent.cs
index 805874af33..7ca6098555 100644
--- a/Content.Shared/Atmos/Components/GasTankComponent.cs
+++ b/Content.Shared/Atmos/Components/GasTankComponent.cs
@@ -44,7 +44,7 @@ public sealed partial class GasTankComponent : Component, IGasMixtureHolder
     /// <summary>
     ///     Distributed pressure.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float OutputPressure = DefaultOutputPressure;
 
     /// <summary>
diff --git a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
index d01fb4e8bc..022a787ebd 100644
--- a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
+++ b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
@@ -234,9 +234,9 @@ public struct 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/SharedGasPressureRegulatorSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
new file mode 100644
index 0000000000..6e2d3e38ce
--- /dev/null
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs
@@ -0,0 +1,70 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+
+namespace Content.Shared.Atmos.EntitySystems;
+
+/// <summary>
+/// Handles all shared interactions with the gas pressure regulator.
+/// </summary>
+public abstract class SharedGasPressureRegulatorSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GasPressureRegulatorComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<GasPressureRegulatorComponent, GasPressureRegulatorChangeThresholdMessage>(
+            OnThresholdChangeMessage);
+    }
+
+    /// <summary>
+    /// Presents predicted examine information to the person examining the valve.
+    /// </summary>
+    /// <param name="ent"> <see cref="Entity{T}"/> of the valve</param>
+    /// <param name="args">Event arguments for examination</param>
+    private void OnExamined(Entity<GasPressureRegulatorComponent> ent, ref ExaminedEvent args)
+    {
+        if (!Transform(ent).Anchored || !args.IsInDetailsRange)
+            return;
+
+        using (args.PushGroup(nameof(GasPressureRegulatorComponent)))
+        {
+            args.PushMarkup(Loc.GetString("gas-pressure-regulator-system-examined",
+                ("statusColor", ent.Comp.Enabled ? "green" : "red"),
+                ("open", ent.Comp.Enabled)));
+
+            args.PushMarkup(Loc.GetString("gas-pressure-regulator-examined-threshold-pressure",
+                ("threshold", $"{ent.Comp.Threshold:0.#}")));
+
+            args.PushMarkup(Loc.GetString("gas-pressure-regulator-examined-flow-rate",
+                ("flowRate", $"{ent.Comp.FlowRate:0.#}")));
+        }
+    }
+
+    /// <summary>
+    /// Validates, logs, and updates the pressure threshold of the valve.
+    /// </summary>
+    /// <param name="ent">The <see cref="Entity{T}"/> of the valve.</param>
+    /// <param name="args">The received pressure from the <see cref="GasPressurePumpChangeOutputPressureMessage"/>message.</param>
+    private void OnThresholdChangeMessage(Entity<GasPressureRegulatorComponent> ent,
+        ref GasPressureRegulatorChangeThresholdMessage args)
+    {
+        ent.Comp.Threshold = Math.Max(0f, args.ThresholdPressure);
+        _adminLogger.Add(LogType.AtmosVolumeChanged,
+            LogImpact.Medium,
+            $"{ToPrettyString(args.Actor):player} set the pressure threshold on {ToPrettyString(ent):device} to {ent.Comp.Threshold}");
+        // Dirty the entire entity to ensure we get all of that Fresh:tm: UI info from the server.
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    protected virtual void UpdateUi(Entity<GasPressureRegulatorComponent> ent)
+    {
+    }
+}
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
index 27c3d16f29..8c7ebe8332 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs
@@ -52,6 +52,7 @@ public abstract class SharedGasTankSystem : EntitySystem
 
         ent.Comp.OutputPressure = pressure;
         Dirty(ent);
+        UpdateUserInterface(ent);
     }
 
     public virtual void UpdateUserInterface(Entity<GasTankComponent> ent)
diff --git a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
index 89d0bf2392..becc5378f2 100644
--- a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
+++ b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
@@ -388,9 +388,21 @@ public enum AtmosMonitorLimitType //<todo.eoin Very similar to the above...
 // fields you can find this prototype in
 public enum AtmosMonitorThresholdType
 {
-    Temperature,
-    Pressure,
-    Gas
+    Temperature = 0,
+    Pressure = 1,
+    Gas = 2
+}
+
+/// <summary>
+/// Bitflags version of <see cref="AtmosMonitorThresholdType"/>
+/// </summary>
+[Flags]
+public enum AtmosMonitorThresholdTypeFlags
+{
+    None = 0,
+    Temperature = 1 << 0,
+    Pressure = 1 << 1,
+    Gas = 1 << 2,
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
new file mode 100644
index 0000000000..2e893d28fc
--- /dev/null
+++ b/Content.Shared/Atmos/Piping/Binary/Components/GasPressureRegulatorComponent.cs
@@ -0,0 +1,88 @@
+using Content.Shared.Guidebook;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Atmos.Piping.Binary.Components;
+
+/// <summary>
+/// Defines a gas pressure regulator,
+/// which releases gas depending on a set pressure threshold between two pipe nodes.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(true, true), AutoGenerateComponentPause]
+public sealed partial class GasPressureRegulatorComponent : Component
+{
+    /// <summary>
+    /// Determines whether the valve is open or closed.
+    /// Used for showing the valve animation, the UI,
+    /// and on examine.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled;
+
+    /// <summary>
+    /// Specifies the pipe node name to be treated as the inlet.
+    /// </summary>
+    [DataField]
+    public string InletName = "inlet";
+
+    /// <summary>
+    /// Specifies the pipe node name to be treated as the outlet.
+    /// </summary>
+    [DataField]
+    public string OutletName = "outlet";
+
+    /// <summary>
+    /// The max transfer rate of the pressure regulator.
+    /// </summary>
+    [GuidebookData]
+    [DataField]
+    public float MaxTransferRate = Atmospherics.MaxTransferRate;
+
+    /// <summary>
+    /// The server time at which the next UI update will be sent.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextUiUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// Sets the opening threshold of the pressure regulator.
+    /// </summary>
+    /// <example> If set to 500 kPa, the regulator will only
+    /// open if the pressure in the inlet side is above
+    /// 500 kPa. </example>
+    [DataField, AutoNetworkedField]
+    public float Threshold;
+
+    /// <summary>
+    /// How often the UI update is sent.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
+    #region UI/Examine Info
+
+    /// <summary>
+    /// The current flow rate of the pressure regulator.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField, AutoNetworkedField]
+    public float FlowRate;
+
+    /// <summary>
+    /// Current inlet pressure the pressure regulator.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField, AutoNetworkedField]
+    public float InletPressure;
+
+    /// <summary>
+    /// Current outlet pressure of the pressure regulator.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField, AutoNetworkedField]
+    public float OutletPressure;
+
+    #endregion
+}
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
new file mode 100644
index 0000000000..74ca041d10
--- /dev/null
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasPressureRegulatorComponent.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Atmos.Piping.Binary.Components;
+
+/// <summary>
+/// Represents the unique key for the UI.
+/// </summary>
+[Serializable, NetSerializable]
+public enum GasPressureRegulatorUiKey : byte
+{
+    Key,
+}
+
+/// <summary>
+/// Message sent to change the pressure threshold of the gas pressure regulator.
+/// </summary>
+/// <param name="pressure">The new pressure threshold value.</param>
+[Serializable, NetSerializable]
+public sealed class GasPressureRegulatorChangeThresholdMessage(float pressure) : BoundUserInterfaceMessage
+{
+    /// <summary>
+    /// Gets the new threshold pressure value.
+    /// </summary>
+    public float ThresholdPressure { get; } = pressure;
+}
diff --git a/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs b/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
index dfc7b7a386..5193afcdd9 100644
--- a/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
+++ b/Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
@@ -31,4 +31,10 @@ namespace Content.Shared.Atmos.Piping
     {
         Enabled,
     }
+
+    [Serializable, NetSerializable]
+    public enum PressureRegulatorVisuals : byte
+    {
+        State,
+    }
 }
diff --git a/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
index 204cbc76d5..40d76684ee 100644
--- a/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Atmos.Piping.Unary.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class GasCanisterComponent : Component, IGasMixtureHolder
 {
     [DataField("port")]
diff --git a/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs b/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
new file mode 100644
index 0000000000..3a1c991b1e
--- /dev/null
+++ b/Content.Shared/Bed/Components/StasisBedBuckledComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Components;
+
+/// <summary>
+/// Tracking component added to entities buckled to stasis beds.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedBedSystem))]
+public sealed partial class StasisBedBuckledComponent : Component;
diff --git a/Content.Shared/Bed/Components/StasisBedComponent.cs b/Content.Shared/Bed/Components/StasisBedComponent.cs
new file mode 100644
index 0000000000..97936261d6
--- /dev/null
+++ b/Content.Shared/Bed/Components/StasisBedComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Buckle.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Components;
+
+/// <summary>
+/// A <see cref="StrapComponent"/> that modifies a strapped entity's metabolic rate by the given multiplier
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedBedSystem))]
+public sealed partial class StasisBedComponent : Component
+{
+    /// <summary>
+    /// What the metabolic update rate will be multiplied by (higher = slower metabolism)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Multiplier = 10f;
+}
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index d1066b43e2..757a707d40 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -25,6 +25,7 @@ public abstract class SharedCryostorageSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
     [Dependency] protected readonly SharedMindSystem Mind = default!;
+    [Dependency] private readonly MetaDataSystem _meta = default!;
 
     protected EntityUid? PausedMap { get; private set; }
 
@@ -158,7 +159,7 @@ public abstract class SharedCryostorageSystem : EntitySystem
         if (PausedMap == null || !Exists(PausedMap))
             return;
 
-        EntityManager.DeleteEntity(PausedMap.Value);
+        Del(PausedMap.Value);
         PausedMap = null;
     }
 
@@ -167,8 +168,10 @@ public abstract class SharedCryostorageSystem : EntitySystem
         if (PausedMap != null && Exists(PausedMap))
             return;
 
-        PausedMap = _map.CreateMap();
-        _map.SetPaused(PausedMap.Value, true);
+        var mapUid = _map.CreateMap();
+        _meta.SetEntityName(mapUid, Loc.GetString("cryostorage-paused-map-name"));
+        _map.SetPaused(mapUid, true);
+        PausedMap = mapUid;
     }
 
     public bool IsInPausedMap(Entity<TransformComponent?> entity)
diff --git a/Content.Shared/Bed/SharedBedSystem.cs b/Content.Shared/Bed/SharedBedSystem.cs
index 27561023f8..e640629dd0 100644
--- a/Content.Shared/Bed/SharedBedSystem.cs
+++ b/Content.Shared/Bed/SharedBedSystem.cs
@@ -2,7 +2,12 @@ using Content.Shared._Sunrise.Bed;
 using Content.Shared.Actions;
 using Content.Shared.Bed.Components;
 using Content.Shared.Bed.Sleep;
+using Content.Shared.Body.Events;
+using Content.Shared.Body.Systems;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Emag.Systems;
+using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Bed;
@@ -12,6 +17,9 @@ public abstract class SharedBedSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly ActionContainerSystem _actConts = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly SharedMetabolizerSystem _metabolizer = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
     [Dependency] private readonly SleepingSystem _sleepingSystem = default!;
 
     public override void Initialize()
@@ -27,6 +35,12 @@ public abstract class SharedBedSystem : EntitySystem
         //SubscribeLocalEvent<HealOnBuckleComponent, MapInitEvent>(OnHealMapInit);
         SubscribeLocalEvent<HealOnBuckleComponent, StrappedEvent>(OnStrapped);
         SubscribeLocalEvent<HealOnBuckleComponent, UnstrappedEvent>(OnUnstrapped);
+
+        SubscribeLocalEvent<StasisBedComponent, StrappedEvent>(OnStasisStrapped);
+        SubscribeLocalEvent<StasisBedComponent, UnstrappedEvent>(OnStasisUnstrapped);
+        SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnStasisEmagged);
+        SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<StasisBedBuckledComponent, GetMetabolicMultiplierEvent>(OnStasisGetMetabolicMultiplier);
     }
 
     // Sunrise-Start
@@ -65,8 +79,70 @@ public abstract class SharedBedSystem : EntitySystem
     private void OnUnstrapped(Entity<HealOnBuckleComponent> bed, ref UnstrappedEvent args)
     {
         // Sunrise-Edit
-        //_actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction);
-        //_sleepingSystem.TryWaking(args.Buckle.Owner);
+        // If the entity being unbuckled is terminating, we shouldn't try to act upon it, as some components may be gone
+        //if (!Terminating(args.Buckle.Owner))
+        //{
+        //    _actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction);
+        //    _sleepingSystem.TryWaking(args.Buckle.Owner);
+        //}
+
         RemComp<HealOnBuckleHealingComponent>(bed);
     }
+
+    private void OnStasisStrapped(Entity<StasisBedComponent> ent, ref StrappedEvent args)
+    {
+        EnsureComp<StasisBedBuckledComponent>(args.Buckle);
+        _metabolizer.UpdateMetabolicMultiplier(args.Buckle);
+    }
+
+    private void OnStasisUnstrapped(Entity<StasisBedComponent> ent, ref UnstrappedEvent args)
+    {
+        RemComp<StasisBedBuckledComponent>(ent);
+        _metabolizer.UpdateMetabolicMultiplier(args.Buckle);
+    }
+
+    private void OnStasisEmagged(Entity<StasisBedComponent> ent, ref GotEmaggedEvent args)
+    {
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+            return;
+
+        if (_emag.CheckFlag(ent, EmagType.Interaction))
+            return;
+
+        ent.Comp.Multiplier = 1f / ent.Comp.Multiplier;
+        UpdateMetabolisms(ent.Owner);
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+
+    private void OnPowerChanged(Entity<StasisBedComponent> ent, ref PowerChangedEvent args)
+    {
+        UpdateMetabolisms(ent.Owner);
+    }
+
+    private void OnStasisGetMetabolicMultiplier(Entity<StasisBedBuckledComponent> ent, ref GetMetabolicMultiplierEvent args)
+    {
+        if (!TryComp<BuckleComponent>(ent, out var buckle) || buckle.BuckledTo is not { } buckledTo)
+            return;
+
+        if (!TryComp<StasisBedComponent>(buckledTo, out var stasis))
+            return;
+
+        if (!_powerReceiver.IsPowered(buckledTo))
+            return;
+
+        args.Multiplier *= stasis.Multiplier;
+    }
+
+    protected void UpdateMetabolisms(Entity<StrapComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        foreach (var buckledEntity in ent.Comp.BuckledEntities)
+        {
+            _metabolizer.UpdateMetabolicMultiplier(buckledEntity);
+        }
+    }
 }
diff --git a/Content.Shared/Bed/Sleep/ForcedSleepingComponent.cs b/Content.Shared/Bed/Sleep/ForcedSleepingComponent.cs
deleted file mode 100644
index 197e8cc56a..0000000000
--- a/Content.Shared/Bed/Sleep/ForcedSleepingComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Bed.Sleep
-{
-    /// <summary>
-    /// Prevents waking up. Use as a status effect.
-    /// </summary>
-    [NetworkedComponent, RegisterComponent]
-    public sealed partial class ForcedSleepingComponent : Component
-    {}
-}
diff --git a/Content.Shared/Bed/Sleep/ForcedSleepingStatusEffectComponent.cs b/Content.Shared/Bed/Sleep/ForcedSleepingStatusEffectComponent.cs
new file mode 100644
index 0000000000..b94c1d31c8
--- /dev/null
+++ b/Content.Shared/Bed/Sleep/ForcedSleepingStatusEffectComponent.cs
@@ -0,0 +1,10 @@
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Sleep;
+
+/// <summary>
+/// Prevents waking up. Use only in conjunction with <see cref="StatusEffectComponent"/>, on the status effect entity.
+/// </summary>
+[NetworkedComponent, RegisterComponent]
+public sealed partial class ForcedSleepingStatusEffectComponent : Component;
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index dce7381b09..b6a2b0775b 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -18,7 +18,7 @@ using Content.Shared.Slippery;
 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;
 using Content.Shared.Verbs;
@@ -38,10 +38,12 @@ 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 StatusEffectsSystem _statusEffectsSystem = 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";
+    public static readonly EntProtoId StatusEffectForcedSleeping = "StatusEffectForcedSleeping";
 
     public override void Initialize()
     {
@@ -65,8 +67,10 @@ public sealed partial class SleepingSystem : EntitySystem
         SubscribeLocalEvent<SleepingComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb);
         SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<SleepingComponent, StunEndAttemptEvent>(OnStunEndAttempt);
+        SubscribeLocalEvent<SleepingComponent, StandUpAttemptEvent>(OnStandUpAttempt);
 
-        SubscribeLocalEvent<ForcedSleepingComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<ForcedSleepingStatusEffectComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
         SubscribeLocalEvent<SleepingComponent, UnbuckleAttemptEvent>(OnUnbuckleAttempt);
         SubscribeLocalEvent<SleepingComponent, EmoteAttemptEvent>(OnEmoteAttempt);
 
@@ -104,10 +108,7 @@ public sealed partial class SleepingSystem : EntitySystem
     {
         if (args.FellAsleep)
         {
-            // Expiring status effects would remove the components needed for sleeping
-            _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "Stun");
-            _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "KnockedDown");
-
+            // Just in case we're not using the sleeping status
             EnsureComp<StunnedComponent>(ent);
             EnsureComp<KnockedDownComponent>(ent);
 
@@ -127,8 +128,9 @@ public sealed partial class SleepingSystem : EntitySystem
             return;
         }
 
-        RemComp<StunnedComponent>(ent);
-        RemComp<KnockedDownComponent>(ent);
+        _stun.TryUnstun(ent.Owner);
+        _stun.TryStanding(ent.Owner);
+
         RemComp<SpamEmitSoundComponent>(ent);
     }
 
@@ -173,6 +175,17 @@ public sealed partial class SleepingSystem : EntitySystem
         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)
@@ -186,7 +199,6 @@ public sealed partial class SleepingSystem : EntitySystem
         if (!args.CanInteract || !args.CanAccess)
             return;
 
-        var target = args.Target;
         var user = args.User;
         AlternativeVerb verb = new()
         {
@@ -249,9 +261,12 @@ public sealed partial class SleepingSystem : EntitySystem
             _emitSound.SetEnabled((ent, spam), args.NewMobState == MobState.Alive);
     }
 
-    private void OnInit(Entity<ForcedSleepingComponent> ent, ref ComponentInit args)
+    private void OnStatusEffectApplied(Entity<ForcedSleepingStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        TrySleeping(ent.Owner);
+        // 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)
@@ -310,7 +325,7 @@ public sealed partial class SleepingSystem : EntitySystem
         if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!force && HasComp<ForcedSleepingComponent>(ent))
+        if (!force && _statusEffect.HasEffectComp<ForcedSleepingStatusEffectComponent>(ent))
         {
             if (user != null)
             {
diff --git a/Content.Shared/Bed/StasisBedVisuals.cs b/Content.Shared/Bed/StasisBedVisuals.cs
deleted file mode 100644
index cf7bc06460..0000000000
--- a/Content.Shared/Bed/StasisBedVisuals.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Bed
-{
-    [Serializable, NetSerializable]
-    public enum StasisBedVisuals : byte
-    {
-        IsOn,
-    }
-}
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index f692db01eb..115db4db41 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -32,6 +32,7 @@ public sealed partial class BlockingSystem : EntitySystem
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
     [Dependency] private readonly ItemToggleSystem _toggle = default!; // Sunrise-Edit
 
     public override void Initialize()
@@ -98,7 +99,7 @@ public sealed partial class BlockingSystem : EntitySystem
         if (!handQuery.TryGetComponent(args.Performer, out var hands))
             return;
 
-        var shields = _handsSystem.EnumerateHeld(args.Performer, hands).ToArray();
+        var shields = _handsSystem.EnumerateHeld((args.Performer, hands)).ToArray();
 
         foreach (var shield in shields)
         {
@@ -167,7 +168,7 @@ public sealed partial class BlockingSystem : EntitySystem
         }
 
         //Don't allow someone to block if someone else is on the same tile
-        var playerTileRef = xform.Coordinates.GetTileRef();
+        var playerTileRef = _turf.GetTileRef(xform.Coordinates);
         if (playerTileRef != null)
         {
             var intersecting = _lookup.GetLocalEntitiesIntersecting(playerTileRef.Value, 0f);
@@ -278,7 +279,7 @@ public sealed partial class BlockingSystem : EntitySystem
         if (!handQuery.TryGetComponent(user, out var hands))
             return;
 
-        var shields = _handsSystem.EnumerateHeld(user, hands).ToArray();
+        var shields = _handsSystem.EnumerateHeld((user, hands)).ToArray();
 
         foreach (var shield in shields)
         {
diff --git a/Content.Shared/Body/Components/BloodstreamComponent.cs b/Content.Shared/Body/Components/BloodstreamComponent.cs
new file mode 100644
index 0000000000..0139932262
--- /dev/null
+++ b/Content.Shared/Body/Components/BloodstreamComponent.cs
@@ -0,0 +1,212 @@
+using Content.Shared.Alert;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Body.Components;
+
+/// <summary>
+/// Gives an entity a bloodstream.
+/// </summary>
+[RegisterComponent, NetworkedComponent,]
+[AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
+[Access(typeof(SharedBloodstreamSystem))]
+public sealed partial class BloodstreamComponent : Component
+{
+    public const string DefaultChemicalsSolutionName = "chemicals";
+    public const string DefaultBloodSolutionName = "bloodstream";
+    public const string DefaultBloodTemporarySolutionName = "bloodstreamTemporary";
+
+    /// <summary>
+    /// The next time that blood level will be updated and bloodloss damage dealt.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate;
+
+    /// <summary>
+    /// The interval at which this component updates.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(3);
+
+    /// <summary>
+    /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float UpdateIntervalMultiplier = 1f;
+
+    /// <summary>
+    /// Adjusted update interval based off of the multiplier value.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
+    /// <summary>
+    /// How much is this entity currently bleeding?
+    /// Higher numbers mean more blood lost every tick.
+    ///
+    /// Goes down slowly over time, and items like bandages
+    /// or clotting reagents can lower bleeding.
+    /// </summary>
+    /// <remarks>
+    /// This generally corresponds to an amount of damage and can't go above 100.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public float BleedAmount;
+
+    /// <summary>
+    /// How much should bleeding be reduced every update interval?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BleedReductionAmount = 0.33f;
+
+    /// <summary>
+    /// How high can <see cref="BleedAmount"/> go?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float MaxBleedAmount = 10.0f;
+
+    /// <summary>
+    /// What percentage of current blood is necessary to avoid dealing blood loss damage?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BloodlossThreshold = 0.9f;
+
+    /// <summary>
+    /// The base bloodloss damage to be incurred if below <see cref="BloodlossThreshold"/>
+    /// The default values are defined per mob/species in YML.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier BloodlossDamage = new();
+
+    /// <summary>
+    /// The base bloodloss damage to be healed if above <see cref="BloodlossThreshold"/>
+    /// The default values are defined per mob/species in YML.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier BloodlossHealDamage = new();
+
+    // TODO shouldn't be hardcoded, should just use some organ simulation like bone marrow or smth.
+    /// <summary>
+    /// How much reagent of blood should be restored each update interval?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 BloodRefreshAmount = 1.0f;
+
+    /// <summary>
+    /// How much blood needs to be in the temporary solution in order to create a puddle?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 BleedPuddleThreshold = 1.0f;
+
+    /// <summary>
+    /// A modifier set prototype ID corresponding to how damage should be modified
+    /// before taking it into account for bloodloss.
+    /// </summary>
+    /// <remarks>
+    /// For example, piercing damage is increased while poison damage is nullified entirely.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public ProtoId<DamageModifierSetPrototype> DamageBleedModifiers = "BloodlossHuman";
+
+    /// <summary>
+    /// The sound to be played when a weapon instantly deals blood loss damage.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("blood");
+
+    /// <summary>
+    /// The sound to be played when some damage actually heals bleeding rather than starting it.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier BloodHealedSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
+
+    /// <summary>
+    /// The minimum amount damage reduction needed to play the healing sound/popup.
+    /// This prevents tiny amounts of heat damage from spamming the sound, e.g. spacing.
+    /// </summary>
+    [DataField]
+    public float BloodHealedSoundThreshold = -0.1f;
+
+    // TODO probably damage bleed thresholds.
+
+    /// <summary>
+    /// Max volume of internal chemical solution storage
+    /// </summary>
+    [DataField]
+    public FixedPoint2 ChemicalMaxVolume = FixedPoint2.New(250);
+
+    /// <summary>
+    /// Max volume of internal blood storage,
+    /// and starting level of blood.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 BloodMaxVolume = FixedPoint2.New(300);
+
+    /// <summary>
+    /// Which reagent is considered this entities 'blood'?
+    /// </summary>
+    /// <remarks>
+    /// Slime-people might use slime as their blood or something like that.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> BloodReagent = "Blood";
+
+    /// <summary>
+    /// Name/Key that <see cref="BloodSolution"/> is indexed by.
+    /// </summary>
+    [DataField]
+    public string BloodSolutionName = DefaultBloodSolutionName;
+
+    /// <summary>
+    /// Name/Key that <see cref="ChemicalSolution"/> is indexed by.
+    /// </summary>
+    [DataField]
+    public string ChemicalSolutionName = DefaultChemicalsSolutionName;
+
+    /// <summary>
+    /// Name/Key that <see cref="TemporarySolution"/> is indexed by.
+    /// </summary>
+    [DataField]
+    public string BloodTemporarySolutionName = DefaultBloodTemporarySolutionName;
+
+    /// <summary>
+    /// Internal solution for blood storage
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? BloodSolution;
+
+    /// <summary>
+    /// Internal solution for reagent storage
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? ChemicalSolution;
+
+    /// <summary>
+    /// Temporary blood solution.
+    /// When blood is lost, it goes to this solution, and when this
+    /// solution hits a certain cap, the blood is actually spilled as a puddle.
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? TemporarySolution;
+
+    /// <summary>
+    /// Variable that stores the amount of status time added by having a low blood level.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan StatusTime;
+
+    /// <summary>
+    /// Alert to show when bleeding.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> BleedingAlert = "Bleed";
+}
diff --git a/Content.Shared/Body/Components/StomachComponent.cs b/Content.Shared/Body/Components/StomachComponent.cs
index 43960691b2..f027009822 100644
--- a/Content.Shared/Body/Components/StomachComponent.cs
+++ b/Content.Shared/Body/Components/StomachComponent.cs
@@ -23,6 +23,18 @@ namespace Content.Shared.Body.Components
         [DataField]
         public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
+        /// <summary>
+        /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+        /// </summary>
+        [DataField]
+        public float UpdateIntervalMultiplier = 1f;
+
+        /// <summary>
+        /// Adjusted update interval based off of the multiplier value.
+        /// </summary>
+        [ViewVariables]
+        public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
         /// <summary>
         ///     The solution inside of this stomach this transfers reagents to the body.
         /// </summary>
diff --git a/Content.Shared/Body/Events/ApplyMetabolicMultiplierEvent.cs b/Content.Shared/Body/Events/ApplyMetabolicMultiplierEvent.cs
deleted file mode 100644
index dafc1e49de..0000000000
--- a/Content.Shared/Body/Events/ApplyMetabolicMultiplierEvent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace Content.Shared.Body.Events;
-
-// TODO REFACTOR THIS
-// This will cause rates to slowly drift over time due to floating point errors.
-// Instead, the system that raised this should trigger an update and subscribe to get-modifier events.
-[ByRefEvent]
-public readonly record struct ApplyMetabolicMultiplierEvent(
-    EntityUid Uid,
-    float Multiplier,
-    bool Apply)
-{
-    /// <summary>
-    /// The entity whose metabolism is being modified.
-    /// </summary>
-    public readonly EntityUid Uid = Uid;
-
-    /// <summary>
-    /// What the metabolism's update rate will be multiplied by.
-    /// </summary>
-    public readonly float Multiplier = Multiplier;
-
-    /// <summary>
-    /// If true, apply the multiplier. If false, revert it.
-    /// </summary>
-    public readonly bool Apply = Apply;
-}
diff --git a/Content.Server/Body/Components/BeingGibbedEvent.cs b/Content.Shared/Body/Events/BeingGibbedEvent.cs
similarity index 81%
rename from Content.Server/Body/Components/BeingGibbedEvent.cs
rename to Content.Shared/Body/Events/BeingGibbedEvent.cs
index a010855f78..7ab34f2e18 100644
--- a/Content.Server/Body/Components/BeingGibbedEvent.cs
+++ b/Content.Shared/Body/Events/BeingGibbedEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Body.Components;
+namespace Content.Shared.Body.Events;
 
 /// <summary>
 /// Raised when a body gets gibbed, before it is deleted.
diff --git a/Content.Shared/Body/Events/MetabolizerEvents.cs b/Content.Shared/Body/Events/MetabolizerEvents.cs
new file mode 100644
index 0000000000..f001c83f88
--- /dev/null
+++ b/Content.Shared/Body/Events/MetabolizerEvents.cs
@@ -0,0 +1,26 @@
+namespace Content.Shared.Body.Events;
+
+/// <summary>
+/// Raised on an entity to determine their metabolic multiplier.
+/// </summary>
+[ByRefEvent]
+public record struct GetMetabolicMultiplierEvent()
+{
+    /// <summary>
+    /// What the metabolism's update rate will be multiplied by.
+    /// </summary>
+    public float Multiplier = 1f;
+}
+
+/// <summary>
+/// Raised on an entity to apply their metabolic multiplier to relevant systems.
+/// Note that you should be storing this value as to not accrue precision errors when it's modified.
+/// </summary>
+[ByRefEvent]
+public readonly record struct ApplyMetabolicMultiplierEvent(float Multiplier)
+{
+    /// <summary>
+    /// What the metabolism's update rate will be multiplied by.
+    /// </summary>
+    public readonly float Multiplier = Multiplier;
+}
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
new file mode 100644
index 0000000000..ac385040a9
--- /dev/null
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -0,0 +1,513 @@
+using Content.Shared.Alert;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Events;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Damage;
+using Content.Shared.Drunk;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids;
+using Content.Shared.Forensics.Components;
+using Content.Shared.HealthExaminable;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Rejuvenate;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Body.Systems;
+
+public abstract class SharedBloodstreamSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPuddleSystem _puddle = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly SharedDrunkSystem _drunkSystem = default!;
+    [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BloodstreamComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<BloodstreamComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
+        SubscribeLocalEvent<BloodstreamComponent, ReactionAttemptEvent>(OnReactionAttempt);
+        SubscribeLocalEvent<BloodstreamComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
+        SubscribeLocalEvent<BloodstreamComponent, DamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<BloodstreamComponent, HealthBeingExaminedEvent>(OnHealthBeingExamined);
+        SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<BloodstreamComponent>();
+        while (query.MoveNext(out var uid, out var bloodstream))
+        {
+            if (curTime < bloodstream.NextUpdate)
+                continue;
+
+            bloodstream.NextUpdate += bloodstream.AdjustedUpdateInterval;
+            DirtyField(uid, bloodstream, nameof(BloodstreamComponent.NextUpdate)); // needs to be dirtied on the client so it can be rerolled during prediction
+
+            if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
+                continue;
+
+            // Adds blood to their blood level if it is below the maximum; Blood regeneration. Must be alive.
+            if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
+            {
+                TryModifyBloodLevel((uid, bloodstream), bloodstream.BloodRefreshAmount);
+            }
+
+            // Removes blood from the bloodstream based on bleed amount (bleed rate)
+            // as well as stop their bleeding to a certain extent.
+            if (bloodstream.BleedAmount > 0)
+            {
+                // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
+                TryModifyBloodLevel((uid, bloodstream), -bloodstream.BleedAmount);
+                // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
+                TryModifyBleedAmount((uid, bloodstream), -bloodstream.BleedReductionAmount);
+            }
+
+            // deal bloodloss damage if their blood level is below a threshold.
+            var bloodPercentage = GetBloodLevelPercentage((uid, bloodstream));
+            if (bloodPercentage < bloodstream.BloodlossThreshold && !_mobStateSystem.IsDead(uid))
+            {
+                // bloodloss damage is based on the base value, and modified by how low your blood level is.
+                var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
+
+                _damageableSystem.TryChangeDamage(uid, amt,
+                    ignoreResistances: false, interruptsDoAfters: false);
+
+                // Apply dizziness as a symptom of bloodloss.
+                // The effect is applied in a way that it will never be cleared without being healthy.
+                // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
+                _drunkSystem.TryApplyDrunkenness(
+                    uid,
+                    (float)bloodstream.AdjustedUpdateInterval.TotalSeconds * 2,
+                    applySlur: false);
+                _stutteringSystem.DoStutter(uid, bloodstream.AdjustedUpdateInterval * 2, refresh: false);
+
+                // storing the drunk and stutter time so we can remove it independently from other effects additions
+                bloodstream.StatusTime += bloodstream.AdjustedUpdateInterval * 2;
+                DirtyField(uid, bloodstream, nameof(BloodstreamComponent.StatusTime));
+            }
+            else if (!_mobStateSystem.IsDead(uid))
+            {
+                // If they're healthy, we'll try and heal some bloodloss instead.
+                _damageableSystem.TryChangeDamage(
+                    uid,
+                    bloodstream.BloodlossHealDamage * bloodPercentage,
+                    ignoreResistances: true, interruptsDoAfters: false);
+
+                // Remove the drunk effect when healthy. Should only remove the amount of drunk and stutter added by low blood level
+                _drunkSystem.TryRemoveDrunkenessTime(uid, bloodstream.StatusTime.TotalSeconds);
+                _stutteringSystem.DoRemoveStutterTime(uid, bloodstream.StatusTime.TotalSeconds);
+                // Reset the drunk and stutter time to zero
+                bloodstream.StatusTime = TimeSpan.Zero;
+                DirtyField(uid, bloodstream, nameof(BloodstreamComponent.StatusTime));
+            }
+        }
+    }
+
+    private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.AdjustedUpdateInterval;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.NextUpdate));
+    }
+
+    // prevent the infamous UdderSystem debug assert, see https://github.com/space-wizards/space-station-14/pull/35314
+    // TODO: find a better solution than copy pasting this into every shared system that caches solution entities
+    private void OnEntRemoved(Entity<BloodstreamComponent> entity, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and set it to null
+        if (args.Entity == entity.Comp.BloodSolution?.Owner)
+            entity.Comp.BloodSolution = null;
+
+        if (args.Entity == entity.Comp.ChemicalSolution?.Owner)
+            entity.Comp.ChemicalSolution = null;
+
+        if (args.Entity == entity.Comp.TemporarySolution?.Owner)
+            entity.Comp.TemporarySolution = null;
+    }
+
+    private void OnReactionAttempt(Entity<BloodstreamComponent> ent, ref ReactionAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        foreach (var effect in args.Reaction.Effects)
+        {
+            switch (effect)
+            {
+                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
+                case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
+                    args.Cancelled = true;
+                    return;
+            }
+        }
+
+        // The area-reaction effect canceling is part of avoiding smoke-fork-bombs (create two smoke bombs, that when
+        // ingested by mobs create more smoke). This also used to act as a rapid chemical-purge, because all the
+        // reagents would get carried away by the smoke/foam. This does still work for the stomach (I guess people vomit
+        // up the smoke or spawned entities?).
+
+        // TODO apply organ damage instead of just blocking the reaction?
+        // Having cheese-clots form in your veins can't be good for you.
+    }
+
+    private void OnReactionAttempt(Entity<BloodstreamComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
+    {
+        if (args.Name != ent.Comp.BloodSolutionName
+            && args.Name != ent.Comp.ChemicalSolutionName
+            && args.Name != ent.Comp.BloodTemporarySolutionName)
+        {
+            return;
+        }
+
+        OnReactionAttempt(ent, ref args.Event);
+    }
+
+    private void OnDamageChanged(Entity<BloodstreamComponent> ent, ref DamageChangedEvent args)
+    {
+        // The incoming state from the server raises a DamageChangedEvent as well.
+        // But the changes to the bloodstream have also been dirtied,
+        // so we prevent applying them twice.
+        if (_timing.ApplyingState)
+            return;
+
+        if (args.DamageDelta is null || !args.DamageIncreased)
+        {
+            return;
+        }
+
+        // TODO probably cache this or something. humans get hurt a lot
+        if (!_prototypeManager.TryIndex(ent.Comp.DamageBleedModifiers, out var modifiers))
+            return;
+
+        // some reagents may deal and heal different damage types in the same tick, which means DamageIncreased will be true
+        // but we only want to consider the dealt damage when causing bleeding
+        var damage = DamageSpecifier.GetPositive(args.DamageDelta);
+        var bloodloss = DamageSpecifier.ApplyModifierSet(damage, modifiers);
+
+        if (bloodloss.Empty)
+            return;
+
+        // Does the calculation of how much bleed rate should be added/removed, then applies it
+        var oldBleedAmount = ent.Comp.BleedAmount;
+        var total = bloodloss.GetTotal();
+        var totalFloat = total.Float();
+        TryModifyBleedAmount(ent.AsNullable(), totalFloat);
+
+        /// Critical hit. Causes target to lose blood, using the bleed rate modifier of the weapon, currently divided by 5
+        /// The crit chance is currently the bleed rate modifier divided by 25.
+        /// Higher damage weapons have a higher chance to crit!
+
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        // Use both the receiver and the damage causing entity for the seed so that we have different results for multiple attacks in the same tick
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id, GetNetEntity(args.Origin)?.Id ?? 0 });
+        var rand = new System.Random(seed);
+        var prob = Math.Clamp(totalFloat / 25, 0, 1);
+        if (totalFloat > 0 && rand.Prob(prob))
+        {
+            TryModifyBloodLevel(ent.AsNullable(), -total / 5);
+            _audio.PlayPredicted(ent.Comp.InstantBloodSound, ent, args.Origin);
+        }
+
+        // Heat damage will cauterize, causing the bleed rate to be reduced.
+        else if (totalFloat <= ent.Comp.BloodHealedSoundThreshold && oldBleedAmount > 0)
+        {
+            // Magically, this damage has healed some bleeding, likely
+            // because it's burn damage that cauterized their wounds.
+
+            // We'll play a special sound and popup for feedback.
+            _popup.PopupEntity(Loc.GetString("bloodstream-component-wounds-cauterized"), ent,
+                    ent, PopupType.Medium); // only the burned entity can see this
+            _audio.PlayPredicted(ent.Comp.BloodHealedSound, ent, args.Origin);
+        }
+    }
+
+    /// <summary>
+    /// Shows text on health examine, based on bleed rate and blood level.
+    /// </summary>
+    private void OnHealthBeingExamined(Entity<BloodstreamComponent> ent, ref HealthBeingExaminedEvent args)
+    {
+        // Shows massively bleeding at 0.75x the max bleed rate.
+        if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount * 0.75f)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-massive-bleeding", ("target", ent.Owner)));
+        }
+        // Shows bleeding message when bleeding above half the max rate, but less than massively.
+        else if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount * 0.5f)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-strong-bleeding", ("target", ent.Owner)));
+        }
+        // Shows bleeding message when bleeding above 0.25x the max rate, but less than half the max.
+        else if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount * 0.25f)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner)));
+        }
+        // Shows bleeding message when bleeding below 0.25x the max cap
+        else if (ent.Comp.BleedAmount > 0)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-slight-bleeding", ("target", ent.Owner)));
+        }
+
+        // If the mob's blood level is below the damage threshhold, the pale message is added.
+        if (GetBloodLevelPercentage(ent.AsNullable()) < ent.Comp.BloodlossThreshold)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
+        }
+    }
+
+    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref BeingGibbedEvent args)
+    {
+        SpillAllSolutions(ent.AsNullable());
+    }
+
+    private void OnApplyMetabolicMultiplier(Entity<BloodstreamComponent> ent, ref ApplyMetabolicMultiplierEvent args)
+    {
+        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.UpdateIntervalMultiplier));
+    }
+
+    private void OnRejuvenate(Entity<BloodstreamComponent> ent, ref RejuvenateEvent args)
+    {
+        TryModifyBleedAmount(ent.AsNullable(), -ent.Comp.BleedAmount);
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+            TryModifyBloodLevel(ent.AsNullable(), bloodSolution.AvailableVolume);
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution))
+            SolutionContainer.RemoveAllSolution(ent.Comp.ChemicalSolution.Value);
+    }
+
+    /// <summary>
+    /// Returns the current blood level as a percentage (between 0 and 1).
+    /// </summary>
+    public float GetBloodLevelPercentage(Entity<BloodstreamComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        {
+            return 0.0f;
+        }
+
+        return bloodSolution.FillFraction;
+    }
+
+    /// <summary>
+    /// Setter for the BloodlossThreshold datafield.
+    /// </summary>
+    public void SetBloodLossThreshold(Entity<BloodstreamComponent?> ent, float threshold)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.BloodlossThreshold = threshold;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodlossThreshold));
+    }
+
+    /// <summary>
+    /// Attempt to transfer a provided solution to internal solution.
+    /// </summary>
+    public bool TryAddToChemicals(Entity<BloodstreamComponent?> ent, Solution solution)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution))
+            return false;
+
+        if (SolutionContainer.TryAddSolution(ent.Comp.ChemicalSolution.Value, solution))
+            return true;
+
+        return false;
+    }
+
+    /// <summary>
+    /// Removes a certain amount of all reagents except of a single excluded one from the bloodstream.
+    /// </summary>
+    public bool FlushChemicals(Entity<BloodstreamComponent?> ent, ProtoId<ReagentPrototype>? excludedReagentID, FixedPoint2 quantity)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution, out var chemSolution))
+            return false;
+
+        for (var i = chemSolution.Contents.Count - 1; i >= 0; i--)
+        {
+            var (reagentId, _) = chemSolution.Contents[i];
+            if (reagentId.Prototype != excludedReagentID)
+            {
+                SolutionContainer.RemoveReagent(ent.Comp.ChemicalSolution.Value, reagentId, quantity);
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    ///  Attempts to modify the blood level of this entity directly.
+    /// </summary>
+    public bool TryModifyBloodLevel(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution))
+            return false;
+
+        if (amount >= 0)
+            return SolutionContainer.TryAddReagent(ent.Comp.BloodSolution.Value, ent.Comp.BloodReagent, amount, null, GetEntityBloodData(ent));
+
+        // Removal is more involved,
+        // since we also wanna handle moving it to the temporary solution
+        // and then spilling it if necessary.
+        var newSol = SolutionContainer.SplitSolution(ent.Comp.BloodSolution.Value, -amount);
+
+        if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, ref ent.Comp.TemporarySolution, out var tempSolution))
+            return true;
+
+        tempSolution.AddSolution(newSol, _prototypeManager);
+
+        if (tempSolution.Volume > ent.Comp.BleedPuddleThreshold)
+        {
+            // Pass some of the chemstream into the spilled blood.
+            if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution))
+            {
+                var temp = SolutionContainer.SplitSolution(ent.Comp.ChemicalSolution.Value, tempSolution.Volume / 10);
+                tempSolution.AddSolution(temp, _prototypeManager);
+            }
+
+            _puddle.TrySpillAt(ent.Owner, tempSolution, out _, sound: false);
+
+            tempSolution.RemoveAllSolution();
+        }
+
+        SolutionContainer.UpdateChemicals(ent.Comp.TemporarySolution.Value);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to make an entity bleed more or less.
+    /// </summary>
+    public bool TryModifyBleedAmount(Entity<BloodstreamComponent?> ent, float amount)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false))
+            return false;
+
+        ent.Comp.BleedAmount += amount;
+        ent.Comp.BleedAmount = Math.Clamp(ent.Comp.BleedAmount, 0, ent.Comp.MaxBleedAmount);
+
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BleedAmount));
+
+        if (ent.Comp.BleedAmount == 0)
+            _alertsSystem.ClearAlert(ent, ent.Comp.BleedingAlert);
+        else
+        {
+            var severity = (short)Math.Clamp(Math.Round(ent.Comp.BleedAmount, MidpointRounding.ToZero), 0, 10);
+            _alertsSystem.ShowAlert(ent, ent.Comp.BleedingAlert, severity);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Spill all bloodstream solutions into a puddle.
+    /// BLOOD FOR THE BLOOD GOD
+    /// </summary>
+    public void SpillAllSolutions(Entity<BloodstreamComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        var tempSol = new Solution();
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        {
+            tempSol.MaxVolume += bloodSolution.MaxVolume;
+            tempSol.AddSolution(bloodSolution, _prototypeManager);
+            SolutionContainer.RemoveAllSolution(ent.Comp.BloodSolution.Value);
+        }
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.ChemicalSolutionName, ref ent.Comp.ChemicalSolution, out var chemSolution))
+        {
+            tempSol.MaxVolume += chemSolution.MaxVolume;
+            tempSol.AddSolution(chemSolution, _prototypeManager);
+            SolutionContainer.RemoveAllSolution(ent.Comp.ChemicalSolution.Value);
+        }
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, ref ent.Comp.TemporarySolution, out var tempSolution))
+        {
+            tempSol.MaxVolume += tempSolution.MaxVolume;
+            tempSol.AddSolution(tempSolution, _prototypeManager);
+            SolutionContainer.RemoveAllSolution(ent.Comp.TemporarySolution.Value);
+        }
+
+        _puddle.TrySpillAt(ent, tempSol, out _);
+    }
+
+    /// <summary>
+    /// Change what someone's blood is made of, on the fly.
+    /// </summary>
+    public void ChangeBloodReagent(Entity<BloodstreamComponent?> ent, ProtoId<ReagentPrototype> reagent)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false)
+            || reagent == ent.Comp.BloodReagent)
+        {
+            return;
+        }
+
+        if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        {
+            ent.Comp.BloodReagent = reagent;
+            return;
+        }
+
+        var currentVolume = bloodSolution.RemoveReagent(ent.Comp.BloodReagent, bloodSolution.Volume, ignoreReagentData: true);
+
+        ent.Comp.BloodReagent = reagent;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReagent));
+
+        if (currentVolume > 0)
+            SolutionContainer.TryAddReagent(ent.Comp.BloodSolution.Value, ent.Comp.BloodReagent, currentVolume, null, GetEntityBloodData(ent));
+    }
+
+    /// <summary>
+    /// Get the reagent data for blood that a specific entity should have.
+    /// </summary>
+    public List<ReagentData> GetEntityBloodData(EntityUid uid)
+    {
+        var bloodData = new List<ReagentData>();
+        var dnaData = new DnaData();
+
+        if (TryComp<DnaComponent>(uid, out var donorComp) && donorComp.DNA != null)
+            dnaData.DNA = donorComp.DNA;
+        else
+            dnaData.DNA = Loc.GetString("forensics-dna-unknown");
+
+        bloodData.Add(dnaData);
+
+        return bloodData;
+    }
+}
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index d1d6832b9f..ab0ee411b6 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -8,6 +8,7 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Movement.Components;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Physics;
 using Robust.Shared.Utility;
 
@@ -15,6 +16,7 @@ namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
 {
+    private static readonly ProtoId<DamageTypePrototype> BloodlossDamageType = "Bloodloss";
     private void InitializeParts()
     {
         // TODO: This doesn't handle comp removal on child ents.
@@ -179,7 +181,7 @@ public partial class SharedBodySystem
         )
         {
             // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly
-            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), 300);
+            var damage = new DamageSpecifier(Prototypes.Index(BloodlossDamageType), 300);
             Damageable.TryChangeDamage(bodyEnt, damage);
         }
     }
diff --git a/Content.Shared/Body/Systems/SharedMetabolizerSystem.cs b/Content.Shared/Body/Systems/SharedMetabolizerSystem.cs
new file mode 100644
index 0000000000..24ab438f6d
--- /dev/null
+++ b/Content.Shared/Body/Systems/SharedMetabolizerSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Body.Events;
+
+namespace Content.Shared.Body.Systems;
+
+public abstract class SharedMetabolizerSystem : EntitySystem
+{
+    /// <summary>
+    /// Updates the metabolic rate multiplier for a given entity,
+    /// raising both <see cref="GetMetabolicMultiplierEvent"/> to determine what the multiplier is and <see cref="ApplyMetabolicMultiplierEvent"/> to update relevant components.
+    /// </summary>
+    /// <param name="uid"></param>
+    public void UpdateMetabolicMultiplier(EntityUid uid)
+    {
+        var getEv = new GetMetabolicMultiplierEvent();
+        RaiseLocalEvent(uid, ref getEv);
+
+        var applyEv = new ApplyMetabolicMultiplierEvent(getEv.Multiplier);
+        RaiseLocalEvent(uid, ref applyEv);
+    }
+}
diff --git a/Content.Shared/Body/Systems/StomachSystem.cs b/Content.Shared/Body/Systems/StomachSystem.cs
index 4d61086ff1..71537131f2 100644
--- a/Content.Shared/Body/Systems/StomachSystem.cs
+++ b/Content.Shared/Body/Systems/StomachSystem.cs
@@ -29,7 +29,7 @@ namespace Content.Shared.Body.Systems
 
         private void OnMapInit(Entity<StomachComponent> ent, ref MapInitEvent args)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
         }
 
         private void OnUnpaused(Entity<StomachComponent> ent, ref EntityUnpausedEvent args)
@@ -55,7 +55,7 @@ namespace Content.Shared.Body.Systems
                 if (_gameTiming.CurTime < stomach.NextUpdate)
                     continue;
 
-                stomach.NextUpdate += stomach.UpdateInterval;
+                stomach.NextUpdate += stomach.AdjustedUpdateInterval;
 
                 // Get our solutions
                 if (!_solutionContainerSystem.ResolveSolution((uid, sol),
@@ -73,7 +73,7 @@ namespace Content.Shared.Body.Systems
                 var queue = new RemQueue<StomachComponent.ReagentDelta>();
                 foreach (var delta in stomach.ReagentDeltas)
                 {
-                    delta.Increment(stomach.UpdateInterval);
+                    delta.Increment(stomach.AdjustedUpdateInterval);
                     if (delta.Lifetime > stomach.DigestionDelay)
                     {
                         if (stomachSolution.TryGetReagent(delta.ReagentQuantity.Reagent, out var reagent))
@@ -101,18 +101,9 @@ namespace Content.Shared.Body.Systems
             }
         }
 
-        private void OnApplyMetabolicMultiplier(
-            Entity<StomachComponent> ent,
-            ref ApplyMetabolicMultiplierEvent args)
+        private void OnApplyMetabolicMultiplier(Entity<StomachComponent> ent, ref ApplyMetabolicMultiplierEvent args)
         {
-            if (args.Apply)
-            {
-                ent.Comp.UpdateInterval *= args.Multiplier;
-                return;
-            }
-
-            // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-            ent.Comp.UpdateInterval /= args.Multiplier;
+            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
         }
 
         public bool CanTransferSolution(
diff --git a/Content.Shared/CCVar/CCVars.Audio.cs b/Content.Shared/CCVar/CCVars.Audio.cs
index 4d9e7c4431..63e49ef532 100644
--- a/Content.Shared/CCVar/CCVars.Audio.cs
+++ b/Content.Shared/CCVar/CCVars.Audio.cs
@@ -1,4 +1,6 @@
-using Robust.Shared.Configuration;
+using Content.Shared.Administration;
+using Content.Shared.CCVar.CVarAccess;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
@@ -58,4 +60,10 @@ public sealed partial class CCVars
         public static readonly CVarDef<float> InterfaceVolume =
             CVarDef.Create("audio.interface_volume", 0.50f, CVar.ARCHIVE | CVar.CLIENTONLY);
 
+    /// <summary>
+    ///     Lobby music collection string
+    /// </summary>
+    [CVarControl(AdminFlags.VarEdit)]
+    public static readonly CVarDef<string> LobbyMusicCollection =
+        CVarDef.Create("audio.lobby_music_collection", "LobbyMusic", CVar.REPLICATED | CVar.SERVER);
 }
diff --git a/Content.Shared/CCVar/CCVars.Lighting.cs b/Content.Shared/CCVar/CCVars.Lighting.cs
new file mode 100644
index 0000000000..606aadcf05
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Lighting.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> AmbientOcclusion =
+        CVarDef.Create("light.ambient_occlusion", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// Distance in world-pixels of ambient occlusion.
+    /// </summary>
+    public static readonly CVarDef<string> AmbientOcclusionColor =
+        CVarDef.Create("light.ambient_occlusion_color", "#04080FAA", CVar.CLIENTONLY);
+
+    /// <summary>
+    /// Distance in world-pixels of ambient occlusion.
+    /// </summary>
+    public static readonly CVarDef<float> AmbientOcclusionDistance =
+        CVarDef.Create("light.ambient_occlusion_distance", 4f, CVar.CLIENTONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Misc.cs b/Content.Shared/CCVar/CCVars.Misc.cs
index 5fda4dc2fd..3e8a7badf9 100644
--- a/Content.Shared/CCVar/CCVars.Misc.cs
+++ b/Content.Shared/CCVar/CCVars.Misc.cs
@@ -94,4 +94,19 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<float> PointingCooldownSeconds =
         CVarDef.Create("pointing.cooldown_seconds", 0.5f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The last time the client recorded a valid connection to a game server.
+    ///     Used in conjunction with <see cref="PlaytimeMinutesToday"/> to track how long the player has been playing for the given day.
+    /// </summary>
+    public static readonly CVarDef<string> PlaytimeLastConnectDate =
+        CVarDef.Create("playtime.last_connect_date", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    ///     The total minutes that the client has spent since the date of last connection.
+    ///     This is reset to 0 when the last connect date is updated.
+    ///     Do not read this value directly, use <code>ClientsidePlaytimeTrackingManager</code> instead.
+    /// </summary>
+    public static readonly CVarDef<float> PlaytimeMinutesToday =
+        CVarDef.Create("playtime.minutes_today", 0f, CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/CCVar/CCVars.Viewport.cs b/Content.Shared/CCVar/CCVars.Viewport.cs
index d94394d2a7..74d462f3ce 100644
--- a/Content.Shared/CCVar/CCVars.Viewport.cs
+++ b/Content.Shared/CCVar/CCVars.Viewport.cs
@@ -30,4 +30,7 @@ public sealed partial class CCVars
 
     public static readonly CVarDef<bool> ViewportVerticalFit =
         CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> ViewportScalingFilterMode =
+        CVarDef.Create("viewport.scaling_filter", "nearest", CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/Camera/GetEyeOffsetEvent.cs b/Content.Shared/Camera/GetEyeOffsetEvent.cs
index 0e3c00110a..fc118315ec 100644
--- a/Content.Shared/Camera/GetEyeOffsetEvent.cs
+++ b/Content.Shared/Camera/GetEyeOffsetEvent.cs
@@ -19,6 +19,13 @@ namespace Content.Shared.Camera;
 [ByRefEvent]
 public record struct GetEyeOffsetEvent(Vector2 Offset);
 
+/// <summary>
+///     Raised before the <see cref="GetEyeOffsetEvent"/> and <see cref="GetEyeOffsetRelayedEvent"/>, to check if any of the subscribed
+///     systems want to cancel offset changes.
+/// </summary>
+[ByRefEvent]
+public record struct GetEyeOffsetAttemptEvent(bool Cancelled);
+
 /// <summary>
 ///     Raised on any equipped and in-hand items that may modify the eye offset.
 ///     Pockets and suitstorage are excluded.
diff --git a/Content.Shared/Camera/GetEyePvsScaleEvent.cs b/Content.Shared/Camera/GetEyePvsScaleEvent.cs
index 482b755db8..4e8c48ade1 100644
--- a/Content.Shared/Camera/GetEyePvsScaleEvent.cs
+++ b/Content.Shared/Camera/GetEyePvsScaleEvent.cs
@@ -20,6 +20,13 @@ namespace Content.Shared.Camera;
 [ByRefEvent]
 public record struct GetEyePvsScaleEvent(float Scale);
 
+/// <summary>
+///     Raised before the <see cref="GetEyePvsScaleEvent"/> and <see cref="GetEyePvsScaleRelayedEvent"/>, to check if any on the subscribed
+///     systems want to cancel PVS changes.
+/// </summary>
+[ByRefEvent]
+public record struct GetEyePvsScaleAttemptEvent(bool Cancelled);
+
 /// <summary>
 ///     Raised on any equipped and in-hand items that may modify the eye offset.
 ///     Pockets and suitstorage are excluded.
diff --git a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
index 38ca2286ee..495ad14a9d 100644
--- a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Cargo.Prototypes;
 /// that must be sold together in a labeled container in order
 /// to receive a monetary reward.
 /// </summary>
-[Prototype, Serializable, NetSerializable]
+[Prototype]
 public sealed partial class CargoBountyPrototype : IPrototype
 {
     /// <inheritdoc/>
diff --git a/Content.Shared/Changeling/ChangelingIdentityComponent.cs b/Content.Shared/Changeling/ChangelingIdentityComponent.cs
new file mode 100644
index 0000000000..461315f4ce
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingIdentityComponent.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Cloning;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling;
+
+/// <summary>
+/// The storage component for Changelings, it handles the link between a changeling and its consumed identities
+/// that exist on a paused map.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ChangelingIdentityComponent : Component
+{
+    /// <summary>
+    /// The list of entities that exist on a paused map. They are paused clones of the victims that the ling has consumed, with all relevant components copied from the original.
+    /// </summary>
+    // TODO: Store a reference to the original entity as well so you cannot infinitely devour somebody. Currently very tricky due the inability to send over EntityUid if the original is ever deleted. Can be fixed by something like WeakEntityReference.
+    [DataField, AutoNetworkedField]
+    public List<EntityUid> ConsumedIdentities = new();
+
+
+    /// <summary>
+    /// The currently assumed identity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? CurrentIdentity;
+
+    /// <summary>
+    /// The cloning settings passed to the CloningSystem, contains a list of all components to copy or have handled by their
+    /// respective systems.
+    /// </summary>
+    public ProtoId<CloningSettingsPrototype> IdentityCloningSettings = "ChangelingCloningSettings";
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Changeling/ChangelingIdentitySystem.cs b/Content.Shared/Changeling/ChangelingIdentitySystem.cs
new file mode 100644
index 0000000000..f68f72f853
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingIdentitySystem.cs
@@ -0,0 +1,185 @@
+using System.Numerics;
+using Content.Shared.Cloning;
+using Content.Shared.Humanoid;
+using Content.Shared.Mind.Components;
+using Content.Shared.NameModifier.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling;
+
+public sealed class ChangelingIdentitySystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly SharedCloningSystem _cloningSystem = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidSystem = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedPvsOverrideSystem _pvsOverrideSystem = default!;
+
+    public MapId? PausedMapId;
+    private int _numberOfStoredIdentities = 0; // TODO: remove this
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingIdentityComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ChangelingIdentityComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ChangelingIdentityComponent, MindAddedMessage>(OnMindAdded);
+        SubscribeLocalEvent<ChangelingIdentityComponent, MindRemovedMessage>(OnMindRemoved);
+        SubscribeLocalEvent<ChangelingStoredIdentityComponent, ComponentRemove>(OnStoredRemove);
+    }
+
+    private void OnMindAdded(Entity<ChangelingIdentityComponent> ent, ref MindAddedMessage args)
+    {
+        if (!TryComp<ActorComponent>(args.Container.Owner, out var actor))
+            return;
+
+        HandOverPvsOverride(actor.PlayerSession, ent.Comp);
+    }
+
+    private void OnMindRemoved(Entity<ChangelingIdentityComponent> ent, ref MindRemovedMessage args)
+    {
+        CleanupPvsOverride(ent, args.Container.Owner);
+    }
+
+    private void OnMapInit(Entity<ChangelingIdentityComponent> ent, ref MapInitEvent args)
+    {
+        // Make a backup of our current identity so we can transform back.
+        var clone = CloneToPausedMap(ent, ent.Owner);
+        ent.Comp.CurrentIdentity = clone;
+    }
+
+    private void OnShutdown(Entity<ChangelingIdentityComponent> ent, ref ComponentShutdown args)
+    {
+        CleanupPvsOverride(ent, ent.Owner);
+        CleanupChangelingNullspaceIdentities(ent);
+    }
+
+    private void OnStoredRemove(Entity<ChangelingStoredIdentityComponent> ent, ref ComponentRemove args)
+    {
+        // The last stored identity is being deleted, we can clean up the map.
+        if (_net.IsServer && PausedMapId != null && Count<ChangelingStoredIdentityComponent>() <= 1)
+            _map.QueueDeleteMap(PausedMapId.Value);
+    }
+
+    /// <summary>
+    /// Cleanup all nullspaced Identities when the changeling no longer exists
+    /// </summary>
+    /// <param name="ent">the changeling</param>
+    public void CleanupChangelingNullspaceIdentities(Entity<ChangelingIdentityComponent> ent)
+    {
+        if (_net.IsClient)
+            return;
+
+        foreach (var consumedIdentity in ent.Comp.ConsumedIdentities)
+        {
+            QueueDel(consumedIdentity);
+        }
+    }
+
+    /// <summary>
+    /// Clone a target humanoid into nullspace and add it to the Changelings list of identities.
+    /// It creates a perfect copy of the target and can be used to pull components down for future use
+    /// </summary>
+    /// <param name="ent">the Changeling</param>
+    /// <param name="target">the targets uid</param>
+    public EntityUid? CloneToPausedMap(Entity<ChangelingIdentityComponent> ent, EntityUid target)
+    {
+        // Don't create client side duplicate clones or a clientside map.
+        if (_net.IsClient)
+            return null;
+
+        if (!TryComp<HumanoidAppearanceComponent>(target, out var humanoid)
+            || !_prototype.Resolve(humanoid.Species, out var speciesPrototype)
+            || !_prototype.Resolve(ent.Comp.IdentityCloningSettings, out var settings))
+            return null;
+
+        EnsurePausedMap();
+        // TODO: Setting the spawn location is a shitty bandaid to prevent admins from crashing our servers.
+        // Movercontrollers and mob collisions are currently being calculated even for paused entities.
+        // Spawning all of them in the same spot causes severe performance problems.
+        // Cryopods and Polymorph have the same problem.
+        var mob = Spawn(speciesPrototype.Prototype, new MapCoordinates(new Vector2(2 * _numberOfStoredIdentities++, 0), PausedMapId!.Value));
+
+        var storedIdentity = EnsureComp<ChangelingStoredIdentityComponent>(mob);
+        storedIdentity.OriginalEntity = target; // TODO: network this once we have WeakEntityReference or the autonetworking source gen is fixed
+
+        if (TryComp<ActorComponent>(target, out var actor))
+            storedIdentity.OriginalSession = actor.PlayerSession;
+
+        _humanoidSystem.CloneAppearance(target, mob);
+        _cloningSystem.CloneComponents(target, mob, settings);
+
+        var targetName = _nameMod.GetBaseName(target);
+        _metaSystem.SetEntityName(mob, targetName);
+        ent.Comp.ConsumedIdentities.Add(mob);
+
+        Dirty(ent);
+        HandlePvsOverride(ent, mob);
+
+        return mob;
+    }
+
+    /// <summary>
+    /// Simple helper to add a PVS override to a Nullspace Identity
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="target"></param>
+    private void HandlePvsOverride(EntityUid uid, EntityUid target)
+    {
+        if (!TryComp<ActorComponent>(uid, out var actor))
+            return;
+
+        _pvsOverrideSystem.AddSessionOverride(target, actor.PlayerSession);
+    }
+
+    /// <summary>
+    /// Cleanup all Pvs Overrides for the owner of the ChangelingIdentity
+    /// </summary>
+    /// <param name="ent">the Changeling itself</param>
+    /// <param name="entityUid">Who specifically to cleanup from, usually just the same owner, but in the case of a mindswap we want to clean up the victim</param>
+    private void CleanupPvsOverride(Entity<ChangelingIdentityComponent> ent, EntityUid entityUid)
+    {
+        if (!TryComp<ActorComponent>(entityUid, out var actor))
+            return;
+
+        foreach (var identity in ent.Comp.ConsumedIdentities)
+        {
+            _pvsOverrideSystem.RemoveSessionOverride(identity, actor.PlayerSession);
+        }
+    }
+
+    /// <summary>
+    /// Inform another Session of the entities stored for Transformation
+    /// </summary>
+    /// <param name="session">The Session you wish to inform</param>
+    /// <param name="comp">The Target storage of identities</param>
+    public void HandOverPvsOverride(ICommonSession session, ChangelingIdentityComponent comp)
+    {
+        foreach (var entity in comp.ConsumedIdentities)
+        {
+            _pvsOverrideSystem.AddSessionOverride(entity, session);
+        }
+    }
+
+    /// <summary>
+    /// Create a paused map for storing devoured identities as a clone of the player.
+    /// </summary>
+    private void EnsurePausedMap()
+    {
+        if (_map.MapExists(PausedMapId))
+            return;
+
+        var mapUid = _map.CreateMap(out var newMapId);
+        _metaSystem.SetEntityName(mapUid, Loc.GetString("changeling-paused-map-name"));
+        PausedMapId = newMapId;
+        _map.SetPaused(mapUid, true);
+    }
+}
diff --git a/Content.Shared/Changeling/ChangelingRoleComponent.cs b/Content.Shared/Changeling/ChangelingRoleComponent.cs
new file mode 100644
index 0000000000..d2e9c1eccb
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingRoleComponent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Roles;
+
+namespace Content.Shared.Changeling;
+
+/// <summary>
+/// The Mindrole for Changeling Antags
+/// </summary>
+[RegisterComponent]
+public sealed partial class ChangelingRoleComponent : BaseMindRoleComponent;
diff --git a/Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs b/Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs
new file mode 100644
index 0000000000..44583190e6
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Changeling;
+
+/// <summary>
+/// Marker component for cloned identities devoured by a changeling.
+/// These are stored on a paused map so that the changeling can transform into them.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ChangelingStoredIdentityComponent : Component
+{
+    /// <summary>
+    /// The original entity the identity was cloned from.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Not networked at the moment because it will create PVS errors when the original is somehow deleted.
+    /// Use WeakEntityReference once it's merged.
+    /// </remarks>
+    [DataField]
+    public EntityUid? OriginalEntity;
+
+    /// <summary>
+    /// The player session of the original entity, if any.
+    /// Used for admin logging purposes.
+    /// </summary>
+    [ViewVariables]
+    public ICommonSession? OriginalSession;
+}
diff --git a/Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs b/Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs
new file mode 100644
index 0000000000..7798c6fec9
--- /dev/null
+++ b/Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs
@@ -0,0 +1,133 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Changeling.Devour;
+
+/// <summary>
+/// Component responsible for Changelings Devour attack. Including the amount of damage
+/// and how long it takes to devour someone
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(ChangelingDevourSystem))]
+public sealed partial class ChangelingDevourComponent : Component
+{
+    /// <summary>
+    /// The Action for devouring
+    /// </summary>
+    [DataField]
+    public EntProtoId? ChangelingDevourAction = "ActionChangelingDevour";
+
+    /// <summary>
+    /// The action entity associated with devouring
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? ChangelingDevourActionEntity;
+
+    /// <summary>
+    /// The whitelist of targets for devouring
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? Whitelist = new()
+    {
+        Components =
+        [
+            "MobState",
+            "HumanoidAppearance",
+        ],
+    };
+
+    /// <summary>
+    /// The Sound to use during consumption of a victim
+    /// </summary>
+    /// <remarks>
+    /// 6 distance due to the default 15 being hearable all the way across PVS. Changeling is meant to be stealthy.
+    /// 6 still allows the sound to be hearable, but not across an entire department.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? ConsumeNoise = new SoundCollectionSpecifier("ChangelingDevourConsume", AudioParams.Default.WithMaxDistance(6));
+
+    /// <summary>
+    /// The Sound to use during the windup before consuming a victim
+    /// </summary>
+    /// <remarks>
+    /// 6 distance due to the default 15 being hearable all the way across PVS. Changeling is meant to be stealthy.
+    /// 6 still allows the sound to be hearable, but not across an entire department.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? DevourWindupNoise = new SoundCollectionSpecifier("ChangelingDevourWindup", AudioParams.Default.WithMaxDistance(6));
+
+    /// <summary>
+    /// The time between damage ticks
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DamageTimeBetweenTicks = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The windup time before the changeling begins to engage in devouring the identity of a target
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DevourWindupTime = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// The time it takes to FULLY consume someones identity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DevourConsumeTime = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// Damage cap that a target is allowed to be caused due to IdentityConsumption
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float DevourConsumeDamageCap = 350f;
+
+    /// <summary>
+    /// The Currently active devour sound in the world
+    /// </summary>
+    [DataField]
+    public EntityUid? CurrentDevourSound;
+
+    /// <summary>
+    /// The damage profile for a single tick of devour damage
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier DamagePerTick = new()
+    {
+        DamageDict = new Dictionary<string, FixedPoint2>
+        {
+            { "Slash", 10},
+            { "Piercing", 10 },
+            { "Blunt", 5 },
+        },
+    };
+
+    /// <summary>
+    /// The list of protective damage types capable of preventing a devour if over the threshold
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<ProtoId<DamageTypePrototype>> ProtectiveDamageTypes = new()
+    {
+        "Slash",
+        "Piercing",
+        "Blunt",
+    };
+
+    /// <summary>
+    /// The next Tick to deal damage on (utilized during the consumption "do-during" (a do after with an attempt event))
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTick = TimeSpan.Zero;
+
+    /// <summary>
+    /// The percentage of ANY brute damage resistance that will prevent devouring
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float DevourPreventionPercentageThreshold = 0.1f;
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs
new file mode 100644
index 0000000000..d063737e5c
--- /dev/null
+++ b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Changeling.Devour;
+
+/// <summary>
+/// Action event for Devour, someone has initiated a devour on someone, begin to windup.
+/// </summary>
+public sealed partial class ChangelingDevourActionEvent : EntityTargetActionEvent;
+
+/// <summary>
+/// A windup has either successfully been completed or has been canceled. If successful start the devouring DoAfter.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ChangelingDevourWindupDoAfterEvent : SimpleDoAfterEvent;
+
+/// <summary>
+/// The Consumption DoAfter has either successfully been completed or was canceled.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ChangelingDevourConsumeDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs
new file mode 100644
index 0000000000..83a589a8e3
--- /dev/null
+++ b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs
@@ -0,0 +1,276 @@
+using Content.Shared.Actions;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Armor;
+using Content.Shared.Atmos.Rotting;
+using Content.Shared.Body.Components;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Inventory;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Storage;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Changeling.Devour;
+
+public sealed class ChangelingDevourSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly ChangelingIdentitySystem _changelingIdentitySystem = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingDevourComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ChangelingDevourComponent, ChangelingDevourActionEvent>(OnDevourAction);
+        SubscribeLocalEvent<ChangelingDevourComponent, ChangelingDevourWindupDoAfterEvent>(OnDevourWindup);
+        SubscribeLocalEvent<ChangelingDevourComponent, ChangelingDevourConsumeDoAfterEvent>(OnDevourConsume);
+        SubscribeLocalEvent<ChangelingDevourComponent, DoAfterAttemptEvent<ChangelingDevourConsumeDoAfterEvent>>(OnConsumeAttemptTick);
+        SubscribeLocalEvent<ChangelingDevourComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnMapInit(Entity<ChangelingDevourComponent> ent, ref MapInitEvent args)
+    {
+        _actionsSystem.AddAction(ent, ref ent.Comp.ChangelingDevourActionEntity, ent.Comp.ChangelingDevourAction);
+    }
+
+    private void OnShutdown(Entity<ChangelingDevourComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.ChangelingDevourActionEntity != null)
+        {
+            _actionsSystem.RemoveAction(ent.Owner, ent.Comp.ChangelingDevourActionEntity);
+        }
+    }
+
+    //TODO: Allow doafters to have proper update loop support. Attempt events should not be doing state changes.
+    private void OnConsumeAttemptTick(Entity<ChangelingDevourComponent> ent,
+       ref DoAfterAttemptEvent<ChangelingDevourConsumeDoAfterEvent> eventData)
+    {
+
+        var curTime = _timing.CurTime;
+
+        if (curTime < ent.Comp.NextTick)
+            return;
+
+        ConsumeDamageTick(eventData.Event.Target, ent.Comp, eventData.Event.User);
+        ent.Comp.NextTick += ent.Comp.DamageTimeBetweenTicks;
+        Dirty(ent, ent.Comp);
+    }
+
+    private void ConsumeDamageTick(EntityUid? target, ChangelingDevourComponent comp, EntityUid? user)
+    {
+        if (target == null)
+            return;
+
+        if (!TryComp<DamageableComponent>(target, out var damage))
+            return;
+
+        foreach (var damagePoints in comp.DamagePerTick.DamageDict)
+        {
+
+            if (damage.Damage.DamageDict.TryGetValue(damagePoints.Key, out var val) && val > comp.DevourConsumeDamageCap)
+                return;
+        }
+        _damageable.TryChangeDamage(target, comp.DamagePerTick, true, true, damage, user);
+    }
+
+    /// <summary>
+    /// Checkes if the targets outerclothing is beyond a DamageCoefficientThreshold to protect them from being devoured.
+    /// </summary>
+    /// <param name="target">The Targeted entity</param>
+    /// <param name="ent">Changelings Devour Component</param>
+    /// <returns>Is the target Protected from the attack</returns>
+    private bool IsTargetProtected(EntityUid target, Entity<ChangelingDevourComponent> ent)
+    {
+        var ev = new CoefficientQueryEvent(SlotFlags.OUTERCLOTHING);
+
+        RaiseLocalEvent(target, ev);
+
+        foreach (var compProtectiveDamageType in ent.Comp.ProtectiveDamageTypes)
+        {
+            if (!ev.DamageModifiers.Coefficients.TryGetValue(compProtectiveDamageType, out var coefficient))
+                continue;
+            if (coefficient < 1f - ent.Comp.DevourPreventionPercentageThreshold)
+                return true;
+        }
+
+        return false;
+    }
+
+    private void OnDevourAction(Entity<ChangelingDevourComponent> ent, ref ChangelingDevourActionEvent args)
+    {
+        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(ent.Comp.Whitelist, args.Target)
+                         || !HasComp<ChangelingIdentityComponent>(ent))
+            return;
+
+        args.Handled = true;
+        var target = args.Target;
+
+        if (target == ent.Owner)
+            return; // don't eat yourself
+
+        if (HasComp<RottingComponent>(target))
+        {
+            _popupSystem.PopupClient(Loc.GetString("changeling-devour-attempt-failed-rotting"), args.Performer, args.Performer, PopupType.Medium);
+            return;
+        }
+
+        if (IsTargetProtected(target, ent))
+        {
+            _popupSystem.PopupClient(Loc.GetString("changeling-devour-attempt-failed-protected"), ent, ent, PopupType.Medium);
+            return;
+        }
+
+        if (_net.IsServer)
+        {
+            var pvsSound = _audio.PlayPvs(ent.Comp.DevourWindupNoise, ent);
+            if (pvsSound != null)
+                ent.Comp.CurrentDevourSound = pvsSound.Value.Entity;
+        }
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ent:player} started changeling devour windup against {target:player}");
+
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent, ent.Comp.DevourWindupTime, new ChangelingDevourWindupDoAfterEvent(), ent, target: target, used: ent)
+        {
+            BreakOnMove = true,
+            BlockDuplicate = true,
+            DuplicateCondition = DuplicateConditions.None,
+        });
+
+        var selfMessage = Loc.GetString("changeling-devour-begin-windup-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-devour-begin-windup-others", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            args.Performer,
+            args.Performer,
+            PopupType.MediumCaution);
+    }
+
+    private void OnDevourWindup(Entity<ChangelingDevourComponent> ent, ref ChangelingDevourWindupDoAfterEvent args)
+    {
+        var curTime = _timing.CurTime;
+        args.Handled = true;
+
+        if (!EntityManager.EntityExists(ent.Comp.CurrentDevourSound))
+            _audio.Stop(ent.Comp.CurrentDevourSound!);
+
+        if (args.Cancelled)
+            return;
+
+        var selfMessage = Loc.GetString("changeling-devour-begin-consume-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-devour-begin-consume-others", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            args.User,
+            args.User,
+            PopupType.LargeCaution);
+
+        if (_net.IsServer)
+        {
+            var pvsSound = _audio.PlayPvs(ent.Comp.ConsumeNoise, ent);
+
+            if (pvsSound != null)
+                ent.Comp.CurrentDevourSound = pvsSound.Value.Entity;
+        }
+
+
+        ent.Comp.NextTick = curTime + ent.Comp.DamageTimeBetweenTicks;
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} began to devour {ToPrettyString(args.Target):player} identity");
+
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager,
+            ent,
+            ent.Comp.DevourConsumeTime,
+            new ChangelingDevourConsumeDoAfterEvent(),
+            ent,
+            target: args.Target,
+            used: ent)
+        {
+            AttemptFrequency = AttemptFrequency.EveryTick,
+            BreakOnMove = true,
+            BlockDuplicate = true,
+            DuplicateCondition = DuplicateConditions.None,
+        });
+    }
+
+    private void OnDevourConsume(Entity<ChangelingDevourComponent> ent, ref ChangelingDevourConsumeDoAfterEvent args)
+    {
+        args.Handled = true;
+        var target = args.Target;
+
+        if (target == null)
+            return;
+
+        if (EntityManager.EntityExists(ent.Comp.CurrentDevourSound))
+            _audio.Stop(ent.Comp.CurrentDevourSound!);
+
+        if (args.Cancelled)
+            return;
+
+        if (!_mobState.IsDead((EntityUid)target))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player}  unsuccessfully devoured {ToPrettyString(args.Target):player}'s identity");
+            _popupSystem.PopupClient(Loc.GetString("changeling-devour-consume-failed-not-dead"), args.User, args.User, PopupType.Medium);
+            return;
+        }
+
+        var selfMessage = Loc.GetString("changeling-devour-consume-complete-self", ("user", Identity.Entity(args.User, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-devour-consume-complete-others", ("user", Identity.Entity(args.User, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            args.User,
+            args.User,
+            PopupType.LargeCaution);
+
+        if (_mobState.IsDead(target.Value)
+            && TryComp<BodyComponent>(target, out var body)
+            && HasComp<HumanoidAppearanceComponent>(target)
+            && TryComp<ChangelingIdentityComponent>(args.User, out var identityStorage))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player}  successfully devoured {ToPrettyString(args.Target):player}'s identity");
+            _changelingIdentitySystem.CloneToPausedMap((ent, identityStorage), target.Value);
+
+            if (_inventorySystem.TryGetSlotEntity(target.Value, "jumpsuit", out var item)
+                && TryComp<ButcherableComponent>(item, out var butcherable))
+                RipClothing(target.Value, (item.Value, butcherable));
+        }
+
+        Dirty(ent);
+    }
+
+    private void RipClothing(EntityUid victim, Entity<ButcherableComponent> item)
+    {
+        var spawnEntities = EntitySpawnCollection.GetSpawns(item.Comp.SpawnedEntities, _robustRandom);
+
+        foreach (var proto in spawnEntities)
+        {
+            // TODO: once predictedRandom is in, make this a Coordinate offset of 0.25f from the victims position
+            PredictedSpawnNextToOrDrop(proto, victim);
+        }
+
+        PredictedQueueDel(item.Owner);
+    }
+}
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs b/Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs
new file mode 100644
index 0000000000..0a3b3f1985
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Cloning;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling.Transform;
+
+/// <summary>
+/// The component containing information about Changelings Transformation action
+/// Like how long their windup is, the sounds as well as the Target Cloning settings for changing between identities
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(ChangelingTransformSystem))]
+public sealed partial class ChangelingTransformComponent : Component
+{
+    /// <summary>
+    /// The action Prototype for Transforming
+    /// </summary>
+    [DataField]
+    public EntProtoId? ChangelingTransformAction = "ActionChangelingTransform";
+
+    /// <summary>
+    /// The Action Entity for transforming associated with this Component
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? ChangelingTransformActionEntity;
+
+    /// <summary>
+    /// Time it takes to Transform
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan TransformWindup = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The noise used when attempting to transform
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? TransformAttemptNoise = new SoundCollectionSpecifier("ChangelingTransformAttempt", AudioParams.Default.WithMaxDistance(6)); // 6 distance due to the default 15 being hearable all the way across PVS. Changeling is meant to be stealthy. 6 still allows the sound to be hearable, but not across an entire department.
+
+    /// <summary>
+    /// The currently active transform in the world
+    /// </summary>
+    [DataField]
+    public EntityUid? CurrentTransformSound;
+
+    /// <summary>
+    /// The cloning settings passed to the CloningSystem, contains a list of all components to copy or have handled by their
+    /// respective systems.
+    /// </summary>
+    public ProtoId<CloningSettingsPrototype> TransformCloningSettings = "ChangelingCloningSettings";
+
+    public override bool SendOnlyToOwner => true;
+}
+
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs
new file mode 100644
index 0000000000..cfe2a56933
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Changeling.Transform;
+
+/// <summary>
+/// Action event for opening the changeling transformation radial menu.
+/// </summary>
+public sealed partial class ChangelingTransformActionEvent : InstantActionEvent;
+
+/// <summary>
+/// DoAfterevent used to transform a changeling into one of their stored identities.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ChangelingTransformDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs
new file mode 100644
index 0000000000..0383867698
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs
@@ -0,0 +1,33 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Changeling.Transform;
+
+/// <summary>
+/// Send when a player selects an intentity to transform into in the radial menu.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ChangelingTransformIdentitySelectMessage(NetEntity targetIdentity) : BoundUserInterfaceMessage
+{
+    /// <summary>
+    /// The uid of the cloned identity.
+    /// </summary>
+    public readonly NetEntity TargetIdentity = targetIdentity;
+}
+
+// TODO: Replace with component states.
+// We are already networking the ChangelingIdentityComponent, which contains all this information,
+// so we can just read it from them from the component and update the UI in an AfterAuotHandleState subscription.
+[Serializable, NetSerializable]
+public sealed class ChangelingTransformBoundUserInterfaceState(List<NetEntity> identities) : BoundUserInterfaceState
+{
+    /// <summary>
+    /// The uids of the cloned identities.
+    /// </summary>
+    public readonly List<NetEntity> Identites = identities;
+}
+
+[Serializable, NetSerializable]
+public enum TransformUI : byte
+{
+    Key,
+}
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs
new file mode 100644
index 0000000000..dbc5356448
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs
@@ -0,0 +1,180 @@
+using Content.Shared.Actions;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Cloning;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling.Transform;
+
+public sealed partial class ChangelingTransformSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidAppearanceSystem = default!;
+    [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedCloningSystem _cloningSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private const string ChangelingBuiXmlGeneratedName = "ChangelingTransformBoundUserInterface";
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingTransformComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ChangelingTransformComponent, ChangelingTransformActionEvent>(OnTransformAction);
+        SubscribeLocalEvent<ChangelingTransformComponent, ChangelingTransformDoAfterEvent>(OnSuccessfulTransform);
+        SubscribeLocalEvent<ChangelingTransformComponent, ChangelingTransformIdentitySelectMessage>(OnTransformSelected);
+        SubscribeLocalEvent<ChangelingTransformComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnMapInit(Entity<ChangelingTransformComponent> ent, ref MapInitEvent init)
+    {
+        _actionsSystem.AddAction(ent, ref ent.Comp.ChangelingTransformActionEntity, ent.Comp.ChangelingTransformAction);
+
+        var userInterfaceComp = EnsureComp<UserInterfaceComponent>(ent);
+        _uiSystem.SetUi((ent, userInterfaceComp), TransformUI.Key, new InterfaceData(ChangelingBuiXmlGeneratedName));
+    }
+
+    private void OnShutdown(Entity<ChangelingTransformComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.ChangelingTransformActionEntity != null)
+        {
+            _actionsSystem.RemoveAction(ent.Owner, ent.Comp.ChangelingTransformActionEntity);
+        }
+    }
+
+    private void OnTransformAction(Entity<ChangelingTransformComponent> ent,
+        ref ChangelingTransformActionEvent args)
+    {
+        if (!TryComp<UserInterfaceComponent>(ent, out var userInterfaceComp))
+            return;
+
+        if (!TryComp<ChangelingIdentityComponent>(ent, out var userIdentity))
+            return;
+
+        if (!_uiSystem.IsUiOpen((ent, userInterfaceComp), TransformUI.Key, args.Performer))
+        {
+            _uiSystem.OpenUi((ent, userInterfaceComp), TransformUI.Key, args.Performer);
+
+            var identityData = new List<NetEntity>();
+
+            foreach (var consumedIdentity in userIdentity.ConsumedIdentities)
+            {
+                identityData.Add(GetNetEntity(consumedIdentity));
+            }
+
+            _uiSystem.SetUiState((ent, userInterfaceComp), TransformUI.Key, new ChangelingTransformBoundUserInterfaceState(identityData));
+        } //TODO: Can add a Else here with TransformInto and CloseUI to make a quick switch,
+          // issue right now is that Radials cover the Action buttons so clicking the action closes the UI (due to clicking off a radial causing it to close, even with UI)
+          // but pressing the number does.
+    }
+
+    /// <summary>
+    /// Transform the changeling into another identity.
+    /// This can be any cloneable humanoid and doesn't have to be stored in the ChangelingIdentiyComponent,
+    /// so make sure to validate the target before.
+    /// </summary>
+    public void TransformInto(Entity<ChangelingTransformComponent?> ent, EntityUid targetIdentity)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        var selfMessage = Loc.GetString("changeling-transform-attempt-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-transform-attempt-others", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            ent,
+            ent,
+            PopupType.MediumCaution);
+
+        if (_net.IsServer)
+            ent.Comp.CurrentTransformSound = _audio.PlayPvs(ent.Comp.TransformAttemptNoise, ent)?.Entity;
+
+        if(TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} begun an attempt to transform into \"{Name(targetIdentity)}\" ({storedIdentity.OriginalSession:player}) ");
+        else
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} begun an attempt to transform into \"{Name(targetIdentity)}\"");
+
+        var result = _doAfterSystem.TryStartDoAfter(new DoAfterArgs(
+            EntityManager,
+            ent,
+            ent.Comp.TransformWindup,
+            new ChangelingTransformDoAfterEvent(),
+            ent,
+            target: targetIdentity)
+        {
+            BreakOnMove = true,
+            BreakOnWeightlessMove = true,
+            DuplicateCondition = DuplicateConditions.None,
+            RequireCanInteract = false,
+            DistanceThreshold = null,
+        });
+    }
+
+    private void OnTransformSelected(Entity<ChangelingTransformComponent> ent,
+        ref ChangelingTransformIdentitySelectMessage args)
+    {
+        _uiSystem.CloseUi(ent.Owner, TransformUI.Key, ent);
+
+        if (!TryGetEntity(args.TargetIdentity, out var targetIdentity))
+            return;
+
+        if (!TryComp<ChangelingIdentityComponent>(ent, out var identity))
+            return;
+
+        if (identity.CurrentIdentity == targetIdentity)
+            return; // don't transform into ourselves
+
+        if (!identity.ConsumedIdentities.Contains(targetIdentity.Value))
+            return; // this identity does not belong to this player
+
+        TransformInto(ent.AsNullable(), targetIdentity.Value);
+    }
+
+    private void OnSuccessfulTransform(Entity<ChangelingTransformComponent> ent,
+        ref ChangelingTransformDoAfterEvent args)
+    {
+        args.Handled = true;
+
+        if (EntityManager.EntityExists(ent.Comp.CurrentTransformSound))
+            _audio.Stop(ent.Comp.CurrentTransformSound);
+
+        if (args.Cancelled)
+            return;
+
+        if (!_prototype.Resolve(ent.Comp.TransformCloningSettings, out var settings))
+            return;
+
+        if (args.Target is not { } targetIdentity)
+            return;
+
+        _humanoidAppearanceSystem.CloneAppearance(targetIdentity, args.User);
+        _cloningSystem.CloneComponents(targetIdentity, args.User, settings);
+        
+        if(TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
+            _adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent.Owner):player} successfully transformed into \"{Name(targetIdentity)}\" ({storedIdentity.OriginalSession:player})");
+        else
+            _adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent.Owner):player} successfully transformed into \"{Name(targetIdentity)}\"");
+        _metaSystem.SetEntityName(ent, Name(targetIdentity), raiseEvents: false);
+
+        Dirty(ent);
+
+        if (TryComp<ChangelingIdentityComponent>(ent, out var identity)) // in case we ever get changelings that don't store identities
+        {
+            identity.CurrentIdentity = targetIdentity;
+            Dirty(ent.Owner, identity);
+        }
+    }
+}
diff --git a/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs b/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
new file mode 100644
index 0000000000..58315161a5
--- /dev/null
+++ b/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
@@ -0,0 +1,74 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Chat.Prototypes;
+
+/// <summary>
+/// A predefined notification used to warn a player of specific events.
+/// </summary>
+[Prototype("chatNotification")]
+public sealed partial class ChatNotificationPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The notification that the player receives.
+    /// </summary>
+    /// <remarks>
+    /// Use '{$source}', '{user}', and '{target}' in the fluent message
+    /// to insert the source, user, and target names respectively.
+    /// </remarks>
+    [DataField(required: true)]
+    public LocId Message = string.Empty;
+
+    /// <summary>
+    /// Font color for the notification.
+    /// </summary>
+    [DataField]
+    public Color Color = Color.White;
+
+    /// <summary>
+    /// Sound played upon receiving the notification.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? Sound;
+
+    /// <summary>
+    /// The period during which duplicate chat notifications are blocked after a player receives one.
+    /// Blocked notifications will never be delivered to the player.
+    /// </summary>
+    [DataField]
+    public TimeSpan NextDelay = TimeSpan.FromSeconds(10.0);
+
+    /// <summary>
+    /// Determines whether notification delays should be determined by the source
+    /// entity or by the notification prototype (i.e., individual notifications
+    /// vs grouping the notifications together).
+    /// </summary>
+    [DataField]
+    public bool NotifyBySource = false;
+}
+
+/// <summary>
+/// Raised when an specific player should be notified via a chat message of a predefined event occuring.
+/// </summary>
+/// <param name="ChatNotification">The prototype used to define the chat notification.</param>
+/// <param name="Source">The entity that the triggered the notification.</param>
+/// <param name="User">The entity that ultimately responsible for triggering the notification.</param>
+[ByRefEvent]
+public record ChatNotificationEvent(ProtoId<ChatNotificationPrototype> ChatNotification, EntityUid Source, EntityUid? User = null)
+{
+    /// <summary>
+    /// Set this variable if you want to change the name of the notification source
+    /// (if the name is included in the chat notification).
+    /// </summary>
+    public string? SourceNameOverride;
+
+    /// <summary>
+    /// Set this variable if you wish to change the name of the user who triggered the notification
+    /// (if the name is included in the chat notification).
+    /// </summary>
+    public string? UserNameOverride;
+}
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
index 73a3ba0bbf..0138009ef9 100644
--- a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
 namespace Content.Shared.Chat.Prototypes;
 
@@ -9,12 +8,21 @@ namespace Content.Shared.Chat.Prototypes;
 ///     Sounds collection for each <see cref="EmotePrototype"/>.
 ///     Different entities may use different sounds collections.
 /// </summary>
-[Prototype, Serializable, NetSerializable]
-public sealed partial class EmoteSoundsPrototype : IPrototype
+[Prototype]
+public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EmoteSoundsPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    [NeverPushInheritance]
+    public bool Abstract { get; }
+
     /// <summary>
     ///     Optional fallback sound that will play if collection
     ///     doesn't have specific sound for this emote id.
@@ -32,6 +40,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype
     /// <summary>
     ///     Collection of emote prototypes and their sounds.
     /// </summary>
-    [DataField("sounds", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, EmotePrototype>))]
-    public Dictionary<string, SoundSpecifier> Sounds = new();
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<ProtoId<EmotePrototype>, SoundSpecifier> Sounds = new();
 }
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 7960925561..81eb09694d 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -31,13 +31,15 @@ public abstract class SharedChatSystem : EntitySystem
     public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
     // Sunrise-TTS-End
 
-    [ValidatePrototypeId<RadioChannelPrototype>]
-    public const string CommonChannel = "Common";
+    public const int VoiceRange = 10; // how far voice goes in world units
+    public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
+    public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
+    public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
 
-    public static string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
+    public static readonly ProtoId<RadioChannelPrototype> CommonChannel = "Common";
 
-    [ValidatePrototypeId<SpeechVerbPrototype>]
-    public const string DefaultSpeechVerb = "Default";
+    public static readonly string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
+    public static readonly ProtoId<SpeechVerbPrototype> DefaultSpeechVerb = "Default";
 
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -52,7 +54,7 @@ public abstract class SharedChatSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        DebugTools.Assert(_prototypeManager.HasIndex<RadioChannelPrototype>(CommonChannel));
+        DebugTools.Assert(_prototypeManager.HasIndex(CommonChannel));
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypeReload);
         CacheRadios();
         CacheCollectiveMinds(); // Sunrise-Edit
@@ -90,13 +92,13 @@ public abstract class SharedChatSystem : EntitySystem
     public SpeechVerbPrototype GetSpeechVerb(EntityUid source, string message, SpeechComponent? speech = null)
     {
         if (!Resolve(source, ref speech, false))
-            return _prototypeManager.Index<SpeechVerbPrototype>(DefaultSpeechVerb);
+            return _prototypeManager.Index(DefaultSpeechVerb);
 
         // check for a suffix-applicable speech verb
         SpeechVerbPrototype? current = null;
         foreach (var (str, id) in speech.SuffixSpeechVerbs)
         {
-            var proto = _prototypeManager.Index<SpeechVerbPrototype>(id);
+            var proto = _prototypeManager.Index(id);
             if (message.EndsWith(Loc.GetString(str)) && proto.Priority >= (current?.Priority ?? 0))
             {
                 current = proto;
@@ -104,7 +106,7 @@ public abstract class SharedChatSystem : EntitySystem
         }
 
         // if no applicable suffix verb return the normal one used by the entity
-        return current ?? _prototypeManager.Index<SpeechVerbPrototype>(speech.SpeechVerb);
+        return current ?? _prototypeManager.Index(speech.SpeechVerb);
     }
 
     /// <summary>
diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs
index fd61cae35a..641a33f951 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Chat/SharedSuicideSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Shared.Chat;
 
 public sealed class SharedSuicideSystem : EntitySystem
 {
+    private static readonly ProtoId<DamageTypePrototype> FallbackDamageType = "Blunt";
+
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -57,8 +59,8 @@ public sealed class SharedSuicideSystem : EntitySystem
         // We don't want structural damage for the same reasons listed above
         if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")
         {
-            Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to Blunt");
-            damagePrototype = _prototypeManager.Index<DamageTypePrototype>("Blunt");
+            Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to {FallbackDamageType}");
+            damagePrototype = _prototypeManager.Index(FallbackDamageType);
         }
 
         var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage);
diff --git a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
index bc5c95c8ab..20f2741f0b 100644
--- a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
+++ b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Clothing;
 using Content.Shared.Inventory;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Chat.TypingIndicator;
@@ -18,8 +19,7 @@ public abstract class SharedTypingIndicatorSystem : EntitySystem
     /// <summary>
     ///     Default ID of <see cref="TypingIndicatorPrototype"/>
     /// </summary>
-    [ValidatePrototypeId<TypingIndicatorPrototype>]
-    public const string InitialIndicatorId = "default";
+    public static readonly ProtoId<TypingIndicatorPrototype> InitialIndicatorId = "default";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
index f263de4913..7861da4546 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
@@ -7,13 +7,13 @@ namespace Content.Shared.Chat.TypingIndicator;
 ///     Show typing indicator icon when player typing text in chat box.
 ///     Added automatically when player poses entity.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedTypingIndicatorSystem))]
 public sealed partial class TypingIndicatorComponent : Component
 {
     /// <summary>
     ///     Prototype id that store all visual info about typing indicator.
     /// </summary>
-    [DataField("proto")]
+    [DataField("proto"), AutoNetworkedField]
     public ProtoId<TypingIndicatorPrototype> TypingIndicatorPrototype = "default";
 }
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index b3023e0989..6825457109 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -2,21 +2,33 @@
 using Content.Shared.DoAfter; // Sunrise-Edit
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 using Robust.Shared.Audio;
 
 namespace Content.Shared.Chemistry.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+/// <summary>
+///     Component that allows an entity instantly transfer liquids by interacting with objects that have solutions.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
 public sealed partial class HyposprayComponent : Component
 {
+    /// <summary>
+    ///     Solution that will be used by hypospray for injections.
+    /// </summary>
     [DataField]
     public string SolutionName = "hypospray";
 
+    /// <summary>
+    ///     Amount of the units that will be transfered.
+    /// </summary>
+    [AutoNetworkedField]
     [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 TransferAmount = FixedPoint2.New(5);
 
+    /// <summary>
+    ///     Sound that will be played when injecting.
+    /// </summary>
     [DataField]
     public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Items/hypospray.ogg");
 
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index c65ba0e80e..38be03226d 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -1,12 +1,12 @@
+using System.Collections;
+using System.Linq;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
-using System.Collections;
-using System.Linq;
-using Content.Shared.Chemistry.Components.SolutionManager;
 
 namespace Content.Shared.Chemistry.Components
 {
@@ -15,7 +15,7 @@ namespace Content.Shared.Chemistry.Components
     /// </summary>
     [Serializable, NetSerializable]
     [DataDefinition]
-    public sealed partial class Solution : IEnumerable<ReagentQuantity>, ISerializationHooks
+    public sealed partial class Solution : IEnumerable<ReagentQuantity>, ISerializationHooks, IRobustCloneable<Solution>
     {
         // This is a list because it is actually faster to add and remove reagents from
         // a list than a dictionary, though contains-reagent checks are slightly slower,
@@ -174,6 +174,7 @@ namespace Content.Shared.Chemistry.Components
             Volume = solution.Volume;
             MaxVolume = solution.MaxVolume;
             Temperature = solution.Temperature;
+            CanReact = solution.CanReact;
             _heatCapacity = solution._heatCapacity;
             _heatCapacityDirty = solution._heatCapacityDirty;
             _heatCapacityUpdateCounter = solution._heatCapacityUpdateCounter;
@@ -582,6 +583,7 @@ namespace Content.Shared.Chemistry.Components
         /// <summary>
         /// Splits a solution without the specified reagent prototypes.
         /// </summary>
+        [Obsolete("Use SplitSolutionWithout with params ProtoId<ReagentPrototype>")]
         public Solution SplitSolutionWithout(FixedPoint2 toTake, params string[] excludedPrototypes)
         {
             // First remove the blacklisted prototypes
@@ -611,6 +613,38 @@ namespace Content.Shared.Chemistry.Components
             return sol;
         }
 
+        /// <summary>
+        /// Splits a solution without the specified reagent prototypes.
+        /// </summary>
+        public Solution SplitSolutionWithout(FixedPoint2 toTake, params ProtoId<ReagentPrototype>[] excludedPrototypes)
+        {
+            // First remove the blacklisted prototypes
+            List<ReagentQuantity> excluded = new();
+            foreach (var id in excludedPrototypes)
+            {
+                foreach (var tuple in Contents)
+                {
+                    if (tuple.Reagent.Prototype != id)
+                        continue;
+
+                    excluded.Add(tuple);
+                    RemoveReagent(tuple);
+                    break;
+                }
+            }
+
+            // Then split the solution
+            var sol = SplitSolution(toTake);
+
+            // Then re-add the excluded reagents to the original solution.
+            foreach (var reagent in excluded)
+            {
+                AddReagent(reagent);
+            }
+
+            return sol;
+        }
+
         /// <summary>
         /// Splits a solution with only the specified reagent prototypes.
         /// </summary>
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
index 1abe81180c..913622e19d 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
@@ -1,14 +1,70 @@
-namespace Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Nutrition.Components;
+using Robust.Shared.Serialization;
 
+namespace Content.Shared.Chemistry.Components.SolutionManager;
+
+/// <summary>
+///     Component for examining a solution with shift click or through <see cref="SolutionScanEvent"/>.
+/// </summary>
 [RegisterComponent]
 public sealed partial class ExaminableSolutionComponent : Component
 {
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    ///     The solution being examined.
+    /// </summary>
+    [DataField]
     public string Solution = "default";
 
     /// <summary>
-    /// If false then the hidden solution is always visible.
+    ///     If true, the solution must be held to be examined.
     /// </summary>
     [DataField]
     public bool HeldOnly;
+
+    /// <summary>
+    ///     If false, the examine text will give an approximation of the remaining solution.
+    ///     If true, the exact unit count will be shown.
+    /// </summary>
+    [DataField]
+    public bool ExactVolume;
+
+    /// <summary>
+    ///     If false, the solution can't be examined when this entity is closed by <see cref="OpenableComponent"/>.
+    /// </summary>
+    [DataField]
+    public bool ExaminableWhileClosed = true;
+
+    /// <summary>
+    ///     Examine text for the amount of solution.
+    /// </summary>
+    /// <seealso cref="ExaminedVolumeDisplay"/>
+    [DataField]
+    public LocId LocVolume = "examinable-solution-on-examine-volume";
+
+    /// <summary>
+    ///     Examine text for the physical description of the primary reagent.
+    /// </summary>
+    [DataField]
+    public LocId LocPhysicalQuality = "shared-solution-container-component-on-examine-main-text";
+
+    /// <summary>
+    ///     Examine text for reagents that are obvious like water.
+    /// </summary>
+    [DataField]
+    public LocId LocRecognizableReagents = "examinable-solution-has-recognizable-chemicals";
+}
+
+/// <summary>
+///     Used to choose how to display a volume.
+/// </summary>
+[Serializable, NetSerializable]
+public enum ExaminedVolumeDisplay
+{
+    Exact,
+    Full,
+    MostlyFull,
+    HalfFull,
+    HalfEmpty,
+    MostlyEmpty,
+    Empty,
 }
diff --git a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs b/Content.Shared/Chemistry/Components/SolutionPurgeComponent.cs
similarity index 52%
rename from Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
rename to Content.Shared/Chemistry/Components/SolutionPurgeComponent.cs
index 9b9294b6f9..acaebb7ef8 100644
--- a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionPurgeComponent.cs
@@ -1,47 +1,48 @@
-using Content.Server.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
-namespace Content.Server.Chemistry.Components;
+namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
 /// Passively decreases a solution's quantity of reagent(s).
 /// </summary>
 [RegisterComponent, AutoGenerateComponentPause]
+[NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SolutionPurgeSystem))]
 public sealed partial class SolutionPurgeComponent : Component
 {
     /// <summary>
     /// The name of the solution to detract from.
     /// </summary>
-    [DataField("solution", required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
     public string Solution = string.Empty;
 
     /// <summary>
     /// The reagent(s) to be ignored when purging the solution
     /// </summary>
-    [DataField("preserve", customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public List<string> Preserve = new();
+    [DataField]
+    public List<ProtoId<ReagentPrototype>> Preserve = [];
 
     /// <summary>
     /// Amount of reagent(s) that are purged
     /// </summary>
-    [DataField("quantity", required: true), ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 Quantity = default!;
+    [DataField(required: true)]
+    public FixedPoint2 Quantity;
 
     /// <summary>
     /// How long it takes to purge once.
     /// </summary>
-    [DataField("duration"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan Duration = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// The time when the next purge will occur.
     /// </summary>
-    [DataField("nextPurgeTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
-    [AutoPausedField]
-    public TimeSpan NextPurgeTime = TimeSpan.FromSeconds(0);
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField, AutoNetworkedField]
+    public TimeSpan NextPurgeTime;
 }
diff --git a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs b/Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
similarity index 87%
rename from Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
rename to Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
index 0ac029c4d0..75392b94e7 100644
--- a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
@@ -1,15 +1,15 @@
 using Content.Server._Sunrise.SolutionRegenerationSwitcher;
 using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Chemistry.Components;
+namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
 /// Passively increases a solution's quantity of a reagent.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
+[RegisterComponent, AutoGenerateComponentPause, AutoGenerateComponentState, NetworkedComponent]
 [Access(typeof(SolutionRegenerationSystem), typeof(SolutionRegenerationSwitcherSystem))] // Sunrise-Edit
 public sealed partial class SolutionRegenerationComponent : Component
 {
@@ -41,7 +41,7 @@ public sealed partial class SolutionRegenerationComponent : Component
     /// The time when the next regeneration will occur.
     /// </summary>
     [DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
+    [AutoPausedField, AutoNetworkedField]
     public TimeSpan NextRegenTime = TimeSpan.FromSeconds(0);
 
     // Sunrise-start
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
similarity index 72%
rename from Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
rename to Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
index e25ba98af0..b3a2cd1848 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,18 +1,21 @@
-// The code responsible for DoAfter was taken from the rejected Wizden PR 30704. And the code for toxin filtration is from 29879. And redacted banumbas
+using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Hypospray.Events;
-using Content.Shared.Chemistry;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
 using Content.Shared.Timing;
+using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Audio.Systems;
 using Content.Server.Interaction;
 using Content.Server.Body.Components;
 using Robust.Shared.GameStates;
@@ -26,11 +29,16 @@ using Content.Shared.DoAfter;
 using Robust.Shared.Utility;
 // Sunrise-End
 
-namespace Content.Server.Chemistry.EntitySystems;
+namespace Content.Shared.Chemistry.EntitySystems;
 
-public sealed class HypospraySystem : SharedHypospraySystem
+public sealed class HypospraySystem : EntitySystem
 {
-    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     // Sunrise-Start
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
@@ -46,6 +54,7 @@ public sealed class HypospraySystem : SharedHypospraySystem
         SubscribeLocalEvent<HyposprayComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<HyposprayComponent, MeleeHitEvent>(OnAttack);
         SubscribeLocalEvent<HyposprayComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<HyposprayComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleModeVerb);
         SubscribeLocalEvent<HyposprayComponent, HyposprayDoAfterEvent>(OnHyposprayDoAfter); // Sunrise-Edit
     }
 
@@ -75,9 +84,37 @@ public sealed class HypospraySystem : SharedHypospraySystem
         }
 
         return false;
-    }    
+    }
     // Sunrise-End
 
+    #region Ref events
+    private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = TryDoInject(entity, args.User, args.User);
+    }
+
+    private void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target == null)
+            return;
+
+        args.Handled = TryUseHypospray(entity, args.Target.Value, args.User);
+    }
+
+    private void OnAttack(Entity<HyposprayComponent> entity, ref MeleeHitEvent args)
+    {
+        if (args.HitEntities is [])
+            return;
+
+        TryDoInject(entity, args.HitEntities[0], args.User);
+    }
+
+    #endregion
+
+    #region Draw/Inject
     private bool TryUseHypospray(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
     {
         // if target is ineligible but is a container, try to draw from the container if allowed
@@ -115,35 +152,11 @@ public sealed class HypospraySystem : SharedHypospraySystem
         return TryDoInject(entity, target, user);
     }
 
-    private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = TryDoInject(entity, args.User, args.User);
-    }
-
-    public void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach || args.Target == null)
-            return;
-
-        args.Handled = TryUseHypospray(entity, args.Target.Value, args.User);
-    }
-
-    public void OnAttack(Entity<HyposprayComponent> entity, ref MeleeHitEvent args)
-    {
-        if (!args.HitEntities.Any())
-            return;
-
-        TryDoInject(entity, args.HitEntities.First(), args.User);
-    }
-
     public bool TryDoInject(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
     {
         var (uid, component) = entity;
 
-        if (!EligibleEntity(target, EntityManager, component))
+        if (!EligibleEntity(target, component))
             return false;
 
         if (TryComp(uid, out UseDelayComponent? delayComp))
@@ -160,13 +173,13 @@ public sealed class HypospraySystem : SharedHypospraySystem
 
         if (selfEvent.Cancelled)
         {
-            _popup.PopupEntity(Loc.GetString(selfEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
+            _popup.PopupClient(Loc.GetString(selfEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
             return false;
         }
 
         target = selfEvent.TargetGettingInjected;
 
-        if (!EligibleEntity(target, EntityManager, component))
+        if (!EligibleEntity(target, component))
             return false;
 
         // Target event
@@ -175,13 +188,13 @@ public sealed class HypospraySystem : SharedHypospraySystem
 
         if (targetEvent.Cancelled)
         {
-            _popup.PopupEntity(Loc.GetString(targetEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
+            _popup.PopupClient(Loc.GetString(targetEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
             return false;
         }
 
         target = targetEvent.TargetGettingInjected;
 
-        if (!EligibleEntity(target, EntityManager, component))
+        if (!EligibleEntity(target, component))
             return false;
 
         // The target event gets priority for the overriden message.
@@ -192,6 +205,18 @@ public sealed class HypospraySystem : SharedHypospraySystem
         else if (target == user)
             msgFormat = "hypospray-component-inject-self-message";
 
+        if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("hypospray-component-empty-message"), target, user);
+            return true;
+        }
+
+        if (!_solutionContainers.TryGetInjectableSolution(target, out var targetSoln, out var targetSolution))
+        {
+            _popup.PopupClient(Loc.GetString("hypospray-cant-inject", ("target", Identity.Entity(target, EntityManager))), target, user);
+            return false;
+        }
+
         // Sunrise-Start
         if (!InjectionFailureCheck(entity, target, user, out var hypoSpraySoln, out var targetSoln, out var targetSolution, out var returnValue)
             || hypoSpraySoln == null
@@ -200,7 +225,7 @@ public sealed class HypospraySystem : SharedHypospraySystem
             return returnValue;
         // Sunrise-End
 
-        _popup.PopupEntity(Loc.GetString(msgFormat ?? "hypospray-component-inject-other-message", ("other", target)), target, user);
+        _popup.PopupClient(Loc.GetString(msgFormat ?? "hypospray-component-inject-other-message", ("other", target)), target, user);
 
         if (target != user)
         {
@@ -209,7 +234,7 @@ public sealed class HypospraySystem : SharedHypospraySystem
             // meleeSys.SendLunge(angle, user);
         }
 
-        _audio.PlayPvs(component.InjectSound, user);
+        _audio.PlayPredicted(component.InjectSound, target, user);
 
         // Medipens and such use this system and don't have a delay, requiring extra checks
         // BeginDelay function returns if item is already on delay
@@ -221,7 +246,7 @@ public sealed class HypospraySystem : SharedHypospraySystem
 
         if (realTransferAmount <= 0)
         {
-            _popup.PopupEntity(Loc.GetString("hypospray-component-transfer-already-full-message", ("owner", target)), target, user);
+            _popup.PopupClient(Loc.GetString("hypospray-component-transfer-already-full-message", ("owner", target)), target, user);
             return true;
         }
 
@@ -237,12 +262,12 @@ public sealed class HypospraySystem : SharedHypospraySystem
         RaiseLocalEvent(target, ref ev);
 
         // same LogType as syringes...
-        _adminLogger.Add(LogType.ForceFeed, $"{EntityManager.ToPrettyString(user):user} injected {EntityManager.ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {EntityManager.ToPrettyString(uid):using}");
+        _adminLogger.Add(LogType.ForceFeed, $"{ToPrettyString(user):user} injected {ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {ToPrettyString(uid):using}");
 
         return true;
     }
 
-    private bool TryDraw(Entity<HyposprayComponent> entity, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution, EntityUid user)
+    private bool TryDraw(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user)
     {
         if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln,
                 out var solution) || solution.AvailableVolume == 0)
@@ -255,7 +280,7 @@ public sealed class HypospraySystem : SharedHypospraySystem
             solution.AvailableVolume);
         if (realTransferAmount <= 0)
         {
-            _popup.PopupEntity(
+            _popup.PopupClient(
                 Loc.GetString("injector-component-target-is-empty-message",
                     ("target", Identity.Entity(target, EntityManager))),
                 entity.Owner, user);
@@ -278,29 +303,74 @@ public sealed class HypospraySystem : SharedHypospraySystem
 
         var removedSolution = _solutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
         // Sunrise-End
+
         if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
         {
             return false;
         }
 
-        _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+        _popup.PopupClient(Loc.GetString("injector-component-draw-success-message",
             ("amount", removedSolution.Volume),
             ("target", Identity.Entity(target, EntityManager))), entity.Owner, user);
 
         return true;
     }
 
-    private bool EligibleEntity(EntityUid entity, IEntityManager entMan, HyposprayComponent component)
+    private bool EligibleEntity(EntityUid entity, HyposprayComponent component)
     {
         // TODO: Does checking for BodyComponent make sense as a "can be hypospray'd" tag?
         // In SS13 the hypospray ONLY works on mobs, NOT beakers or anything else.
         // But this is 14, we dont do what SS13 does just because SS13 does it.
         return component.OnlyAffectsMobs
-            ? entMan.HasComponent<SolutionContainerManagerComponent>(entity) &&
-              entMan.HasComponent<MobStateComponent>(entity)
-            : entMan.HasComponent<SolutionContainerManagerComponent>(entity);
+            ? HasComp<SolutionContainerManagerComponent>(entity) &&
+              HasComp<MobStateComponent>(entity)
+            : HasComp<SolutionContainerManagerComponent>(entity);
     }
-    
+
+    #endregion
+
+    #region Verbs
+
+    // <summary>
+    // Uses the OnlyMobs field as a check to implement the ability
+    // to draw from jugs and containers with the hypospray
+    // Toggleable to allow people to inject containers if they prefer it over drawing
+    // </summary>
+    private void AddToggleModeVerb(Entity<HyposprayComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.InjectOnly)
+            return;
+
+        var user = args.User;
+        var verb = new AlternativeVerb
+        {
+            Text = Loc.GetString("hypospray-verb-mode-label"),
+            Act = () =>
+            {
+                ToggleMode(entity, user);
+            }
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void ToggleMode(Entity<HyposprayComponent> entity, EntityUid user)
+    {
+        SetMode(entity, !entity.Comp.OnlyAffectsMobs);
+        var msg = (entity.Comp.OnlyAffectsMobs && entity.Comp.CanContainerDraw) ? "hypospray-verb-mode-inject-mobs-only" : "hypospray-verb-mode-inject-all";
+        _popup.PopupClient(Loc.GetString(msg), entity, user);
+    }
+
+    public void SetMode(Entity<HyposprayComponent> entity, bool onlyAffectsMobs)
+    {
+        if (entity.Comp.OnlyAffectsMobs == onlyAffectsMobs)
+            return;
+
+        entity.Comp.OnlyAffectsMobs = onlyAffectsMobs;
+        Dirty(entity);
+    }
+
+    #endregion
+
     // Sunrise-Start
     private bool InjectionFailureCheck(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user, out Entity<SolutionComponent>? hypoSpraySoln, out Entity<SolutionComponent>? targetSoln, out Solution? targetSolution, out bool returnValue)
     {
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
deleted file mode 100644
index 6985ae693c..0000000000
--- a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Timing;
-using Content.Shared.Verbs;
-using Content.Shared.Popups;
-using Robust.Shared.Player;
-using Content.Shared.Administration.Logs;
-
-namespace Content.Shared.Chemistry.EntitySystems;
-
-public abstract class SharedHypospraySystem : EntitySystem
-{
-    [Dependency] protected readonly UseDelaySystem _useDelay = default!;
-    [Dependency] protected readonly SharedPopupSystem _popup = default!;
-    [Dependency] protected readonly SharedSolutionContainerSystem _solutionContainers = default!;
-    [Dependency] protected readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] protected readonly ReactiveSystem _reactiveSystem = default!;
-    
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<HyposprayComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleModeVerb);
-    }
-
-    // <summary>
-    // Uses the OnlyMobs field as a check to implement the ability
-    // to draw from jugs and containers with the hypospray
-    // Toggleable to allow people to inject containers if they prefer it over drawing
-    // </summary>
-    private void AddToggleModeVerb(Entity<HyposprayComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.InjectOnly)
-            return;
-
-        var (_, component) = entity;
-        var user = args.User;
-        var verb = new AlternativeVerb
-        {
-            Text = Loc.GetString("hypospray-verb-mode-label"),
-            Act = () =>
-            {
-                ToggleMode(entity, user);
-            }
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void ToggleMode(Entity<HyposprayComponent> entity, EntityUid user)
-    {
-        SetMode(entity, !entity.Comp.OnlyAffectsMobs);
-        string msg = (entity.Comp.OnlyAffectsMobs && entity.Comp.CanContainerDraw) ? "hypospray-verb-mode-inject-mobs-only" : "hypospray-verb-mode-inject-all";
-        _popup.PopupClient(Loc.GetString(msg), entity, user);
-    }
-
-    public void SetMode(Entity<HyposprayComponent> entity, bool onlyAffectsMobs)
-    {
-        if (entity.Comp.OnlyAffectsMobs == onlyAffectsMobs)
-            return;
-
-        entity.Comp.OnlyAffectsMobs = onlyAffectsMobs;
-        Dirty(entity);
-    }
-}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
index ffdb608875..cc511f8db9 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reaction;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 
@@ -139,12 +137,13 @@ public abstract partial class SharedSolutionContainerSystem
 
     #endregion Solution Modifiers
 
+    /// <returns>A value between 0 and 100 inclusive.</returns>
     public float PercentFull(EntityUid uid)
     {
-        if (!TryGetDrainableSolution(uid, out _, out var solution) || solution.MaxVolume.Equals(FixedPoint2.Zero))
+        if (!TryGetDrainableSolution(uid, out _, out var solution))
             return 0;
 
-        return solution.FillFraction * 100;
+        return PercentFull(solution);
     }
 
     #region Static Methods
@@ -175,5 +174,14 @@ public abstract partial class SharedSolutionContainerSystem
         return sb.ToString();
     }
 
+    /// <returns>A value between 0 and 100 inclusive.</returns>
+    public static float PercentFull(Solution sol)
+    {
+        if (sol.MaxVolume.Equals(FixedPoint2.Zero))
+            return 0;
+
+        return sol.FillFraction * 100;
+    }
+
     #endregion Static Methods
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index f536beef2b..54210cf195 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -1,24 +1,27 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Examine;
-using Content.Shared.FixedPoint;
-using Content.Shared.Verbs;
-using JetBrains.Annotations;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Text;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Containers;
+using Content.Shared.Examine;
+using Content.Shared.FixedPoint;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Localizations;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Verbs;
+using JetBrains.Annotations;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
 
 namespace Content.Shared.Chemistry.EntitySystems;
@@ -64,6 +67,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
     [Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
+    [Dependency] protected readonly OpenableSystem Openable = default!;
     [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
     [Dependency] protected readonly SharedHandsSystem Hands = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
@@ -282,8 +286,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     public FixedPoint2 GetTotalPrototypeQuantity(EntityUid owner, string reagentId)
     {
         var reagentQuantity = FixedPoint2.New(0);
-        if (EntityManager.EntityExists(owner)
-            && EntityManager.TryGetComponent(owner, out SolutionContainerManagerComponent? managerComponent))
+        if (Exists(owner)
+            && TryComp(owner, out SolutionContainerManagerComponent? managerComponent))
         {
             foreach (var (_, soln) in EnumerateSolutions((owner, managerComponent)))
             {
@@ -335,7 +339,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         var (uid, comp, appearanceComponent) = soln;
         var solution = comp.Solution;
 
-        if (!EntityManager.EntityExists(uid) || !Resolve(uid, ref appearanceComponent, false))
+        if (!Exists(uid) || !Resolve(uid, ref appearanceComponent, false))
             return;
 
         AppearanceSystem.SetData(uid, SolutionContainerVisuals.FillFraction, solution.FillFraction, appearanceComponent);
@@ -376,6 +380,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <summary>
     /// Splits a solution without the specified reagent(s).
     /// </summary>
+    [Obsolete("Use SplitSolutionWithout with params ProtoId<ReagentPrototype>")]
     public Solution SplitSolutionWithout(Entity<SolutionComponent> soln, FixedPoint2 quantity, params string[] reagents)
     {
         var (uid, comp) = soln;
@@ -386,6 +391,19 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         return splitSol;
     }
 
+    /// <summary>
+    /// Splits a solution without the specified reagent(s).
+    /// </summary>
+    public Solution SplitSolutionWithout(Entity<SolutionComponent> soln, FixedPoint2 quantity, params ProtoId<ReagentPrototype>[] reagents)
+    {
+        var (uid, comp) = soln;
+        var solution = comp.Solution;
+
+        var splitSol = solution.SplitSolutionWithout(quantity, reagents);
+        UpdateChemicals(soln);
+        return splitSol;
+    }
+
     public void RemoveAllSolution(Entity<SolutionComponent> soln)
     {
         var (uid, comp) = soln;
@@ -496,20 +514,20 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     ///     Removes reagent from a container.
     /// </summary>
     /// <param name="targetUid"></param>
-    /// <param name="container">Solution container from which we are removing reagent</param>
+    /// <param name="container">Solution container from which we are removing reagent.</param>
     /// <param name="reagentQuantity">The reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
     {
         var (uid, comp) = soln;
         var solution = comp.Solution;
 
         var quant = solution.RemoveReagent(reagentQuantity);
         if (quant <= FixedPoint2.Zero)
-            return false;
+            return FixedPoint2.Zero;
 
         UpdateChemicals(soln);
-        return true;
+        return quant;
     }
 
     /// <summary>
@@ -519,8 +537,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="prototype">The Id of the reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
     {
         return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
     }
@@ -532,8 +550,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="reagentId">The reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
     {
         return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity));
     }
@@ -777,52 +795,55 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         }
     }
 
+    /// <summary>
+    ///     Shift click examine.
+    /// </summary>
     private void OnExamineSolution(Entity<ExaminableSolutionComponent> entity, ref ExaminedEvent args)
     {
-        if (!TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
-        {
+        if (!args.IsInDetailsRange ||
+            !CanSeeHiddenSolution(entity, args.Examiner) ||
+            !TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
             return;
-        }
-
-        if (!CanSeeHiddenSolution(entity, args.Examiner))
-            return;
-
-        var primaryReagent = solution.GetPrimaryReagentId();
-
-        if (string.IsNullOrEmpty(primaryReagent?.Prototype))
-        {
-            args.PushText(Loc.GetString("shared-solution-container-component-on-examine-empty-container"));
-            return;
-        }
-
-        if (!PrototypeManager.TryIndex(primaryReagent.Value.Prototype, out ReagentPrototype? primary))
-        {
-            Log.Error($"{nameof(Solution)} could not find the prototype associated with {primaryReagent}.");
-            return;
-        }
-
-        var colorHex = solution.GetColor(PrototypeManager)
-            .ToHexNoAlpha(); //TODO: If the chem has a dark color, the examine text becomes black on a black background, which is unreadable.
-        var messageString = "shared-solution-container-component-on-examine-main-text";
 
         using (args.PushGroup(nameof(ExaminableSolutionComponent)))
         {
-            args.PushMarkup(Loc.GetString(messageString,
-                ("color", colorHex),
-                ("wordedAmount", Loc.GetString(solution.Contents.Count == 1
-                    ? "shared-solution-container-component-on-examine-worded-amount-one-reagent"
-                    : "shared-solution-container-component-on-examine-worded-amount-multiple-reagents")),
-                ("desc", primary.LocalizedPhysicalDescription)));
 
-            var reagentPrototypes = solution.GetReagentPrototypes(PrototypeManager);
+            var primaryReagent = solution.GetPrimaryReagentId();
+
+            // If there's no primary reagent, assume the solution is empty and exit early
+            if (string.IsNullOrEmpty(primaryReagent?.Prototype) ||
+                !PrototypeManager.Resolve<ReagentPrototype>(primaryReagent.Value.Prototype, out var primary))
+            {
+                args.PushMarkup(Loc.GetString(entity.Comp.LocVolume, ("fillLevel", ExaminedVolumeDisplay.Empty)));
+                return;
+            }
+
+            // Push amount of reagent
+
+            args.PushMarkup(Loc.GetString(entity.Comp.LocVolume,
+                                ("fillLevel", ExaminedVolume(entity, solution, args.Examiner)),
+                                ("current", solution.Volume),
+                                ("max", solution.MaxVolume)));
+
+            // Push the physical description of the primary reagent
+
+            var colorHex = solution.GetColor(PrototypeManager)
+                .ToHexNoAlpha(); //TODO: If the chem has a dark color, the examine text becomes black on a black background, which is unreadable.
+
+            args.PushMarkup(Loc.GetString(entity.Comp.LocPhysicalQuality,
+                                        ("color", colorHex),
+                                        ("desc", primary.LocalizedPhysicalDescription),
+                                        ("chemCount", solution.Contents.Count) ));
+
+            // Push the recognizable reagents
 
             // Sort the reagents by amount, descending then alphabetically
-            var sortedReagentPrototypes = reagentPrototypes
+            var sortedReagentPrototypes = solution.GetReagentPrototypes(PrototypeManager)
                 .OrderByDescending(pair => pair.Value.Value)
                 .ThenBy(pair => pair.Key.LocalizedName);
 
-            // Add descriptions of immediately recognizable reagents, like water or beer
-            var recognized = new List<ReagentPrototype>();
+            // Collect recognizable reagents, like water or beer
+            var recognized = new List<string>();
             foreach (var keyValuePair in sortedReagentPrototypes)
             {
                 var proto = keyValuePair.Key;
@@ -831,41 +852,58 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
                     continue;
                 }
 
-                recognized.Add(proto);
+                recognized.Add(Loc.GetString("examinable-solution-recognized",
+                                            ("color", proto.SubstanceColor.ToHexNoAlpha()),
+                                            ("chemical", proto.LocalizedName)));
             }
 
-            // Skip if there's nothing recognizable
             if (recognized.Count == 0)
                 return;
 
-            var msg = new StringBuilder();
-            foreach (var reagent in recognized)
-            {
-                string part;
-                if (reagent == recognized[0])
-                {
-                    part = "examinable-solution-recognized-first";
-                }
-                else if (reagent == recognized[^1])
-                {
-                    // this loc specifically  requires space to be appended, fluent doesnt support whitespace
-                    msg.Append(' ');
-                    part = "examinable-solution-recognized-last";
-                }
-                else
-                {
-                    part = "examinable-solution-recognized-next";
-                }
+            var msg = ContentLocalizationManager.FormatList(recognized);
 
-                msg.Append(Loc.GetString(part, ("color", reagent.SubstanceColor.ToHexNoAlpha()),
-                    ("chemical", reagent.LocalizedName)));
-            }
-
-            args.PushMarkup(Loc.GetString("examinable-solution-has-recognizable-chemicals",
-                ("recognizedString", msg.ToString())));
+            // Finally push the full message
+            args.PushMarkup(Loc.GetString(entity.Comp.LocRecognizableReagents,
+                ("recognizedString", msg)));
         }
     }
 
+    /// <returns>An enum for how to display the solution.</returns>
+    public ExaminedVolumeDisplay ExaminedVolume(Entity<ExaminableSolutionComponent> ent, Solution sol, EntityUid? examiner = null)
+    {
+        // Exact measurement
+        if (ent.Comp.ExactVolume)
+            return ExaminedVolumeDisplay.Exact;
+
+        // General approximation
+        return (int)PercentFull(sol) switch
+        {
+            100 => ExaminedVolumeDisplay.Full,
+            > 66 => ExaminedVolumeDisplay.MostlyFull,
+            > 33 => HalfEmptyOrHalfFull(examiner),
+            > 0 => ExaminedVolumeDisplay.MostlyEmpty,
+            _ => ExaminedVolumeDisplay.Empty,
+        };
+    }
+
+    // Some spessmen see half full, some see half empty, but always the same one.
+    private ExaminedVolumeDisplay HalfEmptyOrHalfFull(EntityUid? examiner = null)
+    {
+        // Optimistic when un-observed
+        if (examiner == null)
+            return ExaminedVolumeDisplay.HalfFull;
+
+        var meta = MetaData(examiner.Value);
+        if (meta.EntityName.Length > 0 &&
+            string.Compare(meta.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0)
+            return ExaminedVolumeDisplay.HalfFull;
+
+        return ExaminedVolumeDisplay.HalfEmpty;
+    }
+
+    /// <summary>
+    ///     Full reagent scan, such as with chemical analysis goggles.
+    /// </summary>
     private void OnSolutionExaminableVerb(Entity<ExaminableSolutionComponent> entity, ref GetVerbsEvent<ExamineVerb> args)
     {
         if (!args.CanInteract || !args.CanAccess)
@@ -939,18 +977,16 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     /// <summary>
-    /// Check if examinable solution requires you to hold the item in hand.
+    ///     Check if an examinable solution is hidden by something.
     /// </summary>
     private bool CanSeeHiddenSolution(Entity<ExaminableSolutionComponent> entity, EntityUid examiner)
     {
         // If not held-only then it's always visible.
-        if (!entity.Comp.HeldOnly)
-            return true;
+        if (entity.Comp.HeldOnly && !Hands.IsHolding(examiner, entity, out _))
+            return false;
 
-        if (TryComp(examiner, out HandsComponent? handsComp))
-        {
-            return Hands.IsHolding(examiner, entity, out _, handsComp);
-        }
+        if (!entity.Comp.ExaminableWhileClosed && Openable.IsClosed(entity.Owner, predicted: true))
+            return false;
 
         return true;
     }
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs
similarity index 56%
rename from Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
rename to Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs
index 5a25e76456..bf39aaecc4 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs
@@ -1,15 +1,28 @@
-using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
+using System.Linq;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Chemistry.EntitySystems;
+namespace Content.Shared.Chemistry.EntitySystems;
 
 public sealed class SolutionPurgeSystem : EntitySystem
 {
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SolutionPurgeComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<SolutionPurgeComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextPurgeTime = _timing.CurTime + ent.Comp.Duration;
+        Dirty(ent);
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -22,8 +35,15 @@ public sealed class SolutionPurgeSystem : EntitySystem
 
             // timer ignores if it's empty, it's just a fixed cycle
             purge.NextPurgeTime += purge.Duration;
+            // Needs to be networked and dirtied so that the client can reroll it during prediction
+            Dirty(uid, purge);
+
             if (_solutionContainer.TryGetSolution((uid, manager), purge.Solution, out var solution))
-                _solutionContainer.SplitSolutionWithout(solution.Value, purge.Quantity, purge.Preserve.ToArray());
+            {
+                _solutionContainer.SplitSolutionWithout(solution.Value,
+                    purge.Quantity,
+                    purge.Preserve.Select(proto => proto.Id).ToArray());
+            }
         }
     }
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
new file mode 100644
index 0000000000..369b837202
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
@@ -0,0 +1,69 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public sealed class SolutionRegenerationSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SolutionRegenerationComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SolutionRegenerationComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
+    }
+
+    private void OnMapInit(Entity<SolutionRegenerationComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextRegenTime = _timing.CurTime + ent.Comp.Duration;
+
+        Dirty(ent);
+    }
+
+    // Workaround for https://github.com/space-wizards/space-station-14/pull/35314
+    private void OnEntRemoved(Entity<SolutionRegenerationComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and clear our cached reference
+        if (args.Entity == ent.Comp.SolutionRef?.Owner)
+            ent.Comp.SolutionRef = null;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<SolutionRegenerationComponent, SolutionContainerManagerComponent>();
+        while (query.MoveNext(out var uid, out var regen, out var manager))
+        {
+            if (_timing.CurTime < regen.NextRegenTime)
+                continue;
+
+            // timer ignores if its full, it's just a fixed cycle
+            regen.NextRegenTime += regen.Duration;
+            // Needs to be networked and dirtied so that the client can reroll it during prediction
+            Dirty(uid, regen);
+            if (!_solutionContainer.ResolveSolution((uid, manager),
+                    regen.SolutionName,
+                    ref regen.SolutionRef,
+                    out var solution))
+                continue;
+
+            var amount = FixedPoint2.Min(solution.AvailableVolume, regen.Generated.Volume);
+            if (amount <= FixedPoint2.Zero)
+                continue;
+
+            // Don't bother cloning and splitting if adding the whole thing
+            var generated = amount == regen.Generated.Volume
+                ? regen.Generated
+                : regen.Generated.Clone().SplitSolution(amount);
+
+            _solutionContainer.TryAddSolution(regen.SolutionRef.Value, generated);
+        }
+    }
+}
diff --git a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
index e9d3b7de53..68a55dd468 100644
--- a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
+++ b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
@@ -52,7 +52,7 @@ namespace Content.Shared.Chemistry
                     continue;
 
                 _components.RemoveAt(i);
-                EntityManager.RemoveComponent<MovespeedModifierMetabolismComponent>(metabolism);
+                RemComp<MovespeedModifierMetabolismComponent>(metabolism);
 
                 _movespeed.RefreshMovementSpeedModifiers(metabolism);
             }
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index 25781d2966..351a51ecc1 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -1,3 +1,5 @@
+using System.Collections.Frozen;
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
@@ -5,10 +7,9 @@ using Content.Shared.Database;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Collections.Frozen;
-using System.Linq;
 
 
 namespace Content.Shared.Chemistry.Reaction
@@ -25,9 +26,10 @@ namespace Content.Shared.Chemistry.Reaction
         /// </summary>
         private const int MaxReactionIterations = 20;
 
+        [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         /// <summary>
@@ -225,7 +227,11 @@ namespace Content.Shared.Chemistry.Reaction
                 effect.Effect(args);
             }
 
-            _audio.PlayPvs(reaction.Sound, soln);
+            // Someday, some brave soul will thread through an optional actor
+            // argument in from every call of OnReaction up, all just to pass
+            // it to PlayPredicted. I am not that brave soul.
+            if (_netMan.IsServer)
+                _audio.PlayPvs(reaction.Sound, soln);
         }
 
         /// <summary>
@@ -235,7 +241,6 @@ namespace Content.Shared.Chemistry.Reaction
         /// </summary>
         private bool ProcessReactions(Entity<SolutionComponent> soln, SortedSet<ReactionPrototype> reactions, ReactionMixerComponent? mixerComponent)
         {
-            HashSet<ReactionPrototype> toRemove = new();
             List<string>? products = null;
 
             // attempt to perform any applicable reaction
@@ -243,7 +248,6 @@ namespace Content.Shared.Chemistry.Reaction
             {
                 if (!CanReact(soln, reaction, mixerComponent, out var unitReactions))
                 {
-                    toRemove.Add(reaction);
                     continue;
                 }
 
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index d536c6d31c..4a852f8e49 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -571,7 +571,7 @@ public sealed partial class ClimbSystem : VirtualController
 
         _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/Cloning/SharedCloningSystem.cs b/Content.Shared/Cloning/SharedCloningSystem.cs
new file mode 100644
index 0000000000..d8ab8a2aa1
--- /dev/null
+++ b/Content.Shared/Cloning/SharedCloningSystem.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.Cloning;
+
+public abstract partial class SharedCloningSystem : EntitySystem
+{
+    /// <summary>
+    /// Copy components from one entity to another based on a CloningSettingsPrototype.
+    /// </summary>
+    /// <param name="original">The orignal Entity to clone components from.</param>
+    /// <param name="clone">The target Entity to clone components to.</param>
+    /// <param name="settings">The clone settings prototype containing the list of components to clone.</param>
+    public virtual void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings)
+    {
+    }
+}
diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs
index 260af210e0..ff1d422189 100644
--- a/Content.Shared/Clothing/Components/ClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ClothingComponent.cs
@@ -11,12 +11,11 @@ namespace Content.Shared.Clothing.Components;
 /// <summary>
 ///     This handles entities which can be equipped.
 /// </summary>
-[NetworkedComponent]
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 [Access(typeof(ClothingSystem), typeof(InventorySystem))]
 public sealed partial class ClothingComponent : Component
 {
-    [DataField("clothingVisuals")]
+    [DataField]
     public Dictionary<string, List<PrototypeLayerData>> ClothingVisuals = new();
 
     /// <summary>
@@ -25,8 +24,7 @@ public sealed partial class ClothingComponent : Component
     [DataField]
     public string? MappedLayer;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("quickEquip")]
+    [DataField]
     public bool QuickEquip = true;
 
     /// <summary>
@@ -36,22 +34,18 @@ public sealed partial class ClothingComponent : Component
     /// <remarks>
     /// Note that this may be a combination of different slot flags, not a singular bit.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField(required: true)]
     [Access(typeof(ClothingSystem), typeof(InventorySystem), Other = AccessPermissions.ReadExecute)]
     public SlotFlags Slots = SlotFlags.NONE;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("equipSound")]
+    [DataField]
     public SoundSpecifier? EquipSound;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("unequipSound")]
+    [DataField]
     public SoundSpecifier? UnequipSound;
 
     [Access(typeof(ClothingSystem))]
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("equippedPrefix")]
+    [DataField, AutoNetworkedField]
     public string? EquippedPrefix;
 
     /// <summary>
@@ -59,11 +53,9 @@ public sealed partial class ClothingComponent : Component
     /// useful when prototyping INNERCLOTHING items into OUTERCLOTHING items without duplicating/modifying RSIs etc.
     /// </summary>
     [Access(typeof(ClothingSystem))]
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("equippedState")]
+    [DataField, AutoNetworkedField]
     public string? EquippedState;
 
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField("sprite")]
     public string? RsiPath;
 
@@ -72,7 +64,7 @@ public sealed partial class ClothingComponent : Component
     /// Note that this being non-null does not mean the clothing is considered "worn" or "equipped" unless the slot
     /// satisfies the <see cref="Slots"/> flags.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public string? InSlot;
     // TODO CLOTHING
     // Maybe keep this null unless its in a valid slot?
@@ -82,16 +74,16 @@ public sealed partial class ClothingComponent : Component
     /// <summary>
     /// Slot flags of the slot the clothing is currently in. See also <see cref="InSlot"/>.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public SlotFlags? InSlotFlag;
     // TODO CLOTHING
     // Maybe keep this null unless its in a valid slot?
     // And when doing this, combine InSlot and InSlotFlag, as it'd be a breaking change for downstreams anyway
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan EquipDelay = TimeSpan.Zero;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan UnequipDelay = TimeSpan.Zero;
 
     /// <summary>
@@ -102,17 +94,6 @@ public sealed partial class ClothingComponent : Component
     public TimeSpan StripDelay = TimeSpan.Zero;
 }
 
-[Serializable, NetSerializable]
-public sealed class ClothingComponentState : ComponentState
-{
-    public string? EquippedPrefix;
-
-    public ClothingComponentState(string? equippedPrefix)
-    {
-        EquippedPrefix = equippedPrefix;
-    }
-}
-
 public enum ClothingMask : byte
 {
     NoMask = 0,
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 7b03adcc8d..2068162e49 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -35,11 +35,11 @@ public sealed partial class FoldableClothingComponent : Component
     /// Which layers does this hide when Unfolded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? UnfoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> UnfoldedHideLayers = new();
 
     /// <summary>
     /// Which layers does this hide when folded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? FoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> FoldedHideLayers = new();
 }
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 8aa1c71459..96b9985154 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -21,8 +21,7 @@ public abstract class ClothingSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<ClothingComponent, ComponentGetState>(OnGetState);
-        SubscribeLocalEvent<ClothingComponent, ComponentHandleState>(OnHandleState);
+        SubscribeLocalEvent<ClothingComponent, AfterAutoHandleStateEvent>(AfterAutoHandleState);
         SubscribeLocalEvent<ClothingComponent, GotEquippedEvent>(OnGotEquipped);
         SubscribeLocalEvent<ClothingComponent, GotUnequippedEvent>(OnGotUnequipped);
 
@@ -84,6 +83,7 @@ public abstract class ClothingSystem : EntitySystem
     {
         component.InSlot = args.Slot;
         component.InSlotFlag = args.SlotFlags;
+        Dirty(uid, component);
 
         if ((component.Slots & args.SlotFlags) == SlotFlags.NONE)
             return;
@@ -108,19 +108,12 @@ public abstract class ClothingSystem : EntitySystem
 
         component.InSlot = null;
         component.InSlotFlag = null;
+        Dirty(uid, component);
     }
 
-    private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args)
+    private void AfterAutoHandleState(Entity<ClothingComponent> ent, ref AfterAutoHandleStateEvent args)
     {
-        args.State = new ClothingComponentState(component.EquippedPrefix);
-    }
-
-    private void OnHandleState(EntityUid uid, ClothingComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not ClothingComponentState state)
-            return;
-
-        SetEquippedPrefix(uid, state.EquippedPrefix, component);
+        _itemSys.VisualsChanged(ent.Owner);
     }
 
     private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAfterEvent args)
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index a60caa454b..7c6810140c 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -37,7 +37,7 @@ public sealed class FoldableClothingSystem : EntitySystem
         }
 
         // Setting hidden layers while equipped is not currently supported.
-        if (ent.Comp.FoldedHideLayers != null || ent.Comp.UnfoldedHideLayers != null)
+        if (ent.Comp.FoldedHideLayers.Count != 0|| ent.Comp.UnfoldedHideLayers.Count != 0)
             args.Cancelled = true;
     }
 
@@ -65,7 +65,7 @@ public sealed class FoldableClothingSystem : EntitySystem
             // This should instead work via an event or something that gets raised to optionally modify the currently hidden layers.
             // Or at the very least it should stash the old layers and restore them when unfolded.
             // TODO CLOTHING fix this.
-            if (ent.Comp.FoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.FoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.FoldedHideLayers;
 
         }
@@ -81,7 +81,7 @@ public sealed class FoldableClothingSystem : EntitySystem
                 _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
 
             // TODO CLOTHING fix this.
-            if (ent.Comp.UnfoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.UnfoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.UnfoldedHideLayers;
 
         }
diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
index 4f89b111bd..30e00faf0a 100644
--- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
@@ -75,13 +75,13 @@ public sealed class MaskSystem : EntitySystem
     private void ToggleMaskComponents(EntityUid uid, MaskComponent mask, EntityUid wearer, string? equippedPrefix = null, bool isEquip = false)
     {
         Dirty(uid, mask);
-        if (mask.ToggleActionEntity is {} action)
+        if (mask.ToggleActionEntity is { } action)
             _actionSystem.SetToggled(action, mask.IsToggled);
 
-        var maskEv = new ItemMaskToggledEvent((wearer, mask), wearer);
+        var maskEv = new ItemMaskToggledEvent((uid, mask), wearer);
         RaiseLocalEvent(uid, ref maskEv);
 
-        var wearerEv = new WearerMaskToggledEvent((wearer, mask));
+        var wearerEv = new WearerMaskToggledEvent((uid, mask));
         RaiseLocalEvent(wearer, ref wearerEv);
     }
 
diff --git a/Content.Shared/Clumsy/ClumsyComponent.cs b/Content.Shared/Clumsy/ClumsyComponent.cs
index 6b013a5c2f..9e6e851c8c 100644
--- a/Content.Shared/Clumsy/ClumsyComponent.cs
+++ b/Content.Shared/Clumsy/ClumsyComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Clumsy;
 
 /// <summary>
-/// A simple clumsy tag-component.
+/// Makes the entity clumsy, randomly failing some interactions and hurting themselves.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ClumsyComponent : Component
@@ -48,11 +48,17 @@ public sealed partial class ClumsyComponent : Component
     public TimeSpan GunShootFailStunTime = TimeSpan.FromSeconds(3);
 
     /// <summary>
-    ///     Stun time after failing to shoot a gun.
+    ///     Damage taken after failing to shoot a gun.
     /// </summary>
     [DataField, AutoNetworkedField]
     public DamageSpecifier? GunShootFailDamage;
 
+    /// <summary>
+    ///     Damage taken after failing to catch an item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier? CatchingFailDamage;
+
     /// <summary>
     ///     Noise to play after failing to shoot a gun. Boom!
     /// </summary>
@@ -77,6 +83,12 @@ public sealed partial class ClumsyComponent : Component
     [DataField, AutoNetworkedField]
     public bool ClumsyGuns = true;
 
+    /// <summary>
+    ///      Whether or not to apply Clumsy to catching items.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ClumsyCatching = true;
+
     /// <summary>
     ///      Whether or not to apply Clumsy to vaulting.
     /// </summary>
@@ -87,17 +99,23 @@ public sealed partial class ClumsyComponent : Component
     ///      Lets you define a new "failed" message for each event.
     /// </summary>
     [DataField]
-    public LocId HypoFailedMessage = "hypospray-component-inject-self-clumsy-message";
+    public LocId HypoFailedMessage = "clumsy-hypospray-fail-message";
 
     [DataField]
-    public LocId GunFailedMessage = "gun-clumsy";
+    public LocId GunFailedMessage = "clumsy-gun-fail-message";
 
     [DataField]
-    public LocId VaulingFailedMessageSelf = "bonkable-success-message-user";
+    public LocId CatchingFailedMessageSelf = "clumsy-catch-fail-message-user";
 
     [DataField]
-    public LocId VaulingFailedMessageOthers = "bonkable-success-message-others";
+    public LocId CatchingFailedMessageOthers = "clumsy-catch-fail-message-others";
 
     [DataField]
-    public LocId VaulingFailedMessageForced = "forced-bonkable-success-message";
+    public LocId VaulingFailedMessageSelf = "clumsy-vaulting-fail-message-user";
+
+    [DataField]
+    public LocId VaulingFailedMessageOthers = "clumsy-vaulting-fail-message-others";
+
+    [DataField]
+    public LocId VaulingFailedMessageForced = "clumsy-vaulting-fail-forced-message";
 }
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index 348d99182a..2506359c25 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -6,10 +6,14 @@ using Content.Shared.Damage;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Medical;
 using Content.Shared.Popups;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Stunnable;
+using Content.Shared.Throwing;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -17,19 +21,20 @@ namespace Content.Shared.Clumsy;
 
 public sealed class ClumsySystem : EntitySystem
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly INetManager _net = default!;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeHyposprayInjectsEvent>(BeforeHyposprayEvent);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeDefibrillatorZapsEvent>(BeforeDefibrillatorZapsEvent);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeGunShotEvent>(BeforeGunShotEvent);
+        SubscribeLocalEvent<ClumsyComponent, CatchAttemptEvent>(OnCatchAttempt);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeClimbEvent>(OnBeforeClimbEvent);
     }
 
@@ -43,12 +48,15 @@ public sealed class ClumsySystem : EntitySystem
         if (!ent.Comp.ClumsyHypo)
             return;
 
-        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
         args.TargetGettingInjected = args.EntityUsingHypospray;
-        args.InjectMessageOverride = "hypospray-component-inject-self-clumsy-message";
-        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+        args.InjectMessageOverride = Loc.GetString(ent.Comp.HypoFailedMessage);
+        _audio.PlayPredicted(ent.Comp.ClumsySound, ent, args.EntityUsingHypospray);
     }
 
     private void BeforeDefibrillatorZapsEvent(Entity<ClumsyComponent> ent, ref SelfBeforeDefibrillatorZapsEvent args)
@@ -59,7 +67,10 @@ public sealed class ClumsySystem : EntitySystem
         if (!ent.Comp.ClumsyDefib)
             return;
 
-        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
         args.DefibTarget = args.EntityUsingDefib;
@@ -67,6 +78,37 @@ public sealed class ClumsySystem : EntitySystem
 
     }
 
+    private void OnCatchAttempt(Entity<ClumsyComponent> ent, ref CatchAttemptEvent args)
+    {
+        // Clumsy people sometimes fail to catch items!
+
+        // checks if ClumsyCatching is false, if so, skips.
+        if (!ent.Comp.ClumsyCatching)
+            return;
+
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(args.Item).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
+            return;
+
+        args.Cancelled = true; // fail to catch
+
+        if (ent.Comp.CatchingFailDamage != null)
+            _damageable.TryChangeDamage(ent, ent.Comp.CatchingFailDamage, origin: args.Item);
+
+        // Collisions don't work properly with PopupPredicted or PlayPredicted.
+        // So we make this server only.
+        if (_net.IsClient)
+            return;
+
+        var selfMessage = Loc.GetString(ent.Comp.CatchingFailedMessageSelf, ("item", ent.Owner), ("catcher", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString(ent.Comp.CatchingFailedMessageOthers, ("item", ent.Owner), ("catcher", Identity.Entity(ent.Owner, EntityManager)));
+        _popup.PopupEntity(selfMessage, ent.Owner, ent.Owner);
+        _popup.PopupEntity(othersMessage, ent.Owner, Filter.PvsExcept(ent.Owner), true);
+        _audio.PlayPvs(ent.Comp.ClumsySound, ent);
+    }
+
     private void BeforeGunShotEvent(Entity<ClumsyComponent> ent, ref SelfBeforeGunShotEvent args)
     {
         // Clumsy people sometimes can't shoot :(
@@ -78,19 +120,22 @@ public sealed class ClumsySystem : EntitySystem
         if (args.Gun.Comp.ClumsyProof)
             return;
 
-        if (!_random.Prob(ent.Comp.ClumsyDefaultCheck))
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(args.Gun).Id });
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
         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);
         _audio.PlayPvs(ent.Comp.ClumsySound, ent);
 
-        _popup.PopupEntity(Loc.GetString("gun-clumsy"), ent, ent);
+        _popup.PopupEntity(Loc.GetString(ent.Comp.GunFailedMessage), ent, ent);
         args.Cancel();
     }
 
@@ -100,9 +145,9 @@ public sealed class ClumsySystem : EntitySystem
         if (!ent.Comp.ClumsyVaulting)
             return;
 
-        // This event is called in shared, thats why it has all the extra prediction stuff.
-        var rand = new System.Random((int)_timing.CurTick.Value);
-
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var rand = new System.Random(seed);
         if (!_cfg.GetCVar(CCVars.GameTableBonk) && !rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
@@ -157,7 +202,7 @@ public sealed class ClumsySystem : EntitySystem
                 _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true);
         }
 
-        _stun.TryParalyze(target, stunTime, true);
+        _stun.TryUpdateParalyzeDuration(target, stunTime);
     }
     #endregion
 }
diff --git a/Content.Shared/Configurable/ConfigurationComponent.cs b/Content.Shared/Configurable/ConfigurationComponent.cs
index 63c0845083..80affb81f5 100644
--- a/Content.Shared/Configurable/ConfigurationComponent.cs
+++ b/Content.Shared/Configurable/ConfigurationComponent.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Configurable
     /// <remarks>
     /// If you want a more detailed description ask the original coder.
     /// </remarks>
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
     public sealed partial class ConfigurationComponent : Component
     {
         /// <summary>
diff --git a/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs b/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
index 5a70e145f6..73b23d11ae 100644
--- a/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
+++ b/Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
@@ -21,7 +21,7 @@ namespace Content.Shared.Construction.Conditions
 
             foreach (var entity in lookupSys.GetEntitiesIntersecting(location, LookupFlags.Approximate | LookupFlags.Static))
             {
-                if (IoCManager.Resolve<IEntityManager>().HasComponent<SharedCanBuildWindowOnTopComponent>(entity))
+                if (entManager.HasComponent<SharedCanBuildWindowOnTopComponent>(entity))
                     result = true;
             }
 
diff --git a/Content.Shared/Construction/Conditions/TileNotBlocked.cs b/Content.Shared/Construction/Conditions/TileNotBlocked.cs
index 0f192d04a2..f5257ce21c 100644
--- a/Content.Shared/Construction/Conditions/TileNotBlocked.cs
+++ b/Content.Shared/Construction/Conditions/TileNotBlocked.cs
@@ -16,28 +16,25 @@ public sealed partial class TileNotBlocked : IConstructionCondition
 
     public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
     {
-        var tileRef = location.GetTileRef();
-        var entManager = IoCManager.Resolve<IEntityManager>();
-        var sysMan = entManager.EntitySysManager;
-        var lookupSys = sysMan.GetEntitySystem<EntityLookupSystem>();
-        if (tileRef == null)
+        if (!IoCManager.Resolve<IEntityManager>().TrySystem<TurfSystem>(out var turfSystem))
+            return false;
+
+        if (!turfSystem.TryGetTileRef(location, out var tileRef))
         {
             return false;
         }
 
-        if (tileRef.Value.IsSpace() && _failIfSpace)
+        if (turfSystem.IsSpace(tileRef.Value) && _failIfSpace)
         {
             return false;
         }
 
-        if (!tileRef.Value.GetContentTileDefinition().Sturdy && _failIfNotSturdy)
+        if (!turfSystem.GetContentTileDefinition(tileRef.Value).Sturdy && _failIfNotSturdy)
         {
             return false;
         }
-        // Sunrise-start, Временное решение. У оффов много что поломано с методом IsTileBlocked
-        // return !tileRef.Value.IsBlockedTurf(_filterMobs);
-        return !lookupSys.GetEntitiesIntersecting(location, LookupFlags.Static).Any();
-        // Sunrise-end
+
+        return !turfSystem.IsTileBlocked(tileRef.Value, _filterMobs ? CollisionGroup.MobMask : CollisionGroup.Impassable);
     }
 
     public ConstructionGuideEntry GenerateGuideEntry()
diff --git a/Content.Shared/Construction/Conditions/TileType.cs b/Content.Shared/Construction/Conditions/TileType.cs
index 3ffdf66050..e066e6af2e 100644
--- a/Content.Shared/Construction/Conditions/TileType.cs
+++ b/Content.Shared/Construction/Conditions/TileType.cs
@@ -20,12 +20,13 @@ namespace Content.Shared.Construction.Conditions
 
         public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
         {
-            var tileFound = location.GetTileRef();
-
-            if (tileFound == null)
+            if (!IoCManager.Resolve<IEntityManager>().TrySystem<TurfSystem>(out var turfSystem))
                 return false;
 
-            var tile = tileFound.Value.Tile.GetContentTileDefinition();
+            if (!turfSystem.TryGetTileRef(location, out var tileFound))
+                return false;
+
+            var tile = turfSystem.GetContentTileDefinition(tileFound.Value);
             foreach (var targetTile in TargetTiles)
             {
                 if (tile.ID == targetTile)
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index cd0996a017..e690b93826 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -122,7 +122,7 @@ public sealed partial class AnchorableSystem : EntitySystem
         _adminLogger.Add(
             LogType.Unanchor,
             LogImpact.Low,
-            $"{EntityManager.ToPrettyString(args.User):user} unanchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(used):using}"
+            $"{ToPrettyString(args.User):user} unanchored {ToPrettyString(uid):anchored} using {ToPrettyString(used):using}"
         );
     }
 
@@ -174,7 +174,7 @@ public sealed partial class AnchorableSystem : EntitySystem
         _adminLogger.Add(
             LogType.Anchor,
             LogImpact.Low,
-            $"{EntityManager.ToPrettyString(args.User):user} anchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(used):using}"
+            $"{ToPrettyString(args.User):user} anchored {ToPrettyString(uid):anchored} using {ToPrettyString(used):using}"
         );
     }
 
diff --git a/Content.Shared/Containers/ContainerFillSystem.cs b/Content.Shared/Containers/ContainerFillSystem.cs
index 3d49079ea7..2eff64aaf0 100644
--- a/Content.Shared/Containers/ContainerFillSystem.cs
+++ b/Content.Shared/Containers/ContainerFillSystem.cs
@@ -40,7 +40,7 @@ public sealed class ContainerFillSystem : EntitySystem
                 var ent = Spawn(proto, coords);
                 if (!_containerSystem.Insert(ent, container, containerXform: xform))
                 {
-                    var alreadyContained = container.ContainedEntities.Count > 0 ? string.Join("\n", container.ContainedEntities.Select(e => $"\t - {EntityManager.ToPrettyString(e)}")) : "< empty >";
+                    var alreadyContained = container.ContainedEntities.Count > 0 ? string.Join("\n", container.ContainedEntities.Select(e => $"\t - {ToPrettyString(e)}")) : "< empty >";
                     Log.Error($"Entity {ToPrettyString(uid)} with a {nameof(ContainerFillComponent)} failed to insert an entity: {ToPrettyString(ent)}.\nCurrent contents:\n{alreadyContained}");
                     _transform.AttachToGridOrMap(ent);
                     break;
@@ -74,7 +74,7 @@ public sealed class ContainerFillSystem : EntitySystem
                 var spawn = Spawn(proto, coords);
                 if (!_containerSystem.Insert(spawn, container, containerXform: xform))
                 {
-                    var alreadyContained = container.ContainedEntities.Count > 0 ? string.Join("\n", container.ContainedEntities.Select(e => $"\t - {EntityManager.ToPrettyString(e)}")) : "< empty >";
+                    var alreadyContained = container.ContainedEntities.Count > 0 ? string.Join("\n", container.ContainedEntities.Select(e => $"\t - {ToPrettyString(e)}")) : "< empty >";
                     Log.Error($"Entity {ToPrettyString(ent)} with a {nameof(EntityTableContainerFillComponent)} failed to insert an entity: {ToPrettyString(spawn)}.\nCurrent contents:\n{alreadyContained}");
                     _transform.AttachToGridOrMap(spawn);
                     break;
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index 3b5a880d46..88e6ca44dc 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -102,7 +102,7 @@ namespace Content.Shared.Containers.ItemSlots
             {
                 if (existing.Local)
                     Log.Error(
-                        $"Duplicate item slot key. Entity: {EntityManager.GetComponent<MetaDataComponent>(uid).EntityName} ({uid}), key: {id}");
+                        $"Duplicate item slot key. Entity: {Comp<MetaDataComponent>(uid).EntityName} ({uid}), key: {id}");
                 else
                     // server state takes priority
                     slot.CopyFrom(existing);
@@ -132,7 +132,7 @@ namespace Content.Shared.Containers.ItemSlots
             itemSlots.Slots.Remove(slot.ContainerSlot.ID);
 
             if (itemSlots.Slots.Count == 0)
-                EntityManager.RemoveComponent(uid, itemSlots);
+                RemComp(uid, itemSlots);
             else
                 Dirty(uid, itemSlots);
         }
@@ -206,7 +206,7 @@ namespace Content.Shared.Containers.ItemSlots
             if (args.Handled)
                 return;
 
-            if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands))
+            if (!TryComp(args.User, out HandsComponent? hands))
                 return;
 
             if (itemSlots.Slots.Count == 0)
@@ -255,7 +255,7 @@ namespace Content.Shared.Containers.ItemSlots
             }
 
             // Drop the held item onto the floor. Return if the user cannot drop.
-            if (!_handsSystem.TryDrop(args.User, args.Used, handsComp: hands))
+            if (!_handsSystem.TryDrop(args.User, args.Used))
                 return;
 
             slots.Sort(SortEmpty);
@@ -395,17 +395,17 @@ namespace Content.Shared.Containers.ItemSlots
             if (!Resolve(user, ref hands, false))
                 return false;
 
-            if (hands.ActiveHand?.HeldEntity is not { } held)
+            if (!_handsSystem.TryGetActiveItem((user, hands), out var held))
                 return false;
 
-            if (!CanInsert(uid, held, user, slot))
+            if (!CanInsert(uid, held.Value, user, slot))
                 return false;
 
             // hands.Drop(item) checks CanDrop action blocker
-            if (!_handsSystem.TryDrop(user, hands.ActiveHand))
+            if (!_handsSystem.TryDrop(user, hands.ActiveHandId!))
                 return false;
 
-            Insert(uid, slot, held, user, excludeUserAudio: excludeUserAudio);
+            Insert(uid, slot, held.Value, user, excludeUserAudio: excludeUserAudio);
             return true;
         }
 
@@ -428,16 +428,14 @@ namespace Content.Shared.Containers.ItemSlots
             if (!Resolve(ent, ref ent.Comp, false))
                 return false;
 
-            TryComp(user, out HandsComponent? handsComp);
-
             if (!TryGetAvailableSlot(ent,
                     item,
-                    user == null ? null : (user.Value, handsComp),
+                    user,
                     out var itemSlot,
                     emptyOnly: true))
                 return false;
 
-            if (user != null && !_handsSystem.TryDrop(user.Value, item, handsComp: handsComp))
+            if (user != null && !_handsSystem.TryDrop(user.Value, item))
                 return false;
 
             Insert(ent, itemSlot, item, user, excludeUserAudio: excludeUserAudio);
@@ -466,7 +464,7 @@ namespace Content.Shared.Containers.ItemSlots
                 && Resolve(user, ref user.Comp)
                 && _handsSystem.IsHolding(user, item))
             {
-                if (!_handsSystem.CanDrop(user, item, user.Comp))
+                if (!_handsSystem.CanDrop(user, item))
                     return false;
             }
 
@@ -702,7 +700,7 @@ namespace Content.Shared.Containers.ItemSlots
 
                 var verbSubject = slot.Name != string.Empty
                     ? Loc.GetString(slot.Name)
-                    : EntityManager.GetComponent<MetaDataComponent>(slot.Item.Value).EntityName ?? string.Empty;
+                    : Comp<MetaDataComponent>(slot.Item.Value).EntityName ?? string.Empty;
 
                 AlternativeVerb verb = new()
                 {
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index c3040e3ecc..0a8b3f42f2 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -5,7 +5,7 @@
     <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index 1b484d4da8..2b598a9a04 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Damage;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 066ffc8ab7..190d41c10b 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -16,6 +16,7 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item;
@@ -242,7 +243,7 @@ namespace Content.Shared.Cuffs
 
         private void HandleMoveAttempt(EntityUid uid, CuffableComponent component, UpdateCanMoveEvent args)
         {
-            if (component.CanStillInteract || !EntityManager.TryGetComponent(uid, out PullableComponent? pullable) || !pullable.BeingPulled)
+            if (component.CanStillInteract || !TryComp(uid, out PullableComponent? pullable) || !pullable.BeingPulled)
                 return;
 
             args.Cancel();
@@ -403,6 +404,10 @@ namespace Content.Shared.Cuffs
         /// </summary>
         private void OnHandCountChanged(Entity<CuffableComponent> ent, ref HandCountChangedEvent message)
         {
+            // TODO: either don't store a container ref, or make it actually nullable.
+            if (ent.Comp.Container == default!)
+                return;
+
             var dirty = false;
             var handCount = CompOrNull<HandsComponent>(ent.Owner)?.Count ?? 0;
 
@@ -437,19 +442,19 @@ namespace Content.Shared.Cuffs
                 return;
 
             var freeHands = 0;
-            foreach (var hand in _hands.EnumerateHands(uid, handsComponent))
+            foreach (var hand in _hands.EnumerateHands((uid, handsComponent)))
             {
-                if (hand.HeldEntity == null)
+                if (!_hands.TryGetHeldItem((uid, handsComponent), hand, out var held))
                 {
                     freeHands++;
                     continue;
                 }
 
                 // Is this entity removable? (it might be an existing handcuff blocker)
-                if (HasComp<UnremoveableComponent>(hand.HeldEntity))
+                if (HasComp<UnremoveableComponent>(held))
                     continue;
 
-                _hands.DoDrop(uid, hand, true, handsComponent);
+                _hands.DoDrop(uid, hand, true);
                 freeHands++;
                 if (freeHands == 2)
                     break;
@@ -479,6 +484,9 @@ namespace Content.Shared.Cuffs
             if (TryComp<HandsComponent>(target, out var hands) && hands.Count <= component.CuffedHandCount)
                 return false;
 
+            var ev = new TargetHandcuffedEvent();
+            RaiseLocalEvent(target, ref ev);
+
             // Starlight-Abductor start
             EnsureComp<HandcuffComponent>(handcuff, out var handcuffsComp);
             handcuffsComp.Used = true;
@@ -492,8 +500,8 @@ namespace Content.Shared.Cuffs
             // UpdateHeldItems(target, handcuff, component); // Starlight-Abductor edit
 
             // Sunrise-Start
-            var ev = new CuffedEvent(user, target);
-            RaiseLocalEvent(target, ref ev);
+            var cuffedEvent = new CuffedEvent(user, target);
+            RaiseLocalEvent(target, ref cuffedEvent);
             // Sunrise-End
 
             // Starlight-Abductor start
@@ -847,15 +855,24 @@ namespace Content.Shared.Cuffs
         {
             return component.Container.ContainedEntities;
         }
+    }
 
-        [Serializable, NetSerializable]
-        private sealed partial class UnCuffDoAfterEvent : SimpleDoAfterEvent
-        {
-        }
+    [Serializable, NetSerializable]
+    public sealed partial class UnCuffDoAfterEvent : SimpleDoAfterEvent;
 
-        [Serializable, NetSerializable]
-        private sealed partial class AddCuffDoAfterEvent : SimpleDoAfterEvent
-        {
-        }
+    [Serializable, NetSerializable]
+    public sealed partial class AddCuffDoAfterEvent : SimpleDoAfterEvent;
+
+    /// <summary>
+    /// Raised on the target when they get handcuffed.
+    /// Relayed to their held items.
+    /// </summary>
+    [ByRefEvent]
+    public record struct TargetHandcuffedEvent : IInventoryRelayEvent
+    {
+        /// <summary>
+        /// All slots to relay to
+        /// </summary>
+        public SlotFlags TargetSlots { get; set; }
     }
 }
diff --git a/Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs b/Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs
deleted file mode 100644
index 87adc0cc90..0000000000
--- a/Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared.Damage.Components;
-
-[RegisterComponent]
-public sealed partial class DamageUserOnTriggerComponent : Component
-{
-    [DataField("ignoreResistances")] public bool IgnoreResistances;
-
-    [DataField("damage", required: true)]
-    public DamageSpecifier Damage = default!;
-}
diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index ec086625ea..b343b24403 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -1,5 +1,7 @@
+using System.Numerics;
 using Content.Shared.Alert;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -37,7 +39,7 @@ public sealed partial class StaminaComponent : Component
     public float StaminaDamage;
 
     /// <summary>
-    /// How much stamina damage is required to entire stam crit.
+    /// How much stamina damage is required to enter stam crit.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public float CritThreshold = 100f;
@@ -70,9 +72,99 @@ public sealed partial class StaminaComponent : Component
     [DataField, AutoNetworkedField]
     public float AfterCritDecayMultiplier = 5f;
 
+    /// <summary>
+    /// This is how much stamina damage a mob takes when it forces itself to stand up before modifiers
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ForceStandStamina = 10f;
+
+    /// <summary>
+    /// What sound should play when we successfully stand up
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier ForceStandSuccessSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg");
+
     /// <summary>
     /// Thresholds that determine an entity's slowdown as a function of stamina damage.
     /// </summary>
     [DataField]
     public Dictionary<FixedPoint2, float> StunModifierThresholds = new() { {0, 1f }, { 60, 0.7f }, { 80, 0.5f } };
+
+    #region Animation Data
+
+    /// <summary>
+    /// Threshold at which low stamina animations begin playing. This should be set to a value that means something.
+    /// At 50, it is aligned so when you hit 60 stun the entity will be breathing once per second (well above hyperventilation).
+    /// </summary>
+    [DataField]
+    public float AnimationThreshold = 50;
+
+    /// <summary>
+    /// Minimum y vector displacement for breathing at AnimationThreshold
+    /// </summary>
+    [DataField]
+    public float BreathingAmplitudeMin = 0.04f;
+
+    /// <summary>
+    /// Maximum y vector amount we add to the BreathingAmplitudeMin
+    /// </summary>
+    [DataField]
+    public float BreathingAmplitudeMod = 0.04f;
+
+    /// <summary>
+    /// Minimum vector displacement for jittering at AnimationThreshold
+    /// </summary>
+    [DataField]
+    public float JitterAmplitudeMin;
+
+    /// <summary>
+    /// Maximum vector amount we add to the JitterAmplitudeMin
+    /// </summary>
+    [DataField]
+    public float JitterAmplitudeMod = 0.04f;
+
+    /// <summary>
+    /// Min multipliers for JitterAmplitude in the X and Y directions, animation randomly chooses between these min and max multipliers
+    /// </summary>
+    [DataField]
+    public Vector2 JitterMin = Vector2.Create(0.5f, 0.125f);
+
+    /// <summary>
+    /// Max multipliers for JitterAmplitude in the X and Y directions, animation randomly chooses between these min and max multipliers
+    /// </summary>
+    [DataField]
+    public Vector2 JitterMax = Vector2.Create(1f, 0.25f);
+
+    /// <summary>
+    /// Minimum total animations per second
+    /// </summary>
+    [DataField]
+    public float FrequencyMin = 0.25f;
+
+    /// <summary>
+    /// Maximum amount we add to the Frequency min just before crit
+    /// </summary>
+    [DataField]
+    public float FrequencyMod = 1.75f;
+
+    /// <summary>
+    /// Jitter keyframes per animation
+    /// </summary>
+    [DataField]
+    public int Jitters = 4;
+
+    /// <summary>
+    /// Vector of the last Jitter so we can make sure we don't jitter in the same quadrant twice in a row.
+    /// </summary>
+    [DataField]
+    public Vector2 LastJitter;
+
+    /// <summary>
+    ///     The offset that an entity had before jittering started,
+    ///     so that we can reset it properly.
+    /// </summary>
+    [DataField]
+    public Vector2 StartOffset = Vector2.Zero;
+
+    #endregion
 }
diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs
index 9cdcd95b62..36ee356f35 100644
--- a/Content.Shared/Damage/DamageSpecifier.cs
+++ b/Content.Shared/Damage/DamageSpecifier.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Text.Json.Serialization;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -85,6 +86,11 @@ namespace Content.Shared.Damage
         [JsonIgnore]
         public bool Empty => DamageDict.Count == 0;
 
+        public override string ToString()
+        {
+            return "DamageSpecifier(" + string.Join("; ", DamageDict.Select(x => x.Key + ":" + x.Value)) + ")";
+        }
+
         #region constructors
         /// <summary>
         ///     Constructor that just results in an empty dictionary.
diff --git a/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs b/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs
index 836978dd03..00322f0884 100644
--- a/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs
+++ b/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Damage.Prototypes
 {
@@ -13,7 +12,6 @@ namespace Content.Shared.Damage.Prototypes
     ///     cref="DamageableComponent"/> should support.
     /// </remarks>
     [Prototype]
-    [Serializable, NetSerializable]
     public sealed partial class DamageContainerPrototype : IPrototype
     {
         [ViewVariables]
@@ -23,14 +21,14 @@ namespace Content.Shared.Damage.Prototypes
         /// <summary>
         ///     List of damage groups that are supported by this container.
         /// </summary>
-        [DataField("supportedGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageGroupPrototype>))]
-        public List<string> SupportedGroups = new();
+        [DataField]
+        public List<ProtoId<DamageGroupPrototype>> SupportedGroups = new();
 
         /// <summary>
         ///     Partial List of damage types supported by this container. Note that members of the damage groups listed
         ///     in <see cref="SupportedGroups"/> are also supported, but they are not included in this list.
         /// </summary>
-        [DataField("supportedTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
-        public List<string> SupportedTypes = new();
+        [DataField]
+        public List<ProtoId<DamageTypePrototype>> SupportedTypes = new();
     }
 }
diff --git a/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs b/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
index 6df2138cd4..a33064f934 100644
--- a/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
+++ b/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Damage.Prototypes
 {
@@ -12,7 +11,6 @@ namespace Content.Shared.Damage.Prototypes
     ///     to change/get/set damage in a <see cref="DamageableComponent"/>.
     /// </remarks>
     [Prototype(2)]
-    [Serializable, NetSerializable]
     public sealed partial class DamageGroupPrototype : IPrototype
     {
         [IdDataField] public string ID { get; private set; } = default!;
@@ -23,7 +21,7 @@ namespace Content.Shared.Damage.Prototypes
         [ViewVariables(VVAccess.ReadOnly)]
         public string LocalizedName => Loc.GetString(Name);
 
-        [DataField("damageTypes", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
-        public List<string> DamageTypes { get; private set; } = default!;
+        [DataField(required: true)]
+        public List<ProtoId<DamageTypePrototype>> DamageTypes { get; private set; } = default!;
     }
 }
diff --git a/Content.Shared/Damage/Prototypes/ExaminableDamagePrototype.cs b/Content.Shared/Damage/Prototypes/ExaminableDamagePrototype.cs
deleted file mode 100644
index 4d28412334..0000000000
--- a/Content.Shared/Damage/Prototypes/ExaminableDamagePrototype.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Damage.Prototypes;
-
-/// <summary>
-///     Prototype for examinable damage messages.
-/// </summary>
-[Prototype]
-public sealed partial class ExaminableDamagePrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    ///     List of damage messages IDs sorted by severity.
-    ///     First one describes fully intact entity.
-    ///     Last one describes almost destroyed.
-    /// </summary>
-    [DataField("messages")]
-    public string[] Messages = {};
-}
diff --git a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
index c35e95ecb8..33d7c65a45 100644
--- a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
@@ -30,7 +30,7 @@ public sealed class DamageOnHighSpeedImpactSystem : EntitySystem
         if (!args.OurFixture.Hard || !args.OtherFixture.Hard)
             return;
 
-        if (!EntityManager.HasComponent<DamageableComponent>(uid))
+        if (!HasComp<DamageableComponent>(uid))
             return;
 
         //TODO: This should solve after physics solves
@@ -46,7 +46,7 @@ public sealed class DamageOnHighSpeedImpactSystem : EntitySystem
         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 0f43e93abf..bd3b6979f7 100644
--- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -92,7 +92,7 @@ public sealed class DamageOnInteractSystem : EntitySystem
 
             // 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/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index dd06155b54..13f32c68ff 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -391,7 +391,7 @@ namespace Content.Shared.Damage
 
             // Has the damage actually changed?
             DamageSpecifier newDamage = new() { DamageDict = new(state.DamageDict) };
-            var delta = component.Damage - newDamage;
+            var delta = newDamage - component.Damage;
             delta.TrimZeros();
 
             if (!delta.Empty)
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index b6b487430b..4bf762c479 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -1,14 +1,20 @@
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Events;
 using Content.Shared.Destructible;
+using Content.Shared.Nutrition;
+using Content.Shared.Prototypes;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Slippery;
 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,7 +23,9 @@ public abstract class SharedGodmodeSystem : EntitySystem
 
         SubscribeLocalEvent<GodmodeComponent, BeforeDamageChangedEvent>(OnBeforeDamageChanged);
         SubscribeLocalEvent<GodmodeComponent, BeforeStatusEffectAddedEvent>(OnBeforeStatusEffect);
+        SubscribeLocalEvent<GodmodeComponent, BeforeOldStatusEffectAddedEvent>(OnBeforeOldStatusEffect);
         SubscribeLocalEvent<GodmodeComponent, BeforeStaminaDamageEvent>(OnBeforeStaminaDamage);
+        SubscribeLocalEvent<GodmodeComponent, IngestibleEvent>(BeforeEdible);
         SubscribeLocalEvent<GodmodeComponent, SlipAttemptEvent>(OnSlipAttempt);
         SubscribeLocalEvent<GodmodeComponent, DestructionAttemptEvent>(OnDestruction);
     }
@@ -34,6 +42,13 @@ public abstract class SharedGodmodeSystem : EntitySystem
 
     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;
     }
 
@@ -47,6 +62,11 @@ public abstract class SharedGodmodeSystem : EntitySystem
         args.Cancel();
     }
 
+    private void BeforeEdible(Entity<GodmodeComponent> ent, ref IngestibleEvent args)
+    {
+        args.Cancelled = true;
+    }
+
     public virtual void EnableGodmode(EntityUid uid, GodmodeComponent? godmode = null)
     {
         godmode ??= EnsureComp<GodmodeComponent>(uid);
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index 0da09d0f6d..b2d22391eb 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -8,9 +8,12 @@ using Content.Shared.Damage.Events;
 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.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;
@@ -20,26 +23,32 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Damage.Systems;
 
 public abstract partial class SharedStaminaSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
+    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 SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+    [Dependency] protected readonly SharedStunSystem StunSystem = default!;
 
     /// <summary>
     /// How much of a buffer is there between the stun duration and when stuns can be re-applied.
     /// </summary>
-    private static readonly TimeSpan StamCritBufferTime = TimeSpan.FromSeconds(3f);
+    protected static readonly TimeSpan StamCritBufferTime = TimeSpan.FromSeconds(3f);
 
     public float UniversalStaminaDamageModifier { get; private set; } = 1f;
 
@@ -66,31 +75,31 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         Subs.CVar(_config, CCVars.PlaytestStaminaDamageModifier, value => UniversalStaminaDamageModifier = value, true);
     }
 
-    private void OnStamHandleState(EntityUid uid, StaminaComponent component, ref AfterAutoHandleStateEvent args)
+    protected virtual void OnStamHandleState(Entity<StaminaComponent> entity, ref AfterAutoHandleStateEvent args)
     {
-        if (component.Critical)
-            EnterStamCrit(uid, component);
+        if (entity.Comp.Critical)
+            EnterStamCrit(entity);
         else
         {
-            if (component.StaminaDamage > 0f)
-                EnsureComp<ActiveStaminaComponent>(uid);
+            if (entity.Comp.StaminaDamage > 0f)
+                EnsureComp<ActiveStaminaComponent>(entity);
 
-            ExitStamCrit(uid, component);
+            ExitStamCrit(entity);
         }
     }
 
-    private void OnShutdown(EntityUid uid, StaminaComponent component, ComponentShutdown args)
+    protected virtual void OnShutdown(Entity<StaminaComponent> entity, ref ComponentShutdown args)
     {
-        if (MetaData(uid).EntityLifeStage < EntityLifeStage.Terminating)
+        if (MetaData(entity).EntityLifeStage < EntityLifeStage.Terminating)
         {
-            RemCompDeferred<ActiveStaminaComponent>(uid);
+            RemCompDeferred<ActiveStaminaComponent>(entity);
         }
-        _alerts.ClearAlert(uid, component.StaminaAlert);
+        _alerts.ClearAlert(entity, entity.Comp.StaminaAlert);
     }
 
-    private void OnStartup(EntityUid uid, StaminaComponent component, ComponentStartup args)
+    private void OnStartup(Entity<StaminaComponent> entity, ref ComponentStartup args)
     {
-        SetStaminaAlert(uid, component);
+        UpdateStaminaVisuals(entity);
     }
 
     [PublicAPI]
@@ -99,23 +108,24 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         if (!Resolve(uid, ref component))
             return 0f;
 
-        var curTime = _timing.CurTime;
+        var curTime = Timing.CurTime;
         var pauseTime = _metadata.GetPauseTime(uid);
         return MathF.Max(0f, component.StaminaDamage - MathF.Max(0f, (float) (curTime - (component.NextUpdate + pauseTime)).TotalSeconds * component.Decay));
     }
 
-    private void OnRejuvenate(EntityUid uid, StaminaComponent component, RejuvenateEvent args)
+    private void OnRejuvenate(Entity<StaminaComponent> entity, ref RejuvenateEvent args)
     {
-        if (component.StaminaDamage >= component.CritThreshold)
+        if (entity.Comp.StaminaDamage >= entity.Comp.CritThreshold)
         {
-            ExitStamCrit(uid, component);
+            ExitStamCrit(entity, entity.Comp);
         }
 
-        component.StaminaDamage = 0;
-        AdjustSlowdown(uid);
-        RemComp<ActiveStaminaComponent>(uid);
-        SetStaminaAlert(uid, component);
-        Dirty(uid, component);
+        entity.Comp.StaminaDamage = 0;
+        AdjustStatus(entity.Owner);
+        RemComp<ActiveStaminaComponent>(entity);
+        _status.TryRemoveStatusEffect(entity, StaminaLow);
+        UpdateStaminaVisuals(entity);
+        Dirty(entity);
     }
 
     private void OnDisarmed(EntityUid uid, StaminaComponent component, ref DisarmedEvent args)
@@ -212,6 +222,15 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         TakeStaminaDamage(target, component.Damage, source: uid, sound: component.Sound);
     }
 
+    private void UpdateStaminaVisuals(Entity<StaminaComponent> entity)
+    {
+        SetStaminaAlert(entity, entity.Comp);
+        SetStaminaAnimation(entity);
+    }
+
+    // Here so server can properly tell all clients in PVS range to start the animation
+    protected virtual void SetStaminaAnimation(Entity<StaminaComponent> entity){}
+
     private void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null)
     {
         if (!Resolve(uid, ref component, false) || component.Deleted)
@@ -224,7 +243,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
     /// <summary>
     /// Tries to take stamina damage without raising the entity over the crit threshold.
     /// </summary>
-    public bool TryTakeStamina(EntityUid uid, float value, StaminaComponent? component = null, EntityUid? source = null, EntityUid? with = null)
+    public bool TryTakeStamina(EntityUid uid, float value, StaminaComponent? component = null, EntityUid? source = null, EntityUid? with = null, bool visual = false)
     {
         // Something that has no Stamina component automatically passes stamina checks
         if (!Resolve(uid, ref component, false))
@@ -232,10 +251,10 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
         var oldStam = component.StaminaDamage;
 
-        if (oldStam + value > component.CritThreshold || component.Critical)
+        if (oldStam + value >= component.CritThreshold || component.Critical)
             return false;
 
-        TakeStaminaDamage(uid, value, component, source, with, visual: false);
+        TakeStaminaDamage(uid, value, component, source, with, visual: visual);
         return true;
     }
 
@@ -268,20 +287,21 @@ public abstract partial class SharedStaminaSystem : EntitySystem
         // Reset the decay cooldown upon taking damage.
         if (oldDamage < component.StaminaDamage)
         {
-            var nextUpdate = _timing.CurTime + TimeSpan.FromSeconds(component.Cooldown);
+            var nextUpdate = Timing.CurTime + TimeSpan.FromSeconds(component.Cooldown);
 
             if (component.NextUpdate < nextUpdate)
                 component.NextUpdate = nextUpdate;
         }
 
-        AdjustSlowdown(uid);
+        AdjustStatus(uid);
 
-        SetStaminaAlert(uid, component);
+        UpdateStaminaVisuals((uid, component));
 
         // Checking if the stamina damage has decreased to zero after exiting the stamcrit
         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)
@@ -330,7 +350,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
         var stamQuery = GetEntityQuery<StaminaComponent>();
         var query = EntityQueryEnumerator<ActiveStaminaComponent>();
-        var curTime = _timing.CurTime;
+        var curTime = Timing.CurTime;
 
         while (query.MoveNext(out var uid, out _))
         {
@@ -371,16 +391,14 @@ public abstract partial class SharedStaminaSystem : EntitySystem
             return;
         }
 
-        // To make the difference between a stun and a stamcrit clear
-        // TODO: Mask?
-
         component.Critical = true;
         component.StaminaDamage = component.CritThreshold;
 
-        _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
-        component.NextUpdate = _timing.CurTime + component.StunTime + StamCritBufferTime;
+        component.NextUpdate = Timing.CurTime + component.StunTime + StamCritBufferTime;
         EnsureComp<ActiveStaminaComponent>(uid);
         Dirty(uid, component);
         _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} entered stamina crit");
@@ -396,26 +414,27 @@ public abstract partial class SharedStaminaSystem : EntitySystem
 
         component.Critical = false;
         component.AfterCritical = true;  // Set to true to indicate that stamina will be restored after exiting stamcrit
-        component.NextUpdate = _timing.CurTime;
+        component.NextUpdate = Timing.CurTime;
 
-        SetStaminaAlert(uid, component);
+        UpdateStaminaVisuals((uid, component));
         Dirty(uid, component);
         _adminLogger.Add(LogType.Stamina, LogImpact.Low, $"{ToPrettyString(uid):user} recovered from stamina crit");
     }
 
     /// <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
@@ -427,6 +446,12 @@ public abstract partial class SharedStaminaSystem : EntitySystem
                 closest = thres.Key;
         }
 
-        _stunSystem.UpdateStunModifiers(ent, ent.Comp.StunModifierThresholds[closest]);
+        _movementMod.TryUpdateMovementStatus(ent.Owner, status.Value, ent.Comp.StunModifierThresholds[closest]);
+    }
+
+    [Serializable, NetSerializable]
+    public sealed class StaminaAnimationEvent(NetEntity entity) : EntityEventArgs
+    {
+        public NetEntity Entity = entity;
     }
 }
diff --git a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs
index 6b5f57c595..e339727200 100644
--- a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs
+++ b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs
@@ -30,7 +30,7 @@ namespace Content.Shared.Damage
 
         private void OnRefreshMovespeed(EntityUid uid, SlowOnDamageComponent component, RefreshMovementSpeedModifiersEvent args)
         {
-            if (!EntityManager.TryGetComponent<DamageableComponent>(uid, out var damage))
+            if (!TryComp<DamageableComponent>(uid, out var damage))
                 return;
 
             if (damage.TotalDamage == FixedPoint2.Zero)
diff --git a/Content.Shared/Delivery/SharedDeliverySystem.cs b/Content.Shared/Delivery/SharedDeliverySystem.cs
index 52f83500e1..d7fc40dcc6 100644
--- a/Content.Shared/Delivery/SharedDeliverySystem.cs
+++ b/Content.Shared/Delivery/SharedDeliverySystem.cs
@@ -185,7 +185,7 @@ public abstract class SharedDeliverySystem : EntitySystem
 
         if (!force)
             _popup.PopupPredicted(Loc.GetString("delivery-unlocked-self", ("delivery", deliveryName)),
-                Loc.GetString("delivery-unlocked-others", ("delivery", deliveryName), ("recipient", Identity.Name(user, EntityManager)), ("possadj", user)), user, user);
+                Loc.GetString("delivery-unlocked-others", ("delivery", deliveryName), ("recipient", Identity.Entity(user, EntityManager)), ("possadj", user)), user, user);
 
         return true;
     }
@@ -213,7 +213,7 @@ public abstract class SharedDeliverySystem : EntitySystem
 
         if (!force)
             _popup.PopupPredicted(Loc.GetString("delivery-opened-self", ("delivery", deliveryName)),
-                Loc.GetString("delivery-opened-others", ("delivery", deliveryName), ("recipient", Identity.Name(user, EntityManager)), ("possadj", user)), user, user);
+                Loc.GetString("delivery-opened-others", ("delivery", deliveryName), ("recipient", Identity.Entity(user, EntityManager)), ("possadj", user)), user, user);
 
         if (!_container.TryGetContainer(ent, ent.Comp.Container, out var container))
             return;
diff --git a/Content.Shared/DeviceLinking/DevicePortPrototype.cs b/Content.Shared/DeviceLinking/DevicePortPrototype.cs
index d01f4d6d2a..bf062ddce4 100644
--- a/Content.Shared/DeviceLinking/DevicePortPrototype.cs
+++ b/Content.Shared/DeviceLinking/DevicePortPrototype.cs
@@ -7,7 +7,6 @@ namespace Content.Shared.DeviceLinking;
 /// <summary>
 ///     A prototype for a device port, for use with device linking.
 /// </summary>
-[Serializable, NetSerializable]
 public abstract class DevicePortPrototype
 {
     [IdDataField]
@@ -28,13 +27,11 @@ public abstract class DevicePortPrototype
 }
 
 [Prototype]
-[Serializable, NetSerializable]
 public sealed partial class SinkPortPrototype : DevicePortPrototype, IPrototype
 {
 }
 
 [Prototype]
-[Serializable, NetSerializable]
 public sealed partial class SourcePortPrototype : DevicePortPrototype, IPrototype
 {
     /// <summary>
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index e51087fdf6..5d51bbc3e8 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
@@ -142,6 +143,11 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
         }
     }
 
+    public ProtoId<SourcePortPrototype>[] GetSourcePortIds(Entity<DeviceLinkSourceComponent> source)
+    {
+        return source.Comp.Ports.ToArray();
+    }
+
     /// <summary>
     /// Retrieves the available ports from a source
     /// </summary>
@@ -160,6 +166,11 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
         return sourcePorts;
     }
 
+    public ProtoId<SinkPortPrototype>[] GetSinkPortIds(Entity<DeviceLinkSinkComponent> source)
+    {
+        return source.Comp.Ports.ToArray();
+    }
+
     /// <summary>
     /// Retrieves the available ports from a sink
     /// </summary>
diff --git a/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs b/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs
index 19ccb5e2fe..ac5b6eec18 100644
--- a/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs
+++ b/Content.Shared/DeviceNetwork/DeviceFrequencyPrototype.cs
@@ -7,7 +7,6 @@ namespace Content.Shared.DeviceNetwork;
 ///     A named device network frequency. Useful for ensuring entity prototypes can communicate with each other.
 /// </summary>
 [Prototype]
-[Serializable, NetSerializable]
 public sealed partial class DeviceFrequencyPrototype : IPrototype
 {
     [IdDataField]
diff --git a/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs b/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
index 13000d00c9..4c02124487 100644
--- a/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
+++ b/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
@@ -29,16 +29,16 @@ public sealed class DeviceListUserInterfaceState : BoundUserInterfaceState
 [Serializable, NetSerializable]
 public sealed class DeviceLinkUserInterfaceState : BoundUserInterfaceState
 {
-    public readonly List<SourcePortPrototype> Sources;
-    public readonly List<SinkPortPrototype> Sinks;
+    public readonly ProtoId<SourcePortPrototype>[] Sources;
+    public readonly ProtoId<SinkPortPrototype>[] Sinks;
     public readonly HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> Links;
     public readonly List<(string source, string sink)>? Defaults;
     public readonly string SourceAddress;
     public readonly string SinkAddress;
 
     public DeviceLinkUserInterfaceState(
-        List<SourcePortPrototype> sources,
-        List<SinkPortPrototype> sinks,
+        ProtoId<SourcePortPrototype>[] sources,
+        ProtoId<SinkPortPrototype>[] sinks,
         HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> links,
         string sourceAddress,
         string sinkAddress,
diff --git a/Content.Shared/Devour/Components/DevourerComponent.cs b/Content.Shared/Devour/Components/DevourerComponent.cs
index fbeec28ca5..857e99062c 100644
--- a/Content.Shared/Devour/Components/DevourerComponent.cs
+++ b/Content.Shared/Devour/Components/DevourerComponent.cs
@@ -4,53 +4,79 @@ using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Devour.Components;
 
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedDevourSystem))]
+/// <summary>
+/// Allows an entity to eat whitelisted entities via an action.
+/// Eaten mobs will be stored inside a container and released when the devourer is gibbed.
+/// Eating something that fits their food preference will reward the devourer by being injected with a specific reagent.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(DevourSystem))]
 public sealed partial class DevourerComponent : Component
 {
-    [DataField("devourAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string? DevourAction = "ActionDevour";
+    /// <summary>
+    /// Action prototype for devouring.
+    /// </summary>
+    [DataField]
+    public EntProtoId DevourAction = "ActionDevour";
 
-    [DataField("devourActionEntity")]
+    /// <summary>
+    /// The spawned action entity for devouring.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityUid? DevourActionEntity;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundDevour")]
+    /// <summary>
+    /// The amount of time it takes to devour a mob.
+    /// <remarks>
+    [DataField, AutoNetworkedField]
+    public float DevourTime = 3f;
+
+    /// <summary>
+    /// The amount of time it takes to devour a structure.
+    /// <remarks>
+    /// NOTE: original intended design was to increase this proportionally with damage thresholds, but those proved quite difficult to get consistently. right now it devours the structure at a fixed timer.
+    /// </remarks>
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float StructureDevourTime = 10f;
+
+    /// <summary>
+    /// The sound to play when finishing devouring something.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundDevour = new SoundPathSpecifier("/Audio/Effects/demon_consume.ogg")
     {
         Params = AudioParams.Default.WithVolume(-3f),
     };
 
-    [DataField("devourTime")]
-    public float DevourTime = 3f;
-
     /// <summary>
-    /// The amount of time it takes to devour something
-    /// <remarks>
-    /// NOTE: original intended design was to increase this proportionally with damage thresholds, but those proved quite difficult to get consistently. right now it devours the structure at a fixed timer.
-    /// </remarks>
+    /// The sound to play when starting to devour a structure.
     /// </summary>
-    [DataField("structureDevourTime")]
-    public float StructureDevourTime = 10f;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundStructureDevour")]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundStructureDevour = new SoundPathSpecifier("/Audio/Machines/airlock_creaking.ogg")
     {
         Params = AudioParams.Default.WithVolume(-3f),
     };
 
+    /// <summary>
+    /// The container to store the eaten entities in.
+    /// </summary>
+    [ViewVariables]
+    public static string StomachContainerId = "stomach";
+
     /// <summary>
     /// Where the entities go when it devours them, empties when it is butchered.
     /// </summary>
+    [ViewVariables]
     public Container Stomach = default!;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("shouldStoreDevoured")]
-    public bool ShouldStoreDevoured = true;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("whitelist")]
+    /// <summary>
+    /// Determines what things the devourer can consume.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist = new()
     {
         Components = new[]
@@ -60,21 +86,30 @@ public sealed partial class DevourerComponent : Component
     };
 
     /// <summary>
-    /// The chemical ID injected upon devouring
+    /// Determines what things end up in the dragon's stomach if they eat it.
+    /// If it isn't in the whitelist, it's deleted.
     /// </summary>
-    [DataField("chemical", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-    public string Chemical = "Ichor";
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? StomachStorageWhitelist;
 
     /// <summary>
-    /// The amount of ichor injected per devour
+    /// Determine's the dragon's food preference. If the eaten thing matches,
+    /// it is rewarded with the reward chemical. If null, all food is fine.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("healRate")]
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? FoodPreferenceWhitelist;
+
+    /// <summary>
+    /// The chemical ID injected upon devouring.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> Chemical = "Ichor";
+
+    /// <summary>
+    /// The amount of solution injected per devour.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public float HealRate = 15f;
 
-    /// <summary>
-    /// The favorite food not only feeds you, but also heals
-    /// </summary>
-    [DataField("foodPreference")]
-    public FoodPreference FoodPreference = FoodPreference.All;
 }
 
diff --git a/Content.Shared/Devour/DevourSystem.cs b/Content.Shared/Devour/DevourSystem.cs
new file mode 100644
index 0000000000..71b1bd6396
--- /dev/null
+++ b/Content.Shared/Devour/DevourSystem.cs
@@ -0,0 +1,145 @@
+using Content.Shared.Actions;
+using Content.Shared.Body.Events;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Devour.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Devour;
+
+public sealed class DevourSystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DevourerComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<DevourerComponent, MapInitEvent>(OnInit);
+        SubscribeLocalEvent<DevourerComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<DevourerComponent, DevourActionEvent>(OnDevourAction);
+        SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
+    }
+
+    private void OnStartup(Entity<DevourerComponent> ent, ref ComponentStartup args)
+    {
+        //Devourer doesn't actually chew, since he sends targets right into his stomach.
+        //I did it mom, I added ERP content into upstream. Legally!
+        ent.Comp.Stomach = _containerSystem.EnsureContainer<Container>(ent.Owner, DevourerComponent.StomachContainerId);
+    }
+
+    private void OnInit(Entity<DevourerComponent> ent, ref MapInitEvent args)
+    {
+        _actionsSystem.AddAction(ent.Owner, ref ent.Comp.DevourActionEntity, ent.Comp.DevourAction);
+    }
+
+    private void OnShutdown(Entity<DevourerComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.DevourActionEntity);
+    }
+
+    /// <summary>
+    /// The devour action
+    /// </summary>
+    private void OnDevourAction(Entity<DevourerComponent> ent, ref DevourActionEvent args)
+    {
+        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(ent.Comp.Whitelist, args.Target))
+            return;
+
+        args.Handled = true;
+        var target = args.Target;
+
+        // Structure and mob devours handled differently.
+        if (TryComp(target, out MobStateComponent? targetState))
+        {
+            switch (targetState.CurrentState)
+            {
+                case MobState.Critical:
+                case MobState.Dead:
+
+                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.DevourTime, new DevourDoAfterEvent(), ent.Owner, target: target, used: ent.Owner)
+                    {
+                        BreakOnMove = true,
+                    });
+                    break;
+                case MobState.Invalid:
+                case MobState.Alive:
+                default:
+                    _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-fail-target-alive"), ent.Owner, ent.Owner);
+                    break;
+            }
+
+            return;
+        }
+
+        _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-structure"), ent.Owner, ent.Owner);
+
+        if (ent.Comp.SoundStructureDevour != null)
+            _audioSystem.PlayPredicted(ent.Comp.SoundStructureDevour, ent.Owner, ent.Owner, ent.Comp.SoundStructureDevour.Params);
+
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.StructureDevourTime, new DevourDoAfterEvent(), ent.Owner, target: target, used: ent.Owner)
+        {
+            BreakOnMove = true,
+        });
+    }
+
+    private void OnDoAfter(Entity<DevourerComponent> ent, ref DevourDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled)
+            return;
+
+        var ichorInjection = new Solution(ent.Comp.Chemical, ent.Comp.HealRate);
+
+        // Grant ichor if the devoured thing meets the dragon's food preference
+        if (args.Args.Target != null && _whitelistSystem.IsWhitelistPassOrNull(ent.Comp.FoodPreferenceWhitelist, (EntityUid)args.Args.Target))
+        {
+            _bloodstreamSystem.TryAddToChemicals(ent.Owner, ichorInjection);
+        }
+
+        // If the devoured thing meets the stomach whitelist criteria, add it to the stomach
+        if (args.Args.Target != null && _whitelistSystem.IsWhitelistPass(ent.Comp.StomachStorageWhitelist, (EntityUid)args.Args.Target))
+        {
+            _containerSystem.Insert(args.Args.Target.Value, ent.Comp.Stomach);
+        }
+        //TODO: Figure out a better way of removing structures via devour that still entails standing still and waiting for a DoAfter. Somehow.
+        //If it's not alive, it must be a structure.
+        // Delete if the thing isn't in the stomach storage whitelist (or the stomach whitelist is null/empty)
+        else if (args.Args.Target != null)
+        {
+            PredictedQueueDel(args.Args.Target.Value);
+        }
+
+        _audioSystem.PlayPredicted(ent.Comp.SoundDevour, ent.Owner, ent.Owner);
+    }
+
+    private void OnGibContents(Entity<DevourerComponent> ent, ref BeingGibbedEvent args)
+    {
+        if (ent.Comp.StomachStorageWhitelist == null)
+            return;
+
+        // For some reason we have two different systems that should handle gibbing,
+        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
+        _containerSystem.EmptyContainer(ent.Comp.Stomach);
+    }
+}
+
+public sealed partial class DevourActionEvent : EntityTargetActionEvent;
+
+[Serializable, NetSerializable]
+public sealed partial class DevourDoAfterEvent : SimpleDoAfterEvent;
+
diff --git a/Content.Shared/Devour/SharedDevourSystem.cs b/Content.Shared/Devour/SharedDevourSystem.cs
deleted file mode 100644
index 14047fba7d..0000000000
--- a/Content.Shared/Devour/SharedDevourSystem.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Devour.Components;
-using Content.Shared.DoAfter;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Popups;
-using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Devour;
-
-public abstract class SharedDevourSystem : EntitySystem
-{
-    [Dependency] protected readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-    [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DevourerComponent, MapInitEvent>(OnInit);
-        SubscribeLocalEvent<DevourerComponent, DevourActionEvent>(OnDevourAction);
-    }
-
-    protected void OnInit(EntityUid uid, DevourerComponent component, MapInitEvent args)
-    {
-        //Devourer doesn't actually chew, since he sends targets right into his stomach.
-        //I did it mom, I added ERP content into upstream. Legally!
-        component.Stomach = ContainerSystem.EnsureContainer<Container>(uid, "stomach");
-
-        _actionsSystem.AddAction(uid, ref component.DevourActionEntity, component.DevourAction);
-    }
-
-    /// <summary>
-    /// The devour action
-    /// </summary>
-    protected void OnDevourAction(EntityUid uid, DevourerComponent component, DevourActionEvent args)
-    {
-        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Target))
-            return;
-
-        args.Handled = true;
-        var target = args.Target;
-
-        // Structure and mob devours handled differently.
-        if (TryComp(target, out MobStateComponent? targetState))
-        {
-            switch (targetState.CurrentState)
-            {
-                case MobState.Critical:
-                case MobState.Dead:
-
-                    _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.DevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
-                    {
-                        BreakOnMove = true,
-                    });
-                    break;
-                default:
-                    _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-fail-target-alive"), uid,uid);
-                    break;
-            }
-
-            return;
-        }
-
-        _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-structure"), uid, uid);
-
-        if (component.SoundStructureDevour != null)
-            _audioSystem.PlayPredicted(component.SoundStructureDevour, uid, uid, component.SoundStructureDevour.Params);
-
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.StructureDevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
-        {
-            BreakOnMove = true,
-        });
-    }
-}
-
-public sealed partial class DevourActionEvent : EntityTargetActionEvent { }
-
-[Serializable, NetSerializable]
-public sealed partial class DevourDoAfterEvent : SimpleDoAfterEvent { }
-
-[Serializable, NetSerializable]
-public enum FoodPreference : byte
-{
-    Humanoid = 0,
-    All = 1
-}
diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs
index 6564f720a8..79f89a1d25 100644
--- a/Content.Shared/DisplacementMap/DisplacementData.cs
+++ b/Content.Shared/DisplacementMap/DisplacementData.cs
@@ -1,6 +1,8 @@
+using Robust.Shared.Serialization;
+
 namespace Content.Shared.DisplacementMap;
 
-[DataDefinition]
+[DataDefinition, Serializable, NetSerializable]
 public sealed partial class DisplacementData
 {
     /// <summary>
diff --git a/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs b/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs
index cb7a8c46c8..077649f7a8 100644
--- a/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs
+++ b/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs
@@ -156,7 +156,7 @@ public abstract class SharedMailingUnitSystem : EntitySystem
         if (args.Handled || !args.Complex)
             return;
 
-        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+        if (!TryComp(args.User, out ActorComponent? actor))
         {
             return;
         }
diff --git a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
index 1db24c700d..292cfd2b3c 100644
--- a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Containers;
 using Content.Shared.Database;
@@ -15,10 +14,12 @@ using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
 using Content.Shared.Power;
 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 abstract class SharedDisposalUnitSystem : EntitySystem
         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)
@@ -141,7 +145,7 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
             Category = VerbCategory.Insert,
             Act = () =>
             {
-                _handsSystem.TryDropIntoContainer(args.User, args.Using.Value, component.Container, checkActionBlocker: false, args.Hands);
+                _handsSystem.TryDropIntoContainer((args.User, args.Hands), args.Using.Value, component.Container, checkActionBlocker: false);
                 _adminLog.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} inserted {ToPrettyString(args.Using.Value)} into {ToPrettyString(uid)}");
                 AfterInsert(uid, component, args.Using.Value, args.User);
             }
@@ -446,7 +450,7 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
             return false;
 
         var storable = HasComp<ItemComponent>(entity);
-        if (!storable && !HasComp<BodyComponent>(entity))
+        if (!storable && !HasComp<MobStateComponent>(entity))
             return false;
 
         if (_whitelistSystem.IsBlacklistPass(component.Blacklist, entity) ||
@@ -785,4 +789,23 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
         // 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/DoAfter/DoAfterArgs.cs b/Content.Shared/DoAfter/DoAfterArgs.cs
index 9acbbe7c5d..78e4d4830c 100644
--- a/Content.Shared/DoAfter/DoAfterArgs.cs
+++ b/Content.Shared/DoAfter/DoAfterArgs.cs
@@ -125,7 +125,7 @@ public sealed partial class DoAfterArgs
     ///     Threshold for distance user from the used OR target entities.
     /// </summary>
     [DataField]
-    public float? DistanceThreshold;
+    public float? DistanceThreshold = 1.5f;
 
     /// <summary>
     ///     Whether damage will cancel the DoAfter. See also <see cref="DamageThreshold"/>.
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index f9718be52d..31ff034809 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -192,11 +192,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
                 if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value))
                     return true;
             }
-            else
-            {
-                if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
-                    return true;
-            }
         }
 
         // Whether the distance between the tool and the user has grown too much.
@@ -209,11 +204,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
                         args.DistanceThreshold.Value))
                     return true;
             }
-            else
-            {
-                if (!_interaction.InRangeUnobstructed(args.User,args.Used.Value))
-                    return true;
-            }
         }
 
         if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))
@@ -233,7 +223,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
                     return true;
 
             // If the user changes which hand is active at all, interrupt the do-after
-            if (args.BreakOnHandChange && hands.ActiveHand?.Name != doAfter.InitialHand)
+            if (args.BreakOnHandChange && hands.ActiveHandId != doAfter.InitialHand)
                 return true;
         }
 
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index dfb90782bb..6c2947ef86 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -221,8 +221,8 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
             if (!TryComp(args.User, out HandsComponent? handsComponent))
                 return false;
 
-            doAfter.InitialHand = handsComponent.ActiveHand?.Name;
-            doAfter.InitialItem = handsComponent.ActiveHandEntity;
+            doAfter.InitialHand = handsComponent.ActiveHandId;
+            doAfter.InitialItem = _hands.GetActiveItem((args.User, handsComponent));
         }
 
         doAfter.NetInitialItem = GetNetEntity(doAfter.InitialItem);
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index 56c53962ad..2234c74086 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -322,7 +322,6 @@ public enum DoorVisuals : byte
     BoltLights,
     EmergencyLights,
     ClosedLights,
-    BaseRSI,
 }
 
 public enum DoorVisualLayers : byte
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index dc41ab0366..cf0d54afdf 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -23,39 +23,41 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Doors.Systems;
 
 public abstract partial class SharedDoorSystem : EntitySystem
 {
-    [ValidatePrototypeId<TagPrototype>]
-    public const string DoorBumpTag = "DoorBumpOpener";
-
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+    [Dependency] protected readonly IGameTiming GameTiming = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] protected readonly SharedPhysicsSystem PhysicsSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+    [Dependency] protected readonly TagSystem Tags = default!;
+    [Dependency] protected readonly SharedAudioSystem Audio = default!;
+    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
+    [Dependency] private readonly OccluderSystem _occluder = default!;
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
+    [Dependency] private readonly PryingSystem _pryingSystem = default!;
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
+
+    public static readonly ProtoId<TagPrototype> DoorBumpTag = "DoorBumpOpener";
 
     /// <summary>
     ///     A set of doors that are currently opening, closing, or just queued to open/close after some delay.
     /// </summary>
     private readonly HashSet<Entity<DoorComponent>> _activeDoors = new();
 
-    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-
     private readonly HashSet<Entity<PhysicsComponent>> _doorIntersecting = new();
-    [Dependency] private readonly EmagSystem _emag = default!;
-    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly OccluderSystem _occluder = default!;
-    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
-    [Dependency] private readonly PryingSystem _pryingSystem = default!;
-    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
-    [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
-    [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] protected readonly IGameTiming GameTiming = default!;
-    [Dependency] protected readonly SharedPhysicsSystem PhysicsSystem = default!;
-    [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] protected readonly TagSystem Tags = default!;
 
     public override void Initialize()
     {
@@ -555,7 +557,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
             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/Drowsiness/DrowsinessComponent.cs b/Content.Shared/Drowsiness/DrowsinessStatusEffectComponent.cs
similarity index 56%
rename from Content.Shared/Drowsiness/DrowsinessComponent.cs
rename to Content.Shared/Drowsiness/DrowsinessStatusEffectComponent.cs
index 7e170ed232..e509ed18cc 100644
--- a/Content.Shared/Drowsiness/DrowsinessComponent.cs
+++ b/Content.Shared/Drowsiness/DrowsinessStatusEffectComponent.cs
@@ -1,26 +1,28 @@
 using System.Numerics;
+using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Drowsiness;
 
 /// <summary>
-///     Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+/// Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+/// Use only in conjunction with <see cref="StatusEffectComponent"/>, on the status effect entity.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
-public sealed partial class DrowsinessComponent : Component
+public sealed partial class DrowsinessStatusEffectComponent : Component
 {
     /// <summary>
     /// The random time between sleeping incidents, (min, max).
     /// </summary>
-    [DataField(required: true)]
-    public Vector2 TimeBetweenIncidents = new Vector2(5f, 60f);
+    [DataField]
+    public Vector2 TimeBetweenIncidents = new(5f, 60f);
 
     /// <summary>
     /// The duration of sleeping incidents, (min, max).
     /// </summary>
-    [DataField(required: true)]
-    public Vector2 DurationOfIncident = new Vector2(2, 5);
+    [DataField]
+    public Vector2 DurationOfIncident = new(2, 5);
 
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
diff --git a/Content.Shared/Drowsiness/DrowsinessSystem.cs b/Content.Shared/Drowsiness/DrowsinessSystem.cs
index 97d7c0952d..d1e84f5ff6 100644
--- a/Content.Shared/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Shared/Drowsiness/DrowsinessSystem.cs
@@ -1,9 +1,5 @@
-using Content.Shared.StatusEffect;
-
 namespace Content.Shared.Drowsiness;
 
 public abstract class SharedDrowsinessSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string DrowsinessKey = "Drowsiness";
 }
diff --git a/Content.Shared/Drugs/SeeingRainbowsComponent.cs b/Content.Shared/Drugs/SeeingRainbowsComponent.cs
index 221599c26e..2f22b1dc6a 100644
--- a/Content.Shared/Drugs/SeeingRainbowsComponent.cs
+++ b/Content.Shared/Drugs/SeeingRainbowsComponent.cs
@@ -3,7 +3,8 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Drugs;
 
 /// <summary>
-///     Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+///  Adds a shader to the client that scales with the effect duration.
+///  Use only in conjunction with <see cref="StatusEffectComponent"/>, on the status effect entity.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SeeingRainbowsComponent : Component { }
+public sealed partial class SeeingRainbowsStatusEffectComponent : Component;
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 4f9429b6a6..236ce2dcd3 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -1,13 +1,13 @@
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
 using Content.Shared.Traits.Assorted;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Drunk;
 
 public abstract class SharedDrunkSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string DrunkKey = "Drunk";
+    public static readonly ProtoId<StatusEffectPrototype> DrunkKey = "Drunk";
 
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
     [Dependency] private readonly SharedSlurredSystem _slurredSystem = default!;
diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs
index 7aa4303471..912c4bdaea 100644
--- a/Content.Shared/Emag/Systems/EmagSystem.cs
+++ b/Content.Shared/Emag/Systems/EmagSystem.cs
@@ -51,9 +51,9 @@ public sealed class EmagSystem : EntitySystem
     }
 
     /// <summary>
-    /// Does the emag effect on a specified entity
+    /// Does the emag effect on a specified entity with a specified EmagType. The optional field customEmagType can be used to override the emag type defined in the component.
     /// </summary>
-    public bool TryEmagEffect(Entity<EmagComponent?> ent, EntityUid user, EntityUid target)
+    public bool TryEmagEffect(Entity<EmagComponent?> ent, EntityUid user, EntityUid target, EmagType? customEmagType = null)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return false;
@@ -68,7 +68,9 @@ public sealed class EmagSystem : EntitySystem
             return false;
         }
 
-        var emaggedEvent = new GotEmaggedEvent(user, ent.Comp.EmagType);
+        var typeToUse = customEmagType ?? ent.Comp.EmagType;
+
+        var emaggedEvent = new GotEmaggedEvent(user, typeToUse);
         RaiseLocalEvent(target, ref emaggedEvent);
 
         if (!emaggedEvent.Handled)
@@ -78,7 +80,7 @@ public sealed class EmagSystem : EntitySystem
 
         _audio.PlayPredicted(ent.Comp.EmagSound, ent, ent);
 
-        _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {ent.Comp.EmagType}");
+        _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {typeToUse}");
 
         if (emaggedEvent.Handled)
             _sharedCharges.TryUseCharge(chargesEnt);
@@ -87,7 +89,7 @@ public sealed class EmagSystem : EntitySystem
         {
             EnsureComp<EmaggedComponent>(target, out var emaggedComp);
 
-            emaggedComp.EmagType |= ent.Comp.EmagType;
+            emaggedComp.EmagType |= typeToUse;
             Dirty(target, emaggedComp);
         }
 
@@ -129,9 +131,10 @@ public sealed class EmagSystem : EntitySystem
 
 [Flags]
 [Serializable, NetSerializable]
-public enum EmagType : byte
+public enum EmagType
 {
     None = 0,
+    All = ~None,
     Interaction = 1 << 1,
     Access = 1 << 2
 }
diff --git a/Content.Shared/Emoting/EmoteAttemptEvent.cs b/Content.Shared/Emoting/EmoteAttemptEvent.cs
deleted file mode 100644
index ba8f6f5d4c..0000000000
--- a/Content.Shared/Emoting/EmoteAttemptEvent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-
-namespace Content.Shared.Emoting
-{
-    public sealed class EmoteAttemptEvent : CancellableEntityEventArgs
-    {
-        public EmoteAttemptEvent(EntityUid uid)
-        {
-            Uid = uid;
-        }
-
-        public EntityUid Uid { get; }
-    }
-
-    public sealed class AnimationEmoteAttemptEvent : CancellableEntityEventArgs
-    {
-        public AnimationEmoteAttemptEvent(EntityUid uid, EmotePrototype emote)
-        {
-            Uid = uid;
-            Emote = emote;
-        }
-
-        public EntityUid Uid { get; }
-
-        [ViewVariables, DataField("emote", readOnly: true, required: true)]
-        public EmotePrototype Emote = default!;
-    }
-}
diff --git a/Content.Shared/Emoting/EmoteEvents.cs b/Content.Shared/Emoting/EmoteEvents.cs
new file mode 100644
index 0000000000..ea3073f336
--- /dev/null
+++ b/Content.Shared/Emoting/EmoteEvents.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Emoting;
+
+public sealed class EmoteAttemptEvent(EntityUid uid) : CancellableEntityEventArgs
+{
+    public EntityUid Uid { get; } = uid;
+}
+
+/// <summary>
+/// An event raised just before an emote is performed, providing systems with an opportunity to cancel the emote's performance.
+/// </summary>
+[ByRefEvent]
+public sealed class BeforeEmoteEvent(EntityUid source, EmotePrototype emote)
+    : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public readonly EntityUid Source = source;
+    public readonly EmotePrototype Emote = emote;
+
+    /// <summary>
+    ///     The equipment that is blocking emoting. Should only be non-null if the event was canceled.
+    /// </summary>
+    public EntityUid? Blocker = null;
+
+    public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET;
+}
diff --git a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs
index 6e4478bb6d..deb2afd709 100644
--- a/Content.Shared/Emp/SharedEmpSystem.cs
+++ b/Content.Shared/Emp/SharedEmpSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Examine;
+using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Emp;
@@ -6,5 +8,28 @@ public abstract class SharedEmpSystem : EntitySystem
 {
     [Dependency] protected readonly IGameTiming Timing = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
+    }
+
     protected const string EmpDisabledEffectPrototype = "EffectEmpDisabled";
+
+    /// <summary>
+    /// Triggers an EMP pulse at the given location, by first raising an <see cref="EmpAttemptEvent"/>, then a raising <see cref="EmpPulseEvent"/> on all entities in range.
+    /// </summary>
+    /// <param name="coordinates">The location to trigger the EMP pulse at.</param>
+    /// <param name="range">The range of the EMP pulse.</param>
+    /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
+    /// <param name="duration">The duration of the EMP effects.</param>
+    public virtual void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
+    {
+    }
+
+    private void OnExamine(Entity<EmpDisabledComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine"));
+    }
 }
diff --git a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
index 31294bc21f..cb30ef70c7 100644
--- a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
@@ -19,7 +19,7 @@ public sealed partial class Internals : EntityEffectCondition
         if (!args.EntityManager.TryGetComponent(args.TargetEntity, out InternalsComponent? internalsComp))
             return !UsingInternals; // They have no internals to wear.
 
-        var internalsState = internalsComp.GasTankEntity == null;
+        var internalsState = internalsComp.GasTankEntity != null; // If gas tank is not null, they are wearing internals
         return UsingInternals == internalsState;
     }
 
diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
index a9629401a0..e2febd8f48 100644
--- a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -13,17 +13,14 @@ public sealed partial class SolutionTemperature : EntityEffectCondition
 
     [DataField]
     public float Max = float.PositiveInfinity;
+
     public override bool Condition(EntityEffectBaseArgs args)
     {
         if (args is EntityEffectReagentArgs reagentArgs)
         {
-            if (reagentArgs.Source == null)
-                return false;
-            if (reagentArgs.Source.Temperature < Min)
-                return false;
-            if (reagentArgs.Source.Temperature > Max)
-                return false;
-            return true;
+            return reagentArgs?.Source != null &&
+                   reagentArgs.Source.Temperature >= Min &&
+                   reagentArgs.Source.Temperature <= Max;
         }
 
         // TODO: Someone needs to figure out how to do this for non-reagent effects.
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
index 62b3e037e1..a4baeb634a 100644
--- a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
@@ -18,8 +18,7 @@ public sealed partial class TotalDamage : EntityEffectCondition
         if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
         {
             var total = damage.TotalDamage;
-            if (total > Min && total < Max)
-                return true;
+            return total >= Min && total <= Max;
         }
 
         return false;
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
index b4f1a1af89..cbeb334c47 100644
--- a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
@@ -18,8 +18,7 @@ public sealed partial class Hunger : EntityEffectCondition
         if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
         {
             var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
-            if (total > Min && total < Max)
-                return true;
+            return total >= Min && total <= Max;
         }
 
         return false;
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
new file mode 100644
index 0000000000..45ca740363
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Content.Shared.Xenoarchaeology.Artifact;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+///     Restores durability in active artefact nodes.
+/// </summary>
+public sealed partial class ArtifactDurabilityRestore : EntityEffect
+{
+    /// <summary>
+    ///     Amount of durability that will be restored per effect interaction.
+    /// </summary>
+    [DataField]
+    public int RestoredDurability = 1;
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var entMan = args.EntityManager;
+        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
+
+        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
+            return;
+
+        foreach (var node in xenoArtifactSys.GetActiveNodes((args.TargetEntity, xenoArtifact)))
+        {
+            xenoArtifactSys.AdjustNodeDurability(node.Owner, RestoredDurability);
+        }
+    }
+
+    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return Loc.GetString("reagent-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
index 5cd7f06c52..c238e94010 100644
--- a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
@@ -25,11 +25,11 @@ public sealed partial class FlashReactionEffect : EventEntityEffect<FlashReactio
     public float SlowTo = 0.5f;
 
     /// <summary>
-    ///     The time entities will be flashed in seconds.
+    ///     The time entities will be flashed.
     ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
     /// </summary>
     [DataField]
-    public float Duration = 4f;
+    public TimeSpan Duration = TimeSpan.FromSeconds(4);
 
     /// <summary>
     ///     The prototype ID used for the visual effect.
diff --git a/Content.Shared/EntityEffects/Effects/Paralyze.cs b/Content.Shared/EntityEffects/Effects/Paralyze.cs
index 2da6a6a079..2a2270016b 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 sealed partial class Paralyze : EntityEffect
             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/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
index 8c24589998..ece8c3824e 100644
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
@@ -13,6 +13,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects;
 /// <remarks>
 ///     Can be used for things like adding accents or something. I don't know. Go wild.
 /// </remarks>
+[Obsolete("Use ModifyStatusEffect with StatusEffectNewSystem instead")]
 public sealed partial class GenericStatusEffect : EntityEffect
 {
     [DataField(required: true)]
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
new file mode 100644
index 0000000000..a232d34925
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
@@ -0,0 +1,70 @@
+using Content.Shared.StatusEffectNew;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Changes status effects on entities: Adds, removes or sets time.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class ModifyStatusEffect : EntityEffect
+{
+    [DataField(required: true)]
+    public EntProtoId EffectProto;
+
+    /// <summary>
+    /// Time for which status effect should be applied. Behaviour changes according to <see cref="Refresh" />.
+    /// </summary>
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    /// true - refresh status effect time (update to greater value), false - accumulate status effect time.
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <summary>
+    /// Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
+
+    /// <inheritdoc />
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
+
+        var time = Time;
+        if (args is EntityEffectReagentArgs reagentArgs)
+            time *= reagentArgs.Scale.Float();
+
+        var duration = TimeSpan.FromSeconds(time);
+        switch (Type)
+        {
+            case StatusEffectMetabolismType.Add:
+                if (Refresh)
+                    statusSys.TryUpdateStatusEffectDuration(args.TargetEntity, EffectProto, duration);
+                else
+                    statusSys.TryAddStatusEffectDuration(args.TargetEntity, EffectProto, duration);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                statusSys.TryAddTime(args.TargetEntity, EffectProto, -duration);
+                break;
+            case StatusEffectMetabolismType.Set:
+                statusSys.TrySetStatusEffectDuration(args.TargetEntity, EffectProto, duration);
+                break;
+        }
+    }
+
+    /// <inheritdoc />
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString(
+            "reagent-effect-guidebook-status-effect",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time),
+            ("key", prototype.Index(EffectProto).Name)
+        );
+}
diff --git a/Content.Shared/EntityList/EntityListPrototype.cs b/Content.Shared/EntityList/EntityListPrototype.cs
index 0248e2100c..76646d00f7 100644
--- a/Content.Shared/EntityList/EntityListPrototype.cs
+++ b/Content.Shared/EntityList/EntityListPrototype.cs
@@ -1,6 +1,5 @@
 using System.Collections.Immutable;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.EntityList
 {
@@ -11,14 +10,14 @@ namespace Content.Shared.EntityList
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-        public ImmutableList<string> EntityIds { get; private set; } = ImmutableList<string>.Empty;
+        [DataField]
+        public ImmutableList<EntProtoId> Entities { get; private set; } = ImmutableList<EntProtoId>.Empty;
 
-        public IEnumerable<EntityPrototype> Entities(IPrototypeManager? prototypeManager = null)
+        public IEnumerable<EntityPrototype> GetEntities(IPrototypeManager? prototypeManager = null)
         {
             prototypeManager ??= IoCManager.Resolve<IPrototypeManager>();
 
-            foreach (var entityId in EntityIds)
+            foreach (var entityId in Entities)
             {
                 yield return prototypeManager.Index<EntityPrototype>(entityId);
             }
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 228926fac4..7c063f6ce9 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -111,7 +111,7 @@ namespace Content.Shared.Examine
             if (!examinerComp.CheckInRangeUnOccluded)
                 return true;
 
-            if (EntityManager.GetComponent<TransformComponent>(examiner).MapID != target.MapId)
+            if (Comp<TransformComponent>(examiner).MapID != target.MapId)
                 return false;
 
             // Do target InRangeUnoccluded which has different checks.
diff --git a/Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs b/Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs
deleted file mode 100644
index 6d43abc9d9..0000000000
--- a/Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components;
-
-/// <summary>
-///     Component for tracking active trigger timers. A timers can activated by some other component, e.g. <see cref="OnUseTimerTriggerComponent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ActiveTimerTriggerComponent : Component
-{
-    [DataField] public float TimeRemaining;
-
-    [DataField] public EntityUid? User;
-
-    [DataField] public float BeepInterval;
-
-    [DataField] public float TimeUntilBeep;
-
-    [DataField] public SoundSpecifier? BeepSound;
-}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs b/Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs
deleted file mode 100644
index e14cd12464..0000000000
--- a/Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components.OnTrigger;
-
-/// <summary>
-/// Explode using the entity's <see cref="ExplosiveComponent"/> if Triggered.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ExplodeOnTriggerComponent : Component
-{
-}
diff --git a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
deleted file mode 100644
index 983b8a31ee..0000000000
--- a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System.Linq;
-using Content.Shared.Guidebook;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class OnUseTimerTriggerComponent : Component
-    {
-        [DataField] public float Delay = 1f;
-
-        /// <summary>
-        ///     If not null, a user can use verbs to configure the delay to one of these options.
-        /// </summary>
-        [DataField] public List<float>? DelayOptions = null;
-
-        /// <summary>
-        ///     If not null, this timer will periodically play this sound while active.
-        /// </summary>
-        [DataField] public SoundSpecifier? BeepSound;
-
-        /// <summary>
-        ///     Time before beeping starts. Defaults to a single beep interval. If set to zero, will emit a beep immediately after use.
-        /// </summary>
-        [DataField] public float? InitialBeepDelay;
-
-        [DataField] public float BeepInterval = 1;
-
-        /// <summary>
-        ///     Whether the timer should instead be activated through a verb in the right-click menu
-        /// </summary>
-        [DataField] public bool UseVerbInstead = false;
-
-        /// <summary>
-        ///     Should timer be started when it was stuck to another entity.
-        ///     Used for C4 charges and similar behaviour.
-        /// </summary>
-        [DataField] public bool StartOnStick;
-
-        /// <summary>
-        ///     Allows changing the start-on-stick quality.
-        /// </summary>
-        [DataField("canToggleStartOnStick")] public bool AllowToggleStartOnStick;
-
-        /// <summary>
-        ///     Whether you can examine the item to see its timer or not.
-        /// </summary>
-        [DataField] public bool Examinable = true;
-
-        /// <summary>
-        ///     Whether or not to show the user a popup when starting the timer.
-        /// </summary>
-        [DataField] public bool DoPopup = true;
-
-        #region GuidebookData
-
-        [GuidebookData]
-        public float? ShortestDelayOption => DelayOptions?.Min();
-
-        [GuidebookData]
-        public float? LongestDelayOption => DelayOptions?.Max();
-
-        #endregion GuidebookData
-    }
-}
diff --git a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
index 059ad189d1..1cab5d1a77 100644
--- a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
+++ b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
@@ -112,4 +112,10 @@ public sealed partial class ScatteringGrenadeComponent : Component
     /// We need to store this because we are only allowed to spawn and trigger timed entities on the next available frame update
     /// </summary>
     public bool IsTriggered = false;
+
+    /// <summary>
+    /// The trigger key that will activate the grenade.
+    /// </summary>
+    [DataField]
+    public string TriggerKey = "timer";
 }
diff --git a/Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs b/Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs
deleted file mode 100644
index 02d1156104..0000000000
--- a/Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components;
-
-[NetworkedComponent]
-public abstract partial class SharedTriggerOnProximityComponent : Component
-{
-
-}
diff --git a/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs
deleted file mode 100644
index 5027b04517..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract partial class SharedReleaseGasOnTriggerSystem : EntitySystem;
-
-// I have dreams of Atmos in shared.
diff --git a/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs
deleted file mode 100644
index 386024fbeb..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedRepulseAttractOnTriggerSystem : EntitySystem;
diff --git a/Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs
deleted file mode 100644
index b206dfa696..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedSmokeOnTriggerSystem : EntitySystem
-{
-}
diff --git a/Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs
deleted file mode 100644
index cc5b3f6b74..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedTriggerSystem : EntitySystem
-{
-	
-}
\ No newline at end of file
diff --git a/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs b/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
index ff5fd83e8a..91acbabfeb 100644
--- a/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Camera;
 using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
@@ -21,6 +22,8 @@ public sealed class BlindableSystem : EntitySystem
         base.Initialize();
         SubscribeLocalEvent<BlindableComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<BlindableComponent, EyeDamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<BlindableComponent, GetEyePvsScaleAttemptEvent>(OnGetEyePvsScaleAttemptEvent);
+        SubscribeLocalEvent<BlindableComponent, GetEyeOffsetAttemptEvent>(OnGetEyeOffsetAttemptEvent);
     }
 
     private void OnRejuvenate(Entity<BlindableComponent> ent, ref RejuvenateEvent args)
@@ -34,6 +37,18 @@ public sealed class BlindableSystem : EntitySystem
         _eyelids.UpdateEyesClosable((ent.Owner, ent.Comp));
     }
 
+    private void OnGetEyePvsScaleAttemptEvent(Entity<BlindableComponent> ent, ref GetEyePvsScaleAttemptEvent args)
+    {
+        if (ent.Comp.IsBlind)
+            args.Cancelled = true;
+    }
+
+    private void OnGetEyeOffsetAttemptEvent(Entity<BlindableComponent> ent, ref GetEyeOffsetAttemptEvent args)
+    {
+        if (ent.Comp.IsBlind)
+            args.Cancelled = true;
+    }
+
     [PublicAPI]
     public void UpdateIsBlind(Entity<BlindableComponent?> blindable)
     {
diff --git a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
index 1b62c45af4..68ccf4a6b8 100644
--- a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs
@@ -15,7 +15,6 @@ public sealed class EyeClosingSystem : EntitySystem
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
 
     public override void Initialize()
     {
@@ -120,7 +119,7 @@ public sealed class EyeClosingSystem : EntitySystem
         var ev = new GetBlurEvent(blindable.Comp.EyeDamage);
         RaiseLocalEvent(blindable.Owner, ev);
 
-        if (_entityManager.TryGetComponent<EyeClosingComponent>(blindable, out var eyelids) && !eyelids.NaturallyCreated)
+        if (EntityManager.TryGetComponent<EyeClosingComponent>(blindable, out var eyelids) && !eyelids.NaturallyCreated)
             return;
 
         if (ev.Blur < BlurryVisionComponent.MaxMagnitude || ev.Blur >= blindable.Comp.MaxDamage)
@@ -135,6 +134,4 @@ public sealed class EyeClosingSystem : EntitySystem
     }
 }
 
-public sealed partial class ToggleEyesActionEvent : InstantActionEvent
-{
-}
+public sealed partial class ToggleEyesActionEvent : InstantActionEvent;
diff --git a/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs b/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs
index aa3ff9fdc3..34680b12ef 100644
--- a/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs
@@ -1,12 +1,12 @@
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Eye.Blinding.Systems;
 
 public sealed class TemporaryBlindnessSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string BlindingStatusEffect = "TemporaryBlindness";
+    public static readonly ProtoId<StatusEffectPrototype> BlindingStatusEffect = "TemporaryBlindness";
 
     [Dependency] private readonly BlindableSystem _blindableSystem = default!;
 
diff --git a/Content.Shared/Eye/VisibilityFlags.cs b/Content.Shared/Eye/VisibilityFlags.cs
index 3c4373ecd9..9dc3cec592 100644
--- a/Content.Shared/Eye/VisibilityFlags.cs
+++ b/Content.Shared/Eye/VisibilityFlags.cs
@@ -6,10 +6,11 @@ namespace Content.Shared.Eye
     [FlagsFor(typeof(VisibilityMaskLayer))]
     public enum VisibilityFlags : int
     {
-        None   = 0,
+        None = 0,
         Normal = 1 << 0,
-        Ghost  = 1 << 1,
-        Subfloor = 1 << 2,
+        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.
         Abductor  = 1 << 2, // Starlight-abductor
+        Admin = 1 << 3, // Reserved for admins in stealth mode and admin tools.
     }
 }
diff --git a/Content.Shared/Flash/Components/ActiveFlashComponent.cs b/Content.Shared/Flash/Components/ActiveFlashComponent.cs
new file mode 100644
index 0000000000..18994f103e
--- /dev/null
+++ b/Content.Shared/Flash/Components/ActiveFlashComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+/// Marks an entity with the <see cref="FlashComponent"/> as currently flashing.
+/// Only used for an Update loop for resetting the visuals.
+/// </summary>
+/// <remarks>
+/// TODO: Replace this with something like sprite flick once that exists to get rid of the update loop.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(SharedFlashSystem))]
+public sealed partial class ActiveFlashComponent : Component
+{
+    /// <summary>
+    /// Time at which this flash will be considered no longer active.
+    /// At this time this component will be removed.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan ActiveUntil = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Flash/Components/DamagedByFlashingComponent.cs b/Content.Shared/Flash/Components/DamagedByFlashingComponent.cs
new file mode 100644
index 0000000000..766ee303c5
--- /dev/null
+++ b/Content.Shared/Flash/Components/DamagedByFlashingComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+/// This entity will take damage from flashes.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(DamagedByFlashingSystem))]
+public sealed partial class DamagedByFlashingComponent : Component
+{
+    /// <summary>
+    /// How much damage it will take.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageSpecifier FlashDamage = new();
+}
diff --git a/Content.Shared/Flash/Components/FlashComponent.cs b/Content.Shared/Flash/Components/FlashComponent.cs
index 29f92eb94f..d1a8b882d9 100644
--- a/Content.Shared/Flash/Components/FlashComponent.cs
+++ b/Content.Shared/Flash/Components/FlashComponent.cs
@@ -1,55 +1,79 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 
-namespace Content.Shared.Flash.Components
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+/// Allows this entity to flash someone by using it or melee attacking with it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedFlashSystem))]
+public sealed partial class FlashComponent : Component
 {
-    [RegisterComponent, NetworkedComponent, Access(typeof(SharedFlashSystem))]
-    public sealed partial class FlashComponent : Component
+    /// <summary>
+    /// Flash the area around the entity when used in hand?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool FlashOnUse = true;
+
+    /// <summary>
+    /// Flash the target when melee attacking them?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool FlashOnMelee = true;
+
+    /// <summary>
+    /// Time the Flash will be visually flashing after use.
+    /// For the actual interaction delay use UseDelayComponent.
+    /// These two times should be the same.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan FlashingTime = TimeSpan.FromSeconds(4);
+
+    /// <summary>
+    /// For how long the target will lose vision when melee attacked with the flash.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan MeleeDuration = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// For how long the target will lose vision when used in hand.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan AoeFlashDuration = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// How long a target is stunned when a melee flash is used.
+    /// If null, melee flashes will not stun at all.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan? MeleeStunDuration = TimeSpan.FromSeconds(1.5);
+
+    /// <summary>
+    /// Range of the flash when using it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 7f;
+
+    /// <summary>
+    /// Movement speed multiplier for slowing down the target while they are flashed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SlowTo = 0.5f;
+
+    /// <summary>
+    /// The sound to play when flashing.
+    /// </summary>
+
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg")
     {
+        Params = AudioParams.Default.WithVolume(1f).WithMaxDistance(3f)
+    };
 
-        [DataField("duration")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public int FlashDuration { get; set; } = 5000;
-
-        /// <summary>
-        /// How long a target is stunned when a melee flash is used.
-        /// If null, melee flashes will not stun at all
-        /// </summary>
-        [DataField]
-        public TimeSpan? MeleeStunDuration = TimeSpan.FromSeconds(1.5);
-
-        [DataField("range")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float Range { get; set; } = 7f;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("aoeFlashDuration")]
-        public int AoeFlashDuration { get; set; } = 2000;
-
-        [DataField("slowTo")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float SlowTo { get; set; } = 0.5f;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("sound")]
-        public SoundSpecifier Sound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/flash.ogg")
-        {
-            Params = AudioParams.Default.WithVolume(1f).WithMaxDistance(3f)
-        };
-
-        public bool Flashing;
-
-        [DataField]
-        public float Probability = 1f;
-    }
-
-    [Serializable, NetSerializable]
-    public enum FlashVisuals : byte
-    {
-        BaseLayer,
-        LightLayer,
-        Burnt,
-        Flashing,
-    }
+    /// <summary>
+    /// The probability of sucessfully flashing someone.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Probability = 1f;
 }
diff --git a/Content.Shared/Flash/Components/FlashImmunityComponent.cs b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
new file mode 100644
index 0000000000..149c27c517
--- /dev/null
+++ b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+/// Makes the entity immune to being flashed.
+/// When given to clothes in the "head", "eyes" or "mask" slot it protects the wearer.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedFlashSystem))]
+public sealed partial class FlashImmunityComponent : Component
+{
+    /// <summary>
+    /// Is this component currently enabled?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+}
diff --git a/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs b/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs
deleted file mode 100644
index 7658ca0ae5..0000000000
--- a/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-namespace Content.Shared.Flash.Components;
-
-/// <summary>
-/// Upon being triggered will flash in an area around it.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class FlashOnTriggerComponent : Component
-{
-    [DataField] public float Range = 1.0f;
-    [DataField] public float Duration = 8.0f;
-    [DataField] public float Probability = 1.0f;
-}
diff --git a/Content.Shared/Flash/Components/FlashedComponent.cs b/Content.Shared/Flash/Components/FlashedComponent.cs
index 75bbb12304..e6c623b9ac 100644
--- a/Content.Shared/Flash/Components/FlashedComponent.cs
+++ b/Content.Shared/Flash/Components/FlashedComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Flash.Components;
 
 /// <summary>
-///     Exists for use as a status effect. Adds a shader to the client that obstructs vision.
+/// Exists for use as a status effect. Adds a shader to the client that obstructs vision.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class FlashedComponent : Component { }
+public sealed partial class FlashedComponent : Component;
diff --git a/Content.Server/Flash/DamagedByFlashingSystem.cs b/Content.Shared/Flash/DamagedByFlashingSystem.cs
similarity index 53%
rename from Content.Server/Flash/DamagedByFlashingSystem.cs
rename to Content.Shared/Flash/DamagedByFlashingSystem.cs
index 5b4c19b8e5..103dfb663c 100644
--- a/Content.Server/Flash/DamagedByFlashingSystem.cs
+++ b/Content.Shared/Flash/DamagedByFlashingSystem.cs
@@ -1,7 +1,8 @@
-using Content.Server.Flash.Components;
+using Content.Shared.Flash.Components;
 using Content.Shared.Damage;
 
-namespace Content.Server.Flash;
+namespace Content.Shared.Flash;
+
 public sealed class DamagedByFlashingSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
@@ -12,11 +13,14 @@ public sealed class DamagedByFlashingSystem : EntitySystem
 
         SubscribeLocalEvent<DamagedByFlashingComponent, FlashAttemptEvent>(OnFlashAttempt);
     }
+
+    // TODO: Attempt events should not be doing state changes. But using AfterFlashedEvent does not work because this entity cannot get the status effect.
+    // Best wait for Ed's status effect system rewrite.
     private void OnFlashAttempt(Entity<DamagedByFlashingComponent> ent, ref FlashAttemptEvent args)
     {
         _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage);
 
-        //TODO: It would be more logical if different flashes had different power,
-        //and the damage would be inflicted depending on the strength of the flash.
+        // TODO: It would be more logical if different flashes had different power,
+        // and the damage would be inflicted depending on the strength of the flash.
     }
 }
diff --git a/Content.Shared/Flash/FlashEvents.cs b/Content.Shared/Flash/FlashEvents.cs
new file mode 100644
index 0000000000..1c18ca1676
--- /dev/null
+++ b/Content.Shared/Flash/FlashEvents.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Inventory;
+
+namespace Content.Shared.Flash;
+
+/// <summary>
+/// Called before a flash is used to check if the attempt is cancelled by blindness, items or FlashImmunityComponent.
+/// Raised on the target hit by the flash and their inventory items.
+/// </summary>
+[ByRefEvent]
+public record struct FlashAttemptEvent(EntityUid Target, EntityUid? User, EntityUid? Used, bool Cancelled = false) : IInventoryRelayEvent
+{
+    SlotFlags IInventoryRelayEvent.TargetSlots => SlotFlags.HEAD | SlotFlags.EYES | SlotFlags.MASK;
+}
+
+/// <summary>
+/// Called when a player is successfully flashed.
+/// Raised on the target hit by the flash, the user of the flash and the flash used.
+/// The Melee parameter is used to check for rev conversion.
+/// </summary>
+[ByRefEvent]
+public record struct AfterFlashedEvent(EntityUid Target, EntityUid? User, EntityUid? Used, bool Melee);
diff --git a/Content.Shared/Flash/FlashVisuals.cs b/Content.Shared/Flash/FlashVisuals.cs
new file mode 100644
index 0000000000..f43780ff28
--- /dev/null
+++ b/Content.Shared/Flash/FlashVisuals.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Flash;
+
+[Serializable, NetSerializable]
+public enum FlashVisuals : byte
+{
+    Burnt,
+    Flashing,
+}
+
+[Serializable, NetSerializable]
+public enum FlashVisualLayers : byte
+{
+    BaseLayer,
+    LightLayer,
+}
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index b778809887..dd6c9c91c1 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -1,15 +1,267 @@
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash.Components;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
+using Content.Shared.Light;
+using Content.Shared.Popups;
 using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
+using Content.Shared.Tag;
+using Content.Shared.Timing;
+using Content.Shared.Traits.Assorted;
+using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using System.Linq;
+using Content.Shared.Movement.Systems;
 
 namespace Content.Shared.Flash;
 
 public abstract class SharedFlashSystem : EntitySystem
 {
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedChargesSystem _sharedCharges = default!;
+    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [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!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+
+    private EntityQuery<StatusEffectsComponent> _statusEffectsQuery;
+    private EntityQuery<DamagedByFlashingComponent> _damagedByFlashingQuery;
+    private HashSet<EntityUid> _entSet = new();
+
+    // The tag to add when a flash has no charges left.
+    private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
+    // The key string for the status effect.
     public ProtoId<StatusEffectPrototype> FlashedKey = "Flashed";
 
-    public virtual void FlashArea(Entity<FlashComponent?> source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null)
+    public override void Initialize()
     {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlashComponent, MeleeHitEvent>(OnFlashMeleeHit);
+        SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand);
+        SubscribeLocalEvent<FlashComponent, LightToggleEvent>(OnLightToggle);
+        SubscribeLocalEvent<PermanentBlindnessComponent, FlashAttemptEvent>(OnPermanentBlindnessFlashAttempt);
+        SubscribeLocalEvent<TemporaryBlindnessComponent, FlashAttemptEvent>(OnTemporaryBlindnessFlashAttempt);
+        Subs.SubscribeWithRelay<FlashImmunityComponent, FlashAttemptEvent>(OnFlashImmunityFlashAttempt, held: false);
+        SubscribeLocalEvent<FlashImmunityComponent, ExaminedEvent>(OnExamine);
+
+        _statusEffectsQuery = GetEntityQuery<StatusEffectsComponent>();
+        _damagedByFlashingQuery = GetEntityQuery<DamagedByFlashingComponent>();
+    }
+
+    private void OnFlashMeleeHit(Entity<FlashComponent> ent, ref MeleeHitEvent args)
+    {
+        if (!ent.Comp.FlashOnMelee ||
+            !args.IsHit ||
+            !args.HitEntities.Any() ||
+            !UseFlash(ent, args.User))
+        {
+            return;
+        }
+
+        args.Handled = true;
+        foreach (var target in args.HitEntities)
+        {
+            Flash(target, args.User, ent.Owner, ent.Comp.MeleeDuration, ent.Comp.SlowTo, melee: true, stunDuration: ent.Comp.MeleeStunDuration);
+        }
+    }
+
+    private void OnFlashUseInHand(Entity<FlashComponent> ent, ref UseInHandEvent args)
+    {
+        if (!ent.Comp.FlashOnUse || args.Handled || !UseFlash(ent, args.User))
+            return;
+
+        args.Handled = true;
+        FlashArea(ent.Owner, args.User, ent.Comp.Range, ent.Comp.AoeFlashDuration, ent.Comp.SlowTo, true, ent.Comp.Probability);
+    }
+
+    // needed for the flash lantern and interrogator lamp
+    // TODO: This is awful and all the different components for toggleable lights need to be unified and changed to use Itemtoggle
+    private void OnLightToggle(Entity<FlashComponent> ent, ref LightToggleEvent args)
+    {
+        if (!args.IsOn || !UseFlash(ent, null))
+            return;
+
+        FlashArea(ent.Owner, null, ent.Comp.Range, ent.Comp.AoeFlashDuration, ent.Comp.SlowTo, true, ent.Comp.Probability);
+    }
+
+    /// <summary>
+    /// Use charges and set the visuals.
+    /// </summary>
+    /// <returns>False if no charges are left or the flash is currently in use.</returns>
+    private bool UseFlash(Entity<FlashComponent> ent, EntityUid? user)
+    {
+        if (_useDelay.IsDelayed(ent.Owner))
+            return false;
+
+        if (TryComp<LimitedChargesComponent>(ent.Owner, out var charges)
+            && _sharedCharges.IsEmpty((ent.Owner, charges)))
+            return false;
+
+        _sharedCharges.TryUseCharge((ent.Owner, charges));
+        _audio.PlayPredicted(ent.Comp.Sound, ent.Owner, user);
+
+        var active = EnsureComp<ActiveFlashComponent>(ent.Owner);
+        active.ActiveUntil = _timing.CurTime + ent.Comp.FlashingTime;
+        Dirty(ent.Owner, active);
+        _appearance.SetData(ent.Owner, FlashVisuals.Flashing, true);
+
+        if (_sharedCharges.IsEmpty((ent.Owner, charges)))
+        {
+            _appearance.SetData(ent.Owner, FlashVisuals.Burnt, true);
+            _tag.AddTag(ent.Owner, TrashTag);
+            _popup.PopupClient(Loc.GetString("flash-component-becomes-empty"), user);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Cause an entity to be flashed, obstructing their vision, slowing them down and stunning them.
+    /// In case of a melee attack this will do a check for revolutionary conversion.
+    /// </summary>
+    /// <param name="target">The mob to be flashed.</param>
+    /// <param name="user">The mob causing the flash, if any.</param>
+    /// <param name="used">The item causing the flash, if any.</param>
+    /// <param name="flashDuration">The time target will be affected by the flash.</param>
+    /// <param name="slowTo">Movement speed modifier applied to the flashed target. Between 0 and 1.</param>
+    /// <param name="displayPopup">Whether or not to show a popup to the target player.</param>
+    /// <param name="melee">Was this flash caused by a melee attack? Used for checking for revolutionary conversion.</param>
+    /// <param name="stunDuration">The time the target will be stunned. If null the target will be slowed down instead.</param>
+    public void Flash(
+        EntityUid target,
+        EntityUid? user,
+        EntityUid? used,
+        TimeSpan flashDuration,
+        float slowTo,
+        bool displayPopup = true,
+        bool melee = false,
+        TimeSpan? stunDuration = null)
+    {
+        var attempt = new FlashAttemptEvent(target, user, used);
+        RaiseLocalEvent(target, ref attempt, true);
+
+        if (attempt.Cancelled)
+            return;
+
+        // don't paralyze, slowdown or convert to rev if the target is immune to flashes
+        if (!_statusEffectsSystem.TryAddStatusEffect<FlashedComponent>(target, FlashedKey, flashDuration, true))
+            return;
+
+        if (stunDuration != null)
+            _stun.TryUpdateParalyzeDuration(target, stunDuration.Value);
+        else
+            _movementMod.TryUpdateMovementSpeedModDuration(target, MovementModStatusSystem.FlashSlowdown, flashDuration, slowTo);
+
+        if (displayPopup && user != null && target != user && Exists(user.Value))
+        {
+            _popup.PopupEntity(Loc.GetString("flash-component-user-blinds-you",
+                ("user", Identity.Entity(user.Value, EntityManager))), target, target);
+        }
+
+        var ev = new AfterFlashedEvent(target, user, used, melee);
+        RaiseLocalEvent(target, ref ev);
+
+        if (user != null)
+            RaiseLocalEvent(user.Value, ref ev);
+        if (used != null)
+            RaiseLocalEvent(used.Value, ref ev);
+    }
+
+    /// <summary>
+    /// Cause all entities in range of a source entity to be flashed.
+    /// </summary>
+    /// <param name="source">The source of the flash, which will be at the epicenter.</param>
+    /// <param name="user">The mob causing the flash, if any.</param>
+    /// <param name="flashDuration">The time target will be affected by the flash.</param>
+    /// <param name="slowTo">Movement speed modifier applied to the flashed target. Between 0 and 1.</param>
+    /// <param name="displayPopup">Whether or not to show a popup to the target player.</param>
+    /// <param name="probability">Chance to be flashed. Rolled separately for each target in range.</param>
+    /// <param name="sound">Additional sound to play at the source.</param>
+    public void FlashArea(EntityUid source, EntityUid? user, float range, TimeSpan flashDuration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null)
+    {
+        var transform = Transform(source);
+        var mapPosition = _transform.GetMapCoordinates(transform);
+
+        _entSet.Clear();
+        _entityLookup.GetEntitiesInRange(transform.Coordinates, range, _entSet);
+        foreach (var entity in _entSet)
+        {
+            // TODO: Use RandomPredicted https://github.com/space-wizards/RobustToolbox/pull/5849
+            var rand = new System.Random((int)_timing.CurTick.Value + GetNetEntity(entity).Id);
+            if (!rand.Prob(probability))
+                continue;
+
+            // Is the entity affected by the flash either through status effects or by taking damage?
+            if (!_statusEffectsQuery.HasComponent(entity) && !_damagedByFlashingQuery.HasComponent(entity))
+                continue;
+
+            // Check for entites in view.
+            // Put DamagedByFlashingComponent in the predicate because shadow anomalies block vision.
+            if (!_examine.InRangeUnOccluded(entity, mapPosition, range, predicate: (e) => _damagedByFlashingQuery.HasComponent(e)))
+                continue;
+
+            Flash(entity, user, source, flashDuration, slowTo, displayPopup);
+        }
+
+        _audio.PlayPredicted(sound, source, user, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
+    }
+
+    // Handle the flash visuals
+    // TODO: Replace this with something like sprite flick once that exists to get rid of the update loop.
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveFlashComponent>();
+        while (query.MoveNext(out var uid, out var active))
+        {
+            // reset the visuals and remove the component
+            if (active.ActiveUntil < curTime)
+            {
+                _appearance.SetData(uid, FlashVisuals.Flashing, false);
+                RemCompDeferred<ActiveFlashComponent>(uid);
+            }
+        }
+    }
+
+    private void OnPermanentBlindnessFlashAttempt(Entity<PermanentBlindnessComponent> ent, ref FlashAttemptEvent args)
+    {
+        // check for total blindness
+        if (ent.Comp.Blindness == 0)
+            args.Cancelled = true;
+    }
+
+    private void OnTemporaryBlindnessFlashAttempt(Entity<TemporaryBlindnessComponent> ent, ref FlashAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
+
+    private void OnFlashImmunityFlashAttempt(Entity<FlashImmunityComponent> ent, ref FlashAttemptEvent args)
+    {
+        if (ent.Comp.Enabled)
+            args.Cancelled = true;
+    }
+
+    private void OnExamine(Entity<FlashImmunityComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(Loc.GetString("flash-protection"));
     }
 }
diff --git a/Content.Shared/Fluids/AbsorbentComponent.cs b/Content.Shared/Fluids/AbsorbentComponent.cs
index 535c07c867..6d7cf007e5 100644
--- a/Content.Shared/Fluids/AbsorbentComponent.cs
+++ b/Content.Shared/Fluids/AbsorbentComponent.cs
@@ -2,16 +2,22 @@ using Content.Shared.Audio;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids;
 
 /// <summary>
 /// For entities that can clean up puddles
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class AbsorbentComponent : Component
 {
-    public Dictionary<Color, float> Progress = new();
+    /// <summary>
+    /// Used by the client to display a bar showing the reagents contained when held.
+    /// Has to still be networked in case the item is given to someone who didn't see a mop in PVS.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Dictionary<Color, float> Progress = [];
 
     /// <summary>
     /// Name for solution container, that should be used for absorbed solution storage and as source of absorber solution.
@@ -26,23 +32,23 @@ public sealed partial class AbsorbentComponent : Component
     [DataField]
     public FixedPoint2 PickupAmount = FixedPoint2.New(100);
 
+    /// <summary>
+    /// The effect spawned when the puddle fully evaporates.
+    /// </summary>
     [DataField]
-    public SoundSpecifier PickupSound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg")
-    {
-        Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation),
-    };
+    public EntProtoId MoppedEffect = "PuddleSparkle";
 
-    [DataField] public SoundSpecifier TransferSound =
-        new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg")
-        {
-            Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f),
-        };
+    [DataField]
+    public SoundSpecifier PickupSound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg",
+        AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation));
+
+    [DataField]
+    public SoundSpecifier TransferSound = new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg",
+        AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f));
 
     public static readonly SoundSpecifier DefaultTransferSound =
-        new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg")
-        {
-            Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f),
-        };
+        new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg",
+            AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f));
 
     /// <summary>
     /// Marker that absorbent component owner should try to use 'absorber solution' to replace solution to be absorbed.
diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs
index 305ed00b14..a7d7bbb3ad 100644
--- a/Content.Shared/Fluids/Components/DrainComponent.cs
+++ b/Content.Shared/Fluids/Components/DrainComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids.Components;
 
@@ -17,8 +18,7 @@ public sealed partial class DrainComponent : Component
 {
     public const string SolutionName = "drainBuffer";
 
-    [ValidatePrototypeId<TagPrototype>]
-    public const string PlungerTag = "Plunger";
+    public static readonly ProtoId<TagPrototype> PlungerTag = "Plunger";
 
     [ViewVariables]
     public Entity<SolutionComponent>? Solution = null;
diff --git a/Content.Shared/Fluids/Components/EvaporationComponent.cs b/Content.Shared/Fluids/Components/EvaporationComponent.cs
index 9b46629439..88cea52945 100644
--- a/Content.Shared/Fluids/Components/EvaporationComponent.cs
+++ b/Content.Shared/Fluids/Components/EvaporationComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Fluids.Components;
@@ -7,19 +8,25 @@ namespace Content.Shared.Fluids.Components;
 /// <summary>
 /// Added to puddles that contain water so it may evaporate over time.
 /// </summary>
-[NetworkedComponent]
+[NetworkedComponent, AutoGenerateComponentPause]
 [RegisterComponent, Access(typeof(SharedPuddleSystem))]
 public sealed partial class EvaporationComponent : Component
 {
     /// <summary>
     /// The next time we remove the EvaporationSystem reagent amount from this entity.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("nextTick", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan NextTick = TimeSpan.Zero;
+    [AutoPausedField, DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextTick;
 
     /// <summary>
     /// Evaporation factor. Multiplied by the evaporating speed of the reagent.
     /// </summary>
-    [DataField("evaporationAmount")]
+    [DataField]
     public FixedPoint2 EvaporationAmount = FixedPoint2.New(1);
+
+    /// <summary>
+    /// The effect spawned when the puddle fully evaporates.
+    /// </summary>
+    [DataField]
+    public EntProtoId EvaporationEffect = "PuddleSparkle";
 }
diff --git a/Content.Shared/Fluids/Components/SpillableComponent.cs b/Content.Shared/Fluids/Components/SpillableComponent.cs
index cc57dbf2b6..d320be7dac 100644
--- a/Content.Shared/Fluids/Components/SpillableComponent.cs
+++ b/Content.Shared/Fluids/Components/SpillableComponent.cs
@@ -28,4 +28,12 @@ public sealed partial class SpillableComponent : Component
     /// </summary>
     [DataField]
     public bool SpillWhenThrown = true;
+
+    /// <summary>
+    ///     If true, melee processing will stop if any reagent is transferred.
+    ///     Otherwise, melee processing keeps occuring allowing both reagent
+    ///     transfer and melee damage to happen.
+    /// </summary>
+    [DataField]
+    public bool PreventMelee = true;
 }
diff --git a/Content.Shared/Fluids/SharedAbsorbentSystem.cs b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
index f121238d51..77f40aeee6 100644
--- a/Content.Shared/Fluids/SharedAbsorbentSystem.cs
+++ b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
@@ -1,6 +1,16 @@
-using System.Linq;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
+using System.Numerics;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Item;
+using Content.Shared.Popups;
+using Content.Shared.Timing;
+using Content.Shared.Weapons.Melee;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids;
 
@@ -9,41 +19,338 @@ namespace Content.Shared.Fluids;
 /// </summary>
 public abstract class SharedAbsorbentSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popups = default!;
+    [Dependency] protected readonly SharedPuddleSystem Puddle = default!;
+    [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly SharedItemSystem _item = default!;
+
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<AbsorbentComponent, ComponentGetState>(OnAbsorbentGetState);
-        SubscribeLocalEvent<AbsorbentComponent, ComponentHandleState>(OnAbsorbentHandleState);
+
+        SubscribeLocalEvent<AbsorbentComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<AbsorbentComponent, UserActivateInWorldEvent>(OnActivateInWorld);
+        SubscribeLocalEvent<AbsorbentComponent, SolutionContainerChangedEvent>(OnAbsorbentSolutionChange);
     }
 
-    private void OnAbsorbentHandleState(EntityUid uid, AbsorbentComponent component, ref ComponentHandleState args)
+    private void OnActivateInWorld(Entity<AbsorbentComponent> ent, ref UserActivateInWorldEvent args)
     {
-        if (args.Current is not AbsorbentComponentState state)
+        if (args.Handled)
             return;
 
-        if (component.Progress.OrderBy(x => x.Key.ToArgb()).SequenceEqual(state.Progress))
+        Mop(ent, args.User, args.Target);
+        args.Handled = true;
+    }
+
+    private void OnAfterInteract(Entity<AbsorbentComponent> ent, ref AfterInteractEvent args)
+    {
+        if (!args.CanReach || args.Handled || args.Target is not { } target)
             return;
 
-        component.Progress.Clear();
-        foreach (var item in state.Progress)
-        {
-            component.Progress.Add(item.Key, item.Value);
-        }
+        Mop(ent, args.User, target);
+        args.Handled = true;
     }
 
-    private void OnAbsorbentGetState(EntityUid uid, AbsorbentComponent component, ref ComponentGetState args)
+    private void OnAbsorbentSolutionChange(Entity<AbsorbentComponent> ent, ref SolutionContainerChangedEvent args)
     {
-        args.State = new AbsorbentComponentState(component.Progress);
+        if (!SolutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution))
+            return;
+
+        ent.Comp.Progress.Clear();
+
+        var absorbentReagents = Puddle.GetAbsorbentReagents(solution);
+        var mopReagent = solution.GetTotalPrototypeQuantity(absorbentReagents);
+        if (mopReagent > FixedPoint2.Zero)
+            ent.Comp.Progress[solution.GetColorWithOnly(_proto, absorbentReagents)] = mopReagent.Float();
+
+        var otherColor = solution.GetColorWithout(_proto, absorbentReagents);
+        var other = solution.Volume - mopReagent;
+        if (other > FixedPoint2.Zero)
+            ent.Comp.Progress[otherColor] = other.Float();
+
+        if (solution.AvailableVolume > FixedPoint2.Zero)
+            ent.Comp.Progress[Color.DarkGray] = solution.AvailableVolume.Float();
+
+        Dirty(ent);
+        _item.VisualsChanged(ent);
     }
 
-    [Serializable, NetSerializable]
-    protected sealed class AbsorbentComponentState : ComponentState
+    [Obsolete("Use Entity<T> variant")]
+    public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentComponent component)
     {
-        public Dictionary<Color, float> Progress;
+        Mop((used, component), user, target);
+    }
 
-        public AbsorbentComponentState(Dictionary<Color, float> progress)
+    public void Mop(Entity<AbsorbentComponent> absorbEnt, EntityUid user, EntityUid target)
+    {
+        if (!SolutionContainer.TryGetSolution(absorbEnt.Owner, absorbEnt.Comp.SolutionName, out var absorberSoln))
+            return;
+
+        // Use the non-optional form of IsDelayed to safe the TryComp in Mop
+        if (TryComp<UseDelayComponent>(absorbEnt, out var useDelay)
+            && _useDelay.IsDelayed((absorbEnt.Owner, useDelay)))
+            return;
+
+        // Try to slurp up the puddle.
+        // We're then done if our mop doesn't use absorber solutions, since those don't need refilling.
+        if (TryPuddleInteract((absorbEnt.Owner, absorbEnt.Comp, useDelay), absorberSoln.Value, user, target)
+            || !absorbEnt.Comp.UseAbsorberSolution)
+            return;
+
+        // If it's refillable try to transfer
+        TryRefillableInteract((absorbEnt.Owner, absorbEnt.Comp, useDelay), absorberSoln.Value, user, target);
+    }
+
+    /// <summary>
+    ///     Logic for an absorbing entity interacting with a refillable.
+    /// </summary>
+    private bool TryRefillableInteract(Entity<AbsorbentComponent, UseDelayComponent?> absorbEnt,
+        Entity<SolutionComponent> absorbentSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        if (!TryComp<RefillableSolutionComponent>(target, out var refillable))
+            return false;
+
+        if (!SolutionContainer.TryGetRefillableSolution((target, refillable, null),
+                out var refillableSoln,
+                out var refillableSolution))
+            return false;
+
+        if (refillableSolution.Volume <= 0)
         {
-            Progress = progress;
+            // Target empty - only transfer absorbent contents into refillable
+            if (!TryTransferFromAbsorbentToRefillable(absorbEnt, absorbentSoln, refillableSoln.Value, user, target))
+                return false;
         }
+        else
+        {
+            // Target non-empty - do a two-way transfer
+            if (!TryTwoWayAbsorbentRefillableTransfer(absorbEnt, absorbentSoln, refillableSoln.Value, user, target))
+                return false;
+        }
+
+        var (used, absorber, useDelay) = absorbEnt;
+        _audio.PlayPredicted(absorber.TransferSound, target, user);
+
+        if (useDelay != null)
+            _useDelay.TryResetDelay((used, useDelay));
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Logic for an transferring solution from absorber to an empty refillable.
+    /// </summary>
+    private bool TryTransferFromAbsorbentToRefillable(Entity<AbsorbentComponent> absorbEnt,
+        Entity<SolutionComponent> absorbentSoln,
+        Entity<SolutionComponent> refillableSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        var absorbentSolution = absorbentSoln.Comp.Solution;
+        if (absorbentSolution.Volume <= 0)
+        {
+            _popups.PopupClient(Loc.GetString("mopping-system-target-container-empty", ("target", target)), user, user);
+            return false;
+        }
+
+        var refillableSolution = refillableSoln.Comp.Solution;
+        var transferAmount = absorbEnt.Comp.PickupAmount < refillableSolution.AvailableVolume
+            ? absorbEnt.Comp.PickupAmount
+            : refillableSolution.AvailableVolume;
+
+        if (transferAmount <= 0)
+        {
+            _popups.PopupClient(Loc.GetString("mopping-system-full", ("used", absorbEnt)), absorbEnt, user);
+            return false;
+        }
+
+        // Prioritize transferring non-evaporatives if absorbent has any
+        var contaminants = SolutionContainer.SplitSolutionWithout(absorbentSoln,
+            transferAmount,
+            Puddle.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
+
+        SolutionContainer.TryAddSolution(refillableSoln,
+            contaminants.Volume > 0
+                ? contaminants
+                : SolutionContainer.SplitSolution(absorbentSoln, transferAmount));
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Logic for an transferring contaminants to a non-empty refillable & reabsorbing water if any available.
+    /// </summary>
+    private bool TryTwoWayAbsorbentRefillableTransfer(Entity<AbsorbentComponent> absorbEnt,
+        Entity<SolutionComponent> absorbentSoln,
+        Entity<SolutionComponent> refillableSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        var contaminantsFromAbsorbent = SolutionContainer.SplitSolutionWithout(absorbentSoln,
+            absorbEnt.Comp.PickupAmount,
+            Puddle.GetAbsorbentReagents(absorbentSoln.Comp.Solution));
+
+        var absorbentSolution = absorbentSoln.Comp.Solution;
+        if (contaminantsFromAbsorbent.Volume == FixedPoint2.Zero
+            && absorbentSolution.AvailableVolume == FixedPoint2.Zero)
+        {
+            // Nothing to transfer to refillable and no room to absorb anything extra
+            _popups.PopupClient(Loc.GetString("mopping-system-puddle-space", ("used", absorbEnt)), user, user);
+
+            // We can return cleanly because nothing was split from absorbent solution
+            return false;
+        }
+
+        var waterPulled = absorbEnt.Comp.PickupAmount < absorbentSolution.AvailableVolume
+            ? absorbEnt.Comp.PickupAmount
+            : absorbentSolution.AvailableVolume;
+
+        var refillableSolution = refillableSoln.Comp.Solution;
+        var waterFromRefillable =
+            refillableSolution.SplitSolutionWithOnly(waterPulled,
+                Puddle.GetAbsorbentReagents(refillableSoln.Comp.Solution));
+        SolutionContainer.UpdateChemicals(refillableSoln);
+
+        if (waterFromRefillable.Volume == FixedPoint2.Zero && contaminantsFromAbsorbent.Volume == FixedPoint2.Zero)
+        {
+            // Nothing to transfer in either direction
+            _popups.PopupClient(Loc.GetString("mopping-system-target-container-empty-water", ("target", target)),
+                user,
+                user);
+
+            // We can return cleanly because nothing was split from refillable solution
+            return false;
+        }
+
+        var anyTransferOccurred = false;
+
+        if (waterFromRefillable.Volume > FixedPoint2.Zero)
+        {
+            // transfer water to absorbent
+            SolutionContainer.TryAddSolution(absorbentSoln, waterFromRefillable);
+            anyTransferOccurred = true;
+        }
+
+        if (contaminantsFromAbsorbent.Volume <= 0)
+            return anyTransferOccurred;
+
+        if (refillableSolution.AvailableVolume <= 0)
+        {
+            _popups.PopupClient(Loc.GetString("mopping-system-full", ("used", target)), user, user);
+        }
+        else
+        {
+            // transfer as much contaminants to refillable as will fit
+            var contaminantsForRefillable = contaminantsFromAbsorbent.SplitSolution(refillableSolution.AvailableVolume);
+            SolutionContainer.TryAddSolution(refillableSoln, contaminantsForRefillable);
+            anyTransferOccurred = true;
+        }
+
+        // absorb everything that did not fit in the refillable back by the absorbent
+        SolutionContainer.TryAddSolution(absorbentSoln, contaminantsFromAbsorbent);
+
+        return anyTransferOccurred;
+    }
+
+    /// <summary>
+    ///     Logic for an absorbing entity interacting with a puddle.
+    /// </summary>
+    private bool TryPuddleInteract(Entity<AbsorbentComponent, UseDelayComponent?> absorbEnt,
+        Entity<SolutionComponent> absorberSoln,
+        EntityUid user,
+        EntityUid target)
+    {
+        if (!TryComp<PuddleComponent>(target, out var puddle))
+            return false;
+
+        if (!SolutionContainer.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution)
+            || puddleSolution.Volume <= 0)
+            return false;
+
+        var (_, absorber, useDelay) = absorbEnt;
+
+        Solution puddleSplit;
+        var isRemoved = false;
+        if (absorber.UseAbsorberSolution)
+        {
+            // No reason to mop something that 1) can evaporate, 2) is an absorber, and 3) is being mopped with
+            // something that uses absorbers.
+            var puddleAbsorberVolume =
+                puddleSolution.GetTotalPrototypeQuantity(Puddle.GetAbsorbentReagents(puddleSolution));
+            if (puddleAbsorberVolume == puddleSolution.Volume)
+            {
+                _popups.PopupClient(Loc.GetString("mopping-system-puddle-already-mopped", ("target", target)),
+                    target,
+                    user);
+                return true;
+            }
+
+            // Check if we have any evaporative reagents on our absorber to transfer
+            var absorberSolution = absorberSoln.Comp.Solution;
+            var available = absorberSolution.GetTotalPrototypeQuantity(Puddle.GetAbsorbentReagents(absorberSolution));
+
+            // No material
+            if (available == FixedPoint2.Zero)
+            {
+                _popups.PopupClient(Loc.GetString("mopping-system-no-water", ("used", absorbEnt)), absorbEnt, user);
+                return true;
+            }
+
+            var transferMax = absorber.PickupAmount;
+            var transferAmount = available > transferMax ? transferMax : available;
+
+            puddleSplit =
+                puddleSolution.SplitSolutionWithout(transferAmount, Puddle.GetAbsorbentReagents(puddleSolution));
+            var absorberSplit =
+                absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume,
+                    Puddle.GetAbsorbentReagents(absorberSolution));
+
+            // Do tile reactions first
+            var targetXform = Transform(target);
+            var gridUid = targetXform.GridUid;
+            if (TryComp<MapGridComponent>(gridUid, out var mapGrid))
+            {
+                var tileRef = _mapSystem.GetTileRef(gridUid.Value, mapGrid, targetXform.Coordinates);
+                Puddle.DoTileReactions(tileRef, absorberSplit);
+            }
+            SolutionContainer.AddSolution(puddle.Solution.Value, absorberSplit);
+        }
+        else
+        {
+            // Note: arguably shouldn't this get all solutions?
+            puddleSplit = puddleSolution.SplitSolutionWithout(absorber.PickupAmount, Puddle.GetAbsorbentReagents(puddleSolution));
+            // Despawn if we're done
+            if (puddleSolution.Volume == FixedPoint2.Zero)
+            {
+                // Spawn a *sparkle*
+                PredictedSpawnAttachedTo(absorber.MoppedEffect, Transform(target).Coordinates);
+                PredictedQueueDel(target);
+                isRemoved = true;
+            }
+        }
+
+        SolutionContainer.AddSolution(absorberSoln, puddleSplit);
+
+        _audio.PlayPredicted(absorber.PickupSound, isRemoved ? absorbEnt : target, user);
+
+        if (useDelay != null)
+            _useDelay.TryResetDelay((absorbEnt, useDelay));
+
+        var userXform = Transform(user);
+        var targetPos = _transform.GetWorldPosition(target);
+        var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
+        localPos = userXform.LocalRotation.RotateVec(localPos);
+
+        _melee.DoLunge(user, absorbEnt, Angle.Zero, localPos, null);
+
+        return true;
     }
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index 34ba8ba803..a2f0764ce0 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
@@ -8,6 +9,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -16,9 +18,16 @@ namespace Content.Shared.Fluids;
 public abstract partial class SharedPuddleSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
 
+    private static readonly ProtoId<ReagentPrototype> Blood = "Blood";
+    private static readonly ProtoId<ReagentPrototype> Slime = "Slime";
+    private static readonly ProtoId<ReagentPrototype> CopperBlood = "CopperBlood";
+
+    private static readonly string[] StandoutReagents = [Blood, Slime, CopperBlood];
+
     /// <summary>
     /// The lowest threshold to be considered for puddle sprite states as well as slipperiness of a puddle.
     /// </summary>
@@ -33,12 +42,23 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         SubscribeLocalEvent<DumpableSolutionComponent, CanDropTargetEvent>(OnDumpCanDropTarget);
         SubscribeLocalEvent<DrainableSolutionComponent, CanDropTargetEvent>(OnDrainCanDropTarget);
         SubscribeLocalEvent<RefillableSolutionComponent, CanDropDraggedEvent>(OnRefillableCanDropDragged);
+
+        SubscribeLocalEvent<PuddleComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
         SubscribeLocalEvent<PuddleComponent, GetFootstepSoundEvent>(OnGetFootstepSound);
         SubscribeLocalEvent<PuddleComponent, ExaminedEvent>(HandlePuddleExamined);
+        SubscribeLocalEvent<PuddleComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
 
         InitializeSpillable();
     }
 
+    protected virtual void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
+    {
+        if (args.SolutionId != entity.Comp.SolutionName)
+            return;
+
+        UpdateAppearance((entity, entity.Comp));
+    }
+
     private void OnRefillableCanDrag(Entity<RefillableSolutionComponent> entity, ref CanDragEvent args)
     {
         args.Handled = true;
@@ -110,6 +130,68 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         }
     }
 
+    // Workaround for https://github.com/space-wizards/space-station-14/pull/35314
+    private void OnEntRemoved(Entity<PuddleComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and clear our cached reference
+        if (args.Entity == ent.Comp.Solution?.Owner)
+            ent.Comp.Solution = null;
+    }
+
+    private void UpdateAppearance(Entity<PuddleComponent?, AppearanceComponent?> ent)
+    {
+        var (uid, puddle, appearance) = ent;
+        if (!Resolve(ent, ref puddle, ref appearance))
+            return;
+
+        var volume = FixedPoint2.Zero;
+        var color = Color.White;
+
+        if (_solutionContainerSystem.ResolveSolution(uid,
+                puddle.SolutionName,
+                ref puddle.Solution,
+                out var solution))
+        {
+            volume = solution.Volume / puddle.OverflowVolume;
+
+            // Make blood stand out more
+            // Kinda EH
+            // Could potentially do alpha per-solution but future problem.
+
+            color = solution.GetColorWithout(_prototypeManager, StandoutReagents);
+            color = color.WithAlpha(0.7f);
+
+            foreach (var standout in StandoutReagents)
+            {
+                var quantity = solution.GetTotalPrototypeQuantity(standout);
+                if (quantity <= FixedPoint2.Zero)
+                    continue;
+
+                var interpolateValue = quantity.Float() / solution.Volume.Float();
+                color = Color.InterpolateBetween(color,
+                    _prototypeManager.Index<ReagentPrototype>(standout).SubstanceColor,
+                    interpolateValue);
+            }
+        }
+
+        _appearance.SetData(ent, PuddleVisuals.CurrentVolume, volume.Float(), appearance);
+        _appearance.SetData(ent, PuddleVisuals.SolutionColor, color, appearance);
+    }
+
+    public void DoTileReactions(TileRef tileRef, Solution solution)
+    {
+        for (var i = solution.Contents.Count - 1; i >= 0; i--)
+        {
+            var (reagent, quantity) = solution.Contents[i];
+            var proto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
+            var removed = proto.ReactionTile(tileRef, quantity, EntityManager, reagent.Data);
+            if (removed <= FixedPoint2.Zero)
+                continue;
+
+            solution.RemoveReagent(reagent, removed);
+        }
+    }
+
     #region Spill
     // These methods are in Shared to make it easier to interact with PuddleSystem in Shared code.
     // Note that they always fail when run on the client, not creating a puddle and returning false.
diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs
index a83518dfa3..c690f3d51f 100644
--- a/Content.Shared/Foldable/DeployFoldableSystem.cs
+++ b/Content.Shared/Foldable/DeployFoldableSystem.cs
@@ -59,6 +59,10 @@ public sealed class DeployFoldableSystem : EntitySystem
         if (args.Handled || !args.CanReach)
             return;
 
+        // Don't do anything unless you clicked on the floor.
+        if (args.Target.HasValue)
+            return;
+
         if (!TryComp<FoldableComponent>(ent, out var foldable))
             return;
 
@@ -70,7 +74,7 @@ public sealed class DeployFoldableSystem : EntitySystem
         }
 
         if (!TryComp(args.User, out HandsComponent? hands)
-            || !_hands.TryDrop(args.User, args.Used, targetDropLocation: args.ClickLocation, handsComp: hands))
+            || !_hands.TryDrop((args.User, hands), args.Used, targetDropLocation: args.ClickLocation))
             return;
 
         if (!_foldable.TrySetFolded(ent, foldable, false))
diff --git a/Content.Shared/Follower/Components/FollowerComponent.cs b/Content.Shared/Follower/Components/FollowerComponent.cs
index ede810293f..15d23a7037 100644
--- a/Content.Shared/Follower/Components/FollowerComponent.cs
+++ b/Content.Shared/Follower/Components/FollowerComponent.cs
@@ -4,7 +4,7 @@ namespace Content.Shared.Follower.Components;
 
 [RegisterComponent]
 [Access(typeof(FollowerSystem))]
-[NetworkedComponent, AutoGenerateComponentState(RaiseAfterAutoHandleState = true)]
+[NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class FollowerComponent : Component
 {
     [AutoNetworkedField, DataField("following")]
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index d8e34fb3ee..07639a1790 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -44,7 +44,6 @@ public sealed class FollowerSystem : EntitySystem
         SubscribeLocalEvent<FollowerComponent, MoveInputEvent>(OnFollowerMove);
         SubscribeLocalEvent<FollowerComponent, PullStartedMessage>(OnPullStarted);
         SubscribeLocalEvent<FollowerComponent, EntityTerminatingEvent>(OnFollowerTerminating);
-        SubscribeLocalEvent<FollowerComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
 
         SubscribeLocalEvent<FollowedComponent, ComponentGetStateAttemptEvent>(OnFollowedAttempt);
         SubscribeLocalEvent<FollowerComponent, GotEquippedHandEvent>(OnGotEquippedHand);
@@ -150,11 +149,6 @@ public sealed class FollowerSystem : EntitySystem
         StopFollowingEntity(uid, component.Following, deparent: false);
     }
 
-    private void OnAfterHandleState(Entity<FollowerComponent> entity, ref AfterAutoHandleStateEvent args)
-    {
-        StartFollowingEntity(entity, entity.Comp.Following);
-    }
-
     // Since we parent our observer to the followed entity, we need to detach
     // before they get deleted so that we don't get recursively deleted too.
     private void OnFollowedTerminating(EntityUid uid, FollowedComponent component, ref EntityTerminatingEvent args)
@@ -189,6 +183,9 @@ public sealed class FollowerSystem : EntitySystem
     /// <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/Forensics/Systems/SharedForensicsSystem.cs b/Content.Shared/Forensics/Systems/SharedForensicsSystem.cs
new file mode 100644
index 0000000000..1220b75fff
--- /dev/null
+++ b/Content.Shared/Forensics/Systems/SharedForensicsSystem.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Forensics.Components;
+
+namespace Content.Shared.Forensics.Systems;
+
+public abstract class SharedForensicsSystem : EntitySystem
+{
+    /// <summary>
+    /// Give the entity a new, random DNA string and call an event to notify other systems like the bloodstream that it has been changed.
+    /// Does nothing if it does not have the DnaComponent.
+    /// </summary>
+    public virtual void RandomizeDNA(Entity<DnaComponent?> ent) { }
+
+    /// <summary>
+    /// Give the entity a new, random fingerprint string.
+    /// Does nothing if it does not have the FingerprintComponent.
+    /// </summary>
+    public virtual void RandomizeFingerprint(Entity<FingerprintComponent?> ent) { }
+}
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index c57c0c5cb2..293ee54d1f 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -21,8 +21,7 @@ namespace Content.Shared.GameTicking
         // See ideally these would be pulled from the job definition or something.
         // But this is easier, and at least it isn't hardcoded.
         //TODO: Move these, they really belong in StationJobsSystem or a cvar.
-        [ValidatePrototypeId<JobPrototype>]
-        public const string FallbackOverflowJob = "Passenger";
+        public static readonly ProtoId<JobPrototype> FallbackOverflowJob = "Passenger";
 
         public const string FallbackOverflowJobName = "job-name-passenger";
 
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
index 8c83de0cf2..9eaadbb970 100644
--- a/Content.Shared/Gibbing/Systems/GibbingSystem.cs
+++ b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
@@ -187,7 +187,7 @@ public sealed class GibbingSystem : EntitySystem
         }
 
         if (gibType == GibType.Gib)
-            QueueDel(gibbable);
+            PredictedQueueDel(gibbable.Owner);
         return true;
     }
 
@@ -292,7 +292,7 @@ public sealed class GibbingSystem : EntitySystem
         var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
         RaiseLocalEvent(gibbable, ref gibbedEvent);
         if (deleteTarget)
-            QueueDel(gibbable);
+            PredictedQueueDel(gibbable.Owner);
         return localGibs;
     }
 
diff --git a/Content.Shared/Glue/GlueComponent.cs b/Content.Shared/Glue/GlueComponent.cs
index 4cbbc49737..6f68b3fbca 100644
--- a/Content.Shared/Glue/GlueComponent.cs
+++ b/Content.Shared/Glue/GlueComponent.cs
@@ -2,41 +2,44 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Glue;
 
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedGlueSystem))]
+/// <summary>
+/// This component indicates that an item is glue and can be used as such.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(GlueSystem))]
 public sealed partial class GlueComponent : Component
 {
     /// <summary>
     /// Noise made when glue applied.
     /// </summary>
-    [DataField("squeeze")]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier Squeeze = new SoundPathSpecifier("/Audio/Items/squeezebottle.ogg");
 
     /// <summary>
     /// Solution on the entity that contains the glue.
     /// </summary>
-    [DataField("solution")]
+    [DataField, AutoNetworkedField]
     public string Solution = "drink";
 
     /// <summary>
     /// Reagent that will be used as glue.
     /// </summary>
-    [DataField("reagent", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-    public string Reagent = "SpaceGlue";
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
 
     /// <summary>
     /// Reagent consumption per use.
     /// </summary>
-    [DataField("consumptionUnit"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
 
     /// <summary>
     /// Duration per unit
     /// </summary>
-    [DataField("durationPerUnit"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
 }
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Shared/Glue/GlueSystem.cs
similarity index 76%
rename from Content.Server/Glue/GlueSystem.cs
rename to Content.Shared/Glue/GlueSystem.cs
index d8f8e687d2..9782b48b2d 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Shared/Glue/GlueSystem.cs
@@ -1,7 +1,6 @@
-using Content.Server.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
-using Content.Shared.Glue;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
@@ -13,17 +12,17 @@ using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Glue;
+namespace Content.Shared.Glue;
 
-public sealed class GlueSystem : SharedGlueSystem
+public sealed class GlueSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -62,7 +61,7 @@ public sealed class GlueSystem : SharedGlueSystem
             Act = () => TryGlue(entity, target, user),
             IconEntity = GetNetEntity(entity),
             Text = Loc.GetString("glue-verb-text"),
-            Message = Loc.GetString("glue-verb-message")
+            Message = Loc.GetString("glue-verb-message"),
         };
 
         args.Verbs.Add(verb);
@@ -72,26 +71,29 @@ public sealed class GlueSystem : SharedGlueSystem
     {
         // if item is glued then don't apply glue again so it can be removed for reasonable time
         // If glue is applied to an unremoveable item, the component will disappear after the duration.
-        // This effecitvely means any unremoveable item could be removed with a bottle of glue.
+        // This effectively means any unremoveable item could be removed with a bottle of glue.
         if (HasComp<GluedComponent>(target) || !HasComp<ItemComponent>(target) || HasComp<UnremoveableComponent>(target))
         {
-            _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+            _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
             return false;
         }
 
-        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solutionEntity, out _))
         {
-            var quantity = solution.RemoveReagent(entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
+            var quantity = _solutionContainer.RemoveReagent(solutionEntity.Value, entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
             if (quantity > 0)
             {
-                EnsureComp<GluedComponent>(target).Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                _audio.PlayPredicted(entity.Comp.Squeeze, entity.Owner, actor);
+                _popup.PopupClient(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
                 _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} glued {ToPrettyString(target):subject} with {ToPrettyString(entity.Owner):tool}");
-                _audio.PlayPvs(entity.Comp.Squeeze, entity.Owner);
-                _popup.PopupEntity(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
+                var gluedComp = EnsureComp<GluedComponent>(target);
+                gluedComp.Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                Dirty(target, gluedComp);
                 return true;
             }
         }
-        _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+
+        _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
         return false;
     }
 
@@ -119,9 +121,16 @@ public sealed class GlueSystem : SharedGlueSystem
 
     private void OnHandPickUp(Entity<GluedComponent> entity, ref GotEquippedHandEvent args)
     {
+        // When predicting dropping a glued item prediction will reinsert the item into the hand when rerolling the state to a previous one.
+        // So dropping the item would add UnRemoveableComponent on the client without this guard statement.
+        if (_timing.ApplyingState)
+            return;
+
         var comp = EnsureComp<UnremoveableComponent>(entity);
         comp.DeleteOnDrop = false;
         entity.Comp.Until = _timing.CurTime + entity.Comp.Duration;
+        Dirty(entity.Owner, comp);
+        Dirty(entity);
     }
 
     private void OnRefreshNameModifiers(Entity<GluedComponent> entity, ref RefreshNameModifiersEvent args)
diff --git a/Content.Shared/Glue/GluedComponent.cs b/Content.Shared/Glue/GluedComponent.cs
index 4b46f0aa5b..1ef77c8193 100644
--- a/Content.Shared/Glue/GluedComponent.cs
+++ b/Content.Shared/Glue/GluedComponent.cs
@@ -1,15 +1,26 @@
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Glue;
 
-[RegisterComponent]
-[Access(typeof(SharedGlueSystem))]
+/// <summary>
+/// This component gets attached to an item that has been glued.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(GlueSystem))]
 public sealed partial class GluedComponent : Component
 {
-
-    [DataField("until", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// The TimeSpan this effect expires at.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan Until;
 
-    [DataField("duration", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// The duration this effect will last. Determined by the quantity of the reagent that is applied.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField]
     public TimeSpan Duration;
 }
diff --git a/Content.Shared/Glue/SharedGlueSystem.cs b/Content.Shared/Glue/SharedGlueSystem.cs
deleted file mode 100644
index d8b413a1e1..0000000000
--- a/Content.Shared/Glue/SharedGlueSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Glue;
-
-public abstract class SharedGlueSystem : EntitySystem
-{
-}
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index 7cd5951638..5300e98b07 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.Movement.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
@@ -15,8 +16,7 @@ namespace Content.Shared.Gravity
         [Dependency] protected readonly IGameTiming Timing = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
 
-        [ValidatePrototypeId<AlertPrototype>]
-        public const string WeightlessAlert = "Weightless";
+        public static readonly ProtoId<AlertPrototype> WeightlessAlert = "Weightless";
 
         private EntityQuery<GravityComponent> _gravityQuery;
 
@@ -156,7 +156,7 @@ namespace Content.Shared.Gravity
 
         private void OnGridInit(GridInitializeEvent ev)
         {
-            EntityManager.EnsureComponent<GravityComponent>(ev.EntityUid);
+            EnsureComp<GravityComponent>(ev.EntityUid);
         }
 
         [Serializable, NetSerializable]
diff --git a/Content.Shared/Hands/Components/ExtraHandsEquipmentComponent.cs b/Content.Shared/Hands/Components/ExtraHandsEquipmentComponent.cs
new file mode 100644
index 0000000000..fb3685c386
--- /dev/null
+++ b/Content.Shared/Hands/Components/ExtraHandsEquipmentComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+using Content.Shared.Hands.EntitySystems;
+
+namespace Content.Shared.Hands.Components;
+
+/// <summary>
+/// An entity with this component will give you extra hands when you equip it in your inventory.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(ExtraHandsEquipmentSystem))]
+public sealed partial class ExtraHandsEquipmentComponent : Component
+{
+    /// <summary>
+    /// Dictionary relating a unique hand ID corresponding to a container slot on the attached entity to a struct containing information about the Hand itself.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, Hand> Hands = new();
+}
diff --git a/Content.Shared/Hands/Components/HandHelpers.cs b/Content.Shared/Hands/Components/HandHelpers.cs
deleted file mode 100644
index aecf3a6936..0000000000
--- a/Content.Shared/Hands/Components/HandHelpers.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Linq;
-using Content.Shared.Hands.EntitySystems;
-
-namespace Content.Shared.Hands.Components;
-
-/// <summary>
-///     These helpers exist to make getting basic information out of the hands component more convenient, without
-///     needing to resolve hands system or something like that.
-/// </summary>
-public static class HandHelpers
-{
-    /// <summary>
-    ///     Returns true if any hand is free. This is a LinQ method, not a property, so
-    ///     cache it instead of accessing this multiple times.
-    /// </summary>
-    public static bool IsAnyHandFree(this HandsComponent component) => component.Hands.Values.Any(hand => hand.IsEmpty);
-
-    /// <summary>
-    ///     Get the number of hands that are not currently holding anything. This is a LinQ method, not a property, so
-    ///     cache it instead of accessing this multiple times.
-    /// </summary>
-    public static int CountFreeHands(this HandsComponent component) => component.Hands.Values.Count(hand => hand.IsEmpty);
-
-    /// <summary>
-    ///     Get the number of hands that are not currently holding anything. This is a LinQ method, not a property, so
-    ///     cache it instead of accessing this multiple times.
-    /// </summary>
-    public static int CountFreeableHands(this Entity<HandsComponent> component, SharedHandsSystem system)
-    {
-        return system.CountFreeableHands(component);
-    }
-
-    /// <summary>
-    ///     Get a list of hands that are currently holding nothing. This is a LinQ method, not a property, so cache
-    ///     it instead of accessing this multiple times.
-    /// </summary>
-    public static IEnumerable<Hand> GetFreeHands(this HandsComponent component) => component.Hands.Values.Where(hand => !hand.IsEmpty);
-
-    /// <summary>
-    ///     Get a list of hands that are currently holding nothing. This is a LinQ method, not a property, so cache
-    ///     it instead of accessing this multiple times.
-    /// </summary>
-    public static IEnumerable<string> GetFreeHandNames(this HandsComponent component) => GetFreeHands(component).Select(hand => hand.Name);
-}
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index 1db93c9913..8241feec65 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -1,6 +1,5 @@
 using Content.Shared.DisplacementMap;
 using Content.Shared.Hands.EntitySystems;
-using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
@@ -13,50 +12,50 @@ public sealed partial class HandsComponent : Component
     /// <summary>
     ///     The currently active hand.
     /// </summary>
-    [ViewVariables]
-    public Hand? ActiveHand;
+    [DataField]
+    public string? ActiveHandId;
 
     /// <summary>
-    ///     The item currently held in the active hand.
+    /// Dictionary relating a unique hand ID corresponding to a container slot on the attached entity to a class containing information about the Hand itself.
     /// </summary>
-    [ViewVariables]
-    public EntityUid? ActiveHandEntity => ActiveHand?.HeldEntity;
-
-    [ViewVariables]
+    [DataField]
     public Dictionary<string, Hand> Hands = new();
 
+    /// <summary>
+    /// The number of hands
+    /// </summary>
+    [ViewVariables]
     public int Count => Hands.Count;
 
     /// <summary>
     ///     List of hand-names. These are keys for <see cref="Hands"/>. The order of this list determines the order in which hands are iterated over.
     /// </summary>
+    [DataField]
     public List<string> SortedHands = new();
 
     /// <summary>
     ///     If true, the items in the hands won't be affected by explosions.
     /// </summary>
     [DataField]
-    public bool DisableExplosionRecursion = false;
+    public bool DisableExplosionRecursion;
 
     /// <summary>
     ///     Modifies the speed at which items are thrown.
     /// </summary>
     [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float BaseThrowspeed { get; set; } = 11f;
+    public float BaseThrowspeed = 11f;
 
     /// <summary>
     ///     Distance after which longer throw targets stop increasing throw impulse.
     /// </summary>
-    [DataField("throwRange")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float ThrowRange { get; set; } = 8f;
+    [DataField]
+    public float ThrowRange = 8f;
 
     /// <summary>
     ///     Whether or not to add in-hand sprites for held items. Some entities (e.g., drones) don't want these.
     ///     Used by the client.
     /// </summary>
-    [DataField("showInHands")]
+    [DataField]
     public bool ShowInHands = true;
 
     /// <summary>
@@ -68,14 +67,13 @@ public sealed partial class HandsComponent : Component
     /// <summary>
     ///     The time at which throws will be allowed again.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoPausedField]
+    [DataField, AutoPausedField]
     public TimeSpan NextThrowTime;
 
     /// <summary>
     ///     The minimum time inbetween throws.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(0.5f);
 
     /// <summary>
@@ -122,48 +120,37 @@ public sealed partial class HandsComponent : Component
     public bool CanBeStripped = true;
 }
 
+[DataDefinition]
 [Serializable, NetSerializable]
-public sealed class Hand //TODO: This should definitely be a struct - Jezi
+public partial record struct Hand
 {
-    [ViewVariables]
-    public string Name { get; }
+    [DataField]
+    public HandLocation Location = HandLocation.Right;
 
-    [ViewVariables]
-    public HandLocation Location { get; }
-
-    /// <summary>
-    ///     The container used to hold the contents of this hand. Nullable because the client must get the containers via <see cref="ContainerManagerComponent"/>,
-    ///     which may not be synced with the server when the client hands are created.
-    /// </summary>
-    [ViewVariables, NonSerialized]
-    public ContainerSlot? Container;
-
-    [ViewVariables]
-    public EntityUid? HeldEntity => Container?.ContainedEntity;
-
-    public bool IsEmpty => HeldEntity == null;
-
-    public Hand(string name, HandLocation location, ContainerSlot? container = null)
+    public Hand()
+    {
+
+    }
+
+    public Hand(HandLocation location)
     {
-        Name = name;
         Location = location;
-        Container = container;
     }
 }
 
 [Serializable, NetSerializable]
 public sealed class HandsComponentState : ComponentState
 {
-    public readonly List<Hand> Hands;
-    public readonly List<string> HandNames;
-    public readonly string? ActiveHand;
+    public readonly Dictionary<string, Hand> Hands;
+    public readonly List<string> SortedHands;
+    public readonly string? ActiveHandId;
 
     public HandsComponentState(HandsComponent handComp)
     {
         // cloning lists because of test networking.
-        Hands = new(handComp.Hands.Values);
-        HandNames = new(handComp.SortedHands);
-        ActiveHand = handComp.ActiveHand?.Name;
+        Hands = new(handComp.Hands);
+        SortedHands = new(handComp.SortedHands);
+        ActiveHandId = handComp.ActiveHandId;
     }
 }
 
diff --git a/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs b/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs
new file mode 100644
index 0000000000..4b96f89d81
--- /dev/null
+++ b/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory.Events;
+
+namespace Content.Shared.Hands.EntitySystems;
+
+public sealed class ExtraHandsEquipmentSystem : EntitySystem
+{
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExtraHandsEquipmentComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<ExtraHandsEquipmentComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEquipped(Entity<ExtraHandsEquipmentComponent> ent, ref GotEquippedEvent args)
+    {
+        if (!TryComp<HandsComponent>(args.Equipee, out var handsComp))
+            return;
+
+        foreach (var (handName, hand) in ent.Comp.Hands)
+        {
+            // add the NetEntity id to the container name to prevent multiple items with this component from conflicting
+            var handId = $"{GetNetEntity(ent.Owner).Id}-{handName}";
+            _hands.AddHand((args.Equipee, handsComp), handId, hand.Location);
+        }
+    }
+
+    private void OnUnequipped(Entity<ExtraHandsEquipmentComponent> ent, ref GotUnequippedEvent args)
+    {
+        if (!TryComp<HandsComponent>(args.Equipee, out var handsComp))
+            return;
+
+        foreach (var handName in ent.Comp.Hands.Keys)
+        {
+            // add the NetEntity id to the container name to prevent multiple items with this component from conflicting
+            var handId = $"{GetNetEntity(ent.Owner).Id}-{handName}";
+            _hands.RemoveHand((args.Equipee, handsComp), handId);
+        }
+    }
+}
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.AI.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.AI.cs
index 1eac3a2263..e84b23400b 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.AI.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.AI.cs
@@ -6,17 +6,17 @@ namespace Content.Shared.Hands.EntitySystems;
 // These functions are mostly unused except for some AI operator stuff
 // Nothing stops them from being used in general. If they ever get used elsewhere, then this file probably needs to be renamed.
 
-public abstract partial class SharedHandsSystem : EntitySystem
+public abstract partial class SharedHandsSystem
 {
     public bool TrySelect(EntityUid uid, EntityUid? entity, HandsComponent? handsComp = null)
     {
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        if (!IsHolding(uid, entity, out var hand, handsComp))
+        if (!IsHolding((uid, handsComp), entity, out var hand))
             return false;
 
-        SetActiveHand(uid, hand, handsComp);
+        SetActiveHand((uid, handsComp), hand);
         return true;
     }
 
@@ -26,9 +26,12 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        foreach (var hand in handsComp.Hands.Values)
+        foreach (var hand in handsComp.Hands.Keys)
         {
-            if (TryComp(hand.HeldEntity, out component))
+            if (!TryGetHeldItem((uid, handsComp), hand, out var held))
+                continue;
+
+            if (TryComp(held, out component))
                 return true;
         }
 
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
index 95773697db..c1b44efba4 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
@@ -7,6 +7,7 @@ using Content.Shared.Tag;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Hands.EntitySystems;
 
@@ -28,10 +29,10 @@ public abstract partial class SharedHandsSystem
             return;
         }
 
-        var gotUnequipped = new GotUnequippedHandEvent(uid, args.Entity, hand);
+        var gotUnequipped = new GotUnequippedHandEvent(uid, args.Entity, hand.Value);
         RaiseLocalEvent(args.Entity, gotUnequipped);
 
-        var didUnequip = new DidUnequipHandEvent(uid, args.Entity, hand);
+        var didUnequip = new DidUnequipHandEvent(uid, args.Entity, hand.Value);
         RaiseLocalEvent(uid, didUnequip);
 
         if (TryComp(args.Entity, out VirtualItemComponent? @virtual))
@@ -47,26 +48,29 @@ public abstract partial class SharedHandsSystem
     /// <summary>
     ///     Checks whether an entity can drop a given entity. Will return false if they are not holding the entity.
     /// </summary>
-    public bool CanDrop(EntityUid uid, EntityUid entity, HandsComponent? handsComp = null, bool checkActionBlocker = true)
+    public bool CanDrop(Entity<HandsComponent?> ent, EntityUid entity, bool checkActionBlocker = true)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!IsHolding(uid, entity, out var hand, handsComp))
+        if (!IsHolding(ent, entity, out var hand))
             return false;
 
-        return CanDropHeld(uid, hand, checkActionBlocker);
+        return CanDropHeld(ent, hand, checkActionBlocker);
     }
 
     /// <summary>
     ///     Checks if the contents of a hand is able to be removed from its container.
     /// </summary>
-    public bool CanDropHeld(EntityUid uid, Hand hand, bool checkActionBlocker = true)
+    public bool CanDropHeld(EntityUid uid, string handId, bool checkActionBlocker = true)
     {
-        if (hand.Container?.ContainedEntity is not {} held)
+        if (!ContainerSystem.TryGetContainer(uid, handId, out var container))
             return false;
 
-        if (!ContainerSystem.CanRemove(held, hand.Container))
+        if (container.ContainedEntities.FirstOrNull() is not {} held)
+            return false;
+
+        if (!ContainerSystem.CanRemove(held, container))
             return false;
 
         if (checkActionBlocker && !_actionBlocker.CanDrop(uid))
@@ -78,98 +82,100 @@ public abstract partial class SharedHandsSystem
     /// <summary>
     ///     Attempts to drop the item in the currently active hand.
     /// </summary>
-    public bool TryDrop(EntityUid uid, EntityCoordinates? targetDropLocation = null, bool checkActionBlocker = true, bool doDropInteraction = true, HandsComponent? handsComp = null)
+    public bool TryDrop(Entity<HandsComponent?> ent, EntityCoordinates? targetDropLocation = null, bool checkActionBlocker = true, bool doDropInteraction = true)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (handsComp.ActiveHand == null)
+        if (ent.Comp.ActiveHandId == null)
             return false;
 
-        return TryDrop(uid, handsComp.ActiveHand, targetDropLocation, checkActionBlocker, doDropInteraction, handsComp);
+        return TryDrop(ent, ent.Comp.ActiveHandId, targetDropLocation, checkActionBlocker, doDropInteraction);
     }
 
     /// <summary>
     ///     Drops an item at the target location.
     /// </summary>
-    public bool TryDrop(EntityUid uid, EntityUid entity, EntityCoordinates? targetDropLocation = null, bool checkActionBlocker = true, bool doDropInteraction = true, HandsComponent? handsComp = null)
+    public bool TryDrop(Entity<HandsComponent?> ent, EntityUid entity, EntityCoordinates? targetDropLocation = null, bool checkActionBlocker = true, bool doDropInteraction = true)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!IsHolding(uid, entity, out var hand, handsComp))
+        if (!IsHolding(ent, entity, out var hand))
             return false;
 
-        return TryDrop(uid, hand, targetDropLocation, checkActionBlocker, doDropInteraction, handsComp);
+        return TryDrop(ent, hand, targetDropLocation, checkActionBlocker, doDropInteraction);
     }
 
     /// <summary>
     ///     Drops a hands contents at the target location.
     /// </summary>
-    public bool TryDrop(EntityUid uid, Hand hand, EntityCoordinates? targetDropLocation = null, bool checkActionBlocker = true, bool doDropInteraction = true, HandsComponent? handsComp = null)
+    public bool TryDrop(Entity<HandsComponent?> ent, string handId, EntityCoordinates? targetDropLocation = null, bool checkActionBlocker = true, bool doDropInteraction = true)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!CanDropHeld(uid, hand, checkActionBlocker))
+        if (!CanDropHeld(ent, handId, checkActionBlocker))
             return false;
 
-        var entity = hand.HeldEntity!.Value;
+        if (!TryGetHeldItem(ent, handId, out var entity))
+            return false;
 
         // if item is a fake item (like with pulling), just delete it rather than bothering with trying to drop it into the world
         if (TryComp(entity, out VirtualItemComponent? @virtual))
-            _virtualSystem.DeleteVirtualItem((entity, @virtual), uid);
+            _virtualSystem.DeleteVirtualItem((entity.Value, @virtual), ent);
 
         if (TerminatingOrDeleted(entity))
             return true;
 
-        var itemXform = Transform(entity);
+        var itemXform = Transform(entity.Value);
         if (itemXform.MapUid == null)
             return true;
 
-        var userXform = Transform(uid);
-        var isInContainer = ContainerSystem.IsEntityOrParentInContainer(uid, xform: userXform);
+        var userXform = Transform(ent);
+        var isInContainer = ContainerSystem.IsEntityOrParentInContainer(ent, xform: userXform);
 
         // if the user is in a container, drop the item inside the container
-        if (isInContainer) {
-            TransformSystem.DropNextTo((entity, itemXform), (uid, userXform));
+        if (isInContainer)
+        {
+            TransformSystem.DropNextTo((entity.Value, itemXform), (ent, userXform));
             return true;
         }
 
         // drop the item with heavy calculations from their hands and place it at the calculated interaction range position
         // The DoDrop is handle if there's no drop target
-        DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp);
+        DoDrop(ent, handId, doDropInteraction: doDropInteraction);
 
         // if there's no drop location stop here
         if (targetDropLocation == null)
             return true;
 
         // otherwise, also move dropped item and rotate it properly according to grid/map
-        var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity);
+        var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity.Value);
         var origin = new MapCoordinates(itemPos, itemXform.MapID);
         var target = TransformSystem.ToMapCoordinates(targetDropLocation.Value);
-        TransformSystem.SetWorldPositionRotation(entity, GetFinalDropCoordinates(uid, origin, target, entity), itemRot);
+        TransformSystem.SetWorldPositionRotation(entity.Value, GetFinalDropCoordinates(ent, origin, target, entity.Value), itemRot);
         return true;
     }
 
     /// <summary>
     ///     Attempts to move a held item from a hand into a container that is not another hand, without dropping it on the floor in-between.
     /// </summary>
-    public bool TryDropIntoContainer(EntityUid uid, EntityUid entity, BaseContainer targetContainer, bool checkActionBlocker = true, HandsComponent? handsComp = null)
+    public bool TryDropIntoContainer(Entity<HandsComponent?> ent, EntityUid entity, BaseContainer targetContainer, bool checkActionBlocker = true)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!IsHolding(uid, entity, out var hand, handsComp))
+        if (!IsHolding(ent, entity, out var hand))
             return false;
 
-        if (!CanDropHeld(uid, hand, checkActionBlocker))
+        if (!CanDropHeld(ent, hand, checkActionBlocker))
             return false;
 
         if (!ContainerSystem.CanInsert(entity, targetContainer))
             return false;
 
-        DoDrop(uid, hand, false, handsComp);
+        DoDrop(ent, hand, false);
         ContainerSystem.Insert(entity, targetContainer);
         return true;
     }
@@ -202,34 +208,38 @@ public abstract partial class SharedHandsSystem
     /// <summary>
     ///     Removes the contents of a hand from its container. Assumes that the removal is allowed. In general, you should not be calling this directly.
     /// </summary>
-    public virtual void DoDrop(EntityUid uid, Hand hand, bool doDropInteraction = true, HandsComponent? handsComp = null, bool log = true)
+    public virtual void DoDrop(Entity<HandsComponent?> ent,
+        string handId,
+        bool doDropInteraction = true,
+        bool log = true)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        if (hand.Container?.ContainedEntity == null)
+        if (!ContainerSystem.TryGetContainer(ent, handId, out var container))
             return;
 
-        var entity = hand.Container.ContainedEntity.Value;
-
-        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(entity))
+        if (!TryGetHeldItem(ent, handId, out var entity))
             return;
 
-        if (!ContainerSystem.Remove(entity, hand.Container))
+        if (TerminatingOrDeleted(ent) || TerminatingOrDeleted(entity))
+            return;
+
+        if (!ContainerSystem.Remove(entity.Value, container))
         {
-            Log.Error($"Failed to remove {ToPrettyString(entity)} from users hand container when dropping. User: {ToPrettyString(uid)}. Hand: {hand.Name}.");
+            Log.Error($"Failed to remove {ToPrettyString(entity)} from users hand container when dropping. User: {ToPrettyString(ent)}. Hand: {handId}.");
             return;
         }
 
-        Dirty(uid, handsComp);
+        Dirty(ent);
 
         if (doDropInteraction)
-            _interactionSystem.DroppedInteraction(uid, entity);
+            _interactionSystem.DroppedInteraction(ent, entity.Value);
 
         if (log)
-            _adminLogger.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(uid):user} dropped {ToPrettyString(entity):entity}");
+            _adminLogger.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(ent):user} dropped {ToPrettyString(entity):entity}");
 
-        if (hand == handsComp.ActiveHand)
-            RaiseLocalEvent(entity, new HandDeselectedEvent(uid));
+        if (handId == ent.Comp.ActiveHandId)
+            RaiseLocalEvent(entity.Value, new HandDeselectedEvent(ent));
     }
 }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
new file mode 100644
index 0000000000..af0ed1c1aa
--- /dev/null
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Stunnable;
+
+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
+{
+    private void InitializeEventListeners()
+    {
+        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 GetStandUpTimeEvent time)
+    {
+        if (!HasComp<KnockedDownComponent>(ent))
+            return;
+
+        var hands = GetEmptyHandCount(ent.Owner);
+
+        if (hands == 0)
+            return;
+
+        time.DoAfterTime *= (float)ent.Comp.Count / (hands + ent.Comp.Count);
+    }
+}
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
index 6e383cd69c..0e8d7a7556 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
@@ -97,20 +97,20 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!_actionBlocker.CanInteract(session.AttachedEntity.Value, null))
             return;
 
-        if (component.ActiveHand == null || component.Hands.Count < 2)
+        if (component.ActiveHandId == null || component.Hands.Count < 2)
             return;
 
-        var currentIndex = component.SortedHands.IndexOf(component.ActiveHand.Name);
+        var currentIndex = component.SortedHands.IndexOf(component.ActiveHandId);
         var newActiveIndex = (currentIndex + (reverse ? -1 : 1) + component.Hands.Count) % component.Hands.Count;
         var nextHand = component.SortedHands[newActiveIndex];
 
-        TrySetActiveHand(session.AttachedEntity.Value, nextHand, component);
+        TrySetActiveHand((session.AttachedEntity.Value, component), nextHand);
     }
 
     private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid netEntity)
     {
-        if (TryComp(session?.AttachedEntity, out HandsComponent? hands) && hands.ActiveHand != null)
-            TryDrop(session.AttachedEntity.Value, hands.ActiveHand, coords, handsComp: hands);
+        if (TryComp(session?.AttachedEntity, out HandsComponent? hands) && hands.ActiveHandId != null)
+            TryDrop((session.AttachedEntity.Value, hands), hands.ActiveHandId, coords);
 
         // always send to server.
         return false;
@@ -122,14 +122,14 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        Hand? hand;
-        if (handName == null || !handsComp.Hands.TryGetValue(handName, out hand))
-            hand = handsComp.ActiveHand;
+        var hand = handName;
+        if (!TryGetHand(uid, hand, out _))
+            hand = handsComp.ActiveHandId;
 
-        if (hand?.HeldEntity is not { } held)
+        if (!TryGetHeldItem((uid, handsComp), hand, out var held))
             return false;
 
-        return _interactionSystem.InteractionActivate(uid, held);
+        return _interactionSystem.InteractionActivate(uid, held.Value);
     }
 
     public bool TryInteractHandWithActiveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
@@ -137,16 +137,13 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        if (handsComp.ActiveHandEntity == null)
+        if (!TryGetActiveItem((uid, handsComp), out var activeHeldItem))
             return false;
 
-        if (!handsComp.Hands.TryGetValue(handName, out var hand))
+        if (!TryGetHeldItem((uid, handsComp), handName, out var held))
             return false;
 
-        if (hand.HeldEntity == null)
-            return false;
-
-        _interactionSystem.InteractUsing(uid, handsComp.ActiveHandEntity.Value, hand.HeldEntity.Value, Transform(hand.HeldEntity.Value).Coordinates);
+        _interactionSystem.InteractUsing(uid, activeHeldItem.Value, held.Value, Transform(held.Value).Coordinates);
         return true;
     }
 
@@ -155,17 +152,16 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        Hand? hand;
-        if (handName == null || !handsComp.Hands.TryGetValue(handName, out hand))
-            hand = handsComp.ActiveHand;
+        var hand = handName;
+        if (!TryGetHand(uid, hand, out _))
+            hand = handsComp.ActiveHandId;
 
-        if (hand?.HeldEntity is not { } held)
+        if (!TryGetHeldItem((uid, handsComp), hand, out var held))
             return false;
 
         if (altInteract)
-            return _interactionSystem.AltInteract(uid, held);
-        else
-            return _interactionSystem.UseInHandInteraction(uid, held);
+            return _interactionSystem.AltInteract(uid, held.Value);
+        return _interactionSystem.UseInHandInteraction(uid, held.Value);
     }
 
     /// <summary>
@@ -176,22 +172,20 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp))
             return false;
 
-        if (handsComp.ActiveHand == null || !handsComp.ActiveHand.IsEmpty)
+        if (handsComp.ActiveHandId == null || !HandIsEmpty((uid, handsComp), handsComp.ActiveHandId))
             return false;
 
-        if (!handsComp.Hands.TryGetValue(handName, out var hand))
+        if (!TryGetHeldItem((uid, handsComp), handName, out var entity))
             return false;
 
-        if (!CanDropHeld(uid, hand, checkActionBlocker))
+        if (!CanDropHeld(uid, handName, checkActionBlocker))
             return false;
 
-        var entity = hand.HeldEntity!.Value;
-
-        if (!CanPickupToHand(uid, entity, handsComp.ActiveHand, checkActionBlocker, handsComp))
+        if (!CanPickupToHand(uid, entity.Value, handsComp.ActiveHandId, checkActionBlocker, handsComp))
             return false;
 
-        DoDrop(uid, hand, false, handsComp, log:false);
-        DoPickup(uid, handsComp.ActiveHand, entity, handsComp, log: false);
+        DoDrop(uid, handName, false, log: false);
+        DoPickup(uid, handsComp.ActiveHandId, entity.Value, handsComp, log: false);
         return true;
     }
 
@@ -200,19 +194,19 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (args.Handled)
             return;
 
-        if (component.ActiveHandEntity.HasValue)
+        if (TryGetActiveItem((uid, component), out var activeHeldItem))
         {
             // allow for the item to return a different entity, e.g. virtual items
-            RaiseLocalEvent(component.ActiveHandEntity.Value, ref args);
+            RaiseLocalEvent(activeHeldItem.Value, ref args);
         }
 
-        args.Used ??= component.ActiveHandEntity;
+        args.Used ??= activeHeldItem;
     }
 
     //TODO: Actually shows all items/clothing/etc.
     private void HandleExamined(EntityUid examinedUid, HandsComponent handsComp, ExaminedEvent args)
     {
-        var heldItemNames = EnumerateHeld(examinedUid, handsComp)
+        var heldItemNames = EnumerateHeld((examinedUid, handsComp))
             .Where(entity => !HasComp<VirtualItemComponent>(entity))
             .Select(item => FormattedMessage.EscapeText(Identity.Name(item, EntityManager)))
             .Select(itemName => Loc.GetString("comp-hands-examine-wrapper", ("item", itemName)))
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index 5ae7735b89..ed8b62e393 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -1,17 +1,17 @@
-using Content.Shared.Clothing.Components;
+using System.Diagnostics;
 using Content.Shared.Database;
 using Content.Shared.Hands.Components;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Utility;
 using Robust.Shared.Timing; // Sunrise-add
 using Content.Shared._Sunrise.Item; // Sunrise-add
 
 namespace Content.Shared.Hands.EntitySystems;
 
-public abstract partial class SharedHandsSystem : EntitySystem
+public abstract partial class SharedHandsSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!; // Sunrise-add
 
@@ -27,11 +27,11 @@ public abstract partial class SharedHandsSystem : EntitySystem
             return;
         }
 
-        var didEquip = new DidEquipHandEvent(uid, args.Entity, hand);
-        RaiseLocalEvent(uid, didEquip, false);
+        var didEquip = new DidEquipHandEvent(uid, args.Entity, hand.Value);
+        RaiseLocalEvent(uid, didEquip);
 
-        var gotEquipped = new GotEquippedHandEvent(uid, args.Entity, hand);
-        RaiseLocalEvent(args.Entity, gotEquipped, false);
+        var gotEquipped = new GotEquippedHandEvent(uid, args.Entity, hand.Value);
+        RaiseLocalEvent(args.Entity, gotEquipped);
     }
 
     /// <summary>
@@ -39,32 +39,6 @@ public abstract partial class SharedHandsSystem : EntitySystem
     /// </summary>
     public const float MaxAnimationRange = 10;
 
-    /// <summary>
-    ///     Tries to pick up an entity to a specific hand. If no explicit hand is specified, defaults to using the currently active hand.
-    /// </summary>
-    public bool TryPickup(
-        EntityUid uid,
-        EntityUid entity,
-        string? handName = null,
-        bool checkActionBlocker = true,
-        bool animateUser = false,
-        bool animate = true,
-        HandsComponent? handsComp = null,
-        ItemComponent? item = null)
-    {
-        if (!Resolve(uid, ref handsComp, false))
-            return false;
-
-        var hand = handsComp.ActiveHand;
-        if (handName != null && !handsComp.Hands.TryGetValue(handName, out hand))
-            return false;
-
-        if (hand == null)
-            return false;
-
-        return TryPickup(uid, entity, hand, checkActionBlocker, animate, handsComp, item);
-    }
-
     /// <summary>
     ///     Attempts to pick up an item into any empty hand. Prioritizes the currently active hand.
     /// </summary>
@@ -84,17 +58,21 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        if (!TryGetEmptyHand(uid, out var hand, handsComp))
+        if (!TryGetEmptyHand((uid, handsComp), out var hand))
             return false;
 
-        return TryPickup(uid, entity, hand, checkActionBlocker, animate, handsComp, item);
+        return TryPickup(uid, entity, hand, checkActionBlocker, animateUser, animate, handsComp, item);
     }
 
+    /// <summary>
+    ///     Tries to pick up an entity to a specific hand. If no explicit hand is specified, defaults to using the currently active hand.
+    /// </summary>
     public bool TryPickup(
         EntityUid uid,
         EntityUid entity,
-        Hand hand,
+        string? handId = null,
         bool checkActionBlocker = true,
+        bool animateUser = false,
         bool animate = true,
         HandsComponent? handsComp = null,
         ItemComponent? item = null)
@@ -102,10 +80,15 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
+        handId ??= handsComp.ActiveHandId;
+
+        if (handId == null)
+            return false;
+
         if (!Resolve(entity, ref item, false))
             return false;
 
-        if (!CanPickupToHand(uid, entity, hand, checkActionBlocker, handsComp, item))
+        if (!CanPickupToHand(uid, entity, handId, checkActionBlocker, handsComp, item))
             return false;
 
         // Sunrise-start
@@ -128,7 +111,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
                 _storage.PlayPickupAnimation(entity, initialPosition, xform.Coordinates, itemXform.LocalRotation, uid);
             }
         }
-        DoPickup(uid, hand, entity, handsComp);
+        DoPickup(uid, handId, entity, handsComp);
 
         return true;
     }
@@ -161,20 +144,20 @@ public abstract partial class SharedHandsSystem : EntitySystem
     /// By default it does check if it's possible to drop items.
     /// </summary>
     public bool TryForcePickup(
-        EntityUid uid,
+        Entity<HandsComponent?> ent,
         EntityUid entity,
-        Hand hand,
+        string hand,
         bool checkActionBlocker = true,
         bool animate = true,
         HandsComponent? handsComp = null,
         ItemComponent? item = null)
     {
-        if (!Resolve(uid, ref handsComp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        TryDrop(uid, hand, checkActionBlocker: checkActionBlocker, handsComp: handsComp);
+        TryDrop(ent, hand, checkActionBlocker: checkActionBlocker);
 
-        return TryPickup(uid, entity, hand, checkActionBlocker, animate, handsComp, item);
+        return TryPickup(ent, entity, hand, checkActionBlocker, animate: animate, handsComp: handsComp, item: item);
     }
 
     /// <summary>
@@ -189,9 +172,9 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (TryPickupAnyHand(uid, entity, checkActionBlocker: checkActionBlocker, handsComp: handsComp))
             return true;
 
-        foreach (var hand in handsComp.Hands.Values)
+        foreach (var hand in handsComp.Hands.Keys)
         {
-            if (TryDrop(uid, hand, checkActionBlocker: checkActionBlocker, handsComp: handsComp) &&
+            if (TryDrop((uid, handsComp), hand, checkActionBlocker: checkActionBlocker) &&
                 TryPickup(uid, entity, hand, checkActionBlocker: checkActionBlocker, handsComp: handsComp))
             {
                 return true;
@@ -205,7 +188,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        if (!TryGetEmptyHand(uid, out var hand, handsComp))
+        if (!TryGetEmptyHand((uid, handsComp), out var hand))
             return false;
 
         return CanPickupToHand(uid, entity, hand, checkActionBlocker, handsComp, item);
@@ -214,13 +197,15 @@ public abstract partial class SharedHandsSystem : EntitySystem
     /// <summary>
     ///     Checks whether a given item will fit into a specific user's hand. Unless otherwise specified, this will also check the general CanPickup action blocker.
     /// </summary>
-    public bool CanPickupToHand(EntityUid uid, EntityUid entity, Hand hand, bool checkActionBlocker = true, HandsComponent? handsComp = null, ItemComponent? item = null)
+    public bool CanPickupToHand(EntityUid uid, EntityUid entity, string handId, bool checkActionBlocker = true, HandsComponent? handsComp = null, ItemComponent? item = null)
     {
         if (!Resolve(uid, ref handsComp, false))
             return false;
 
-        var handContainer = hand.Container;
-        if (handContainer == null || handContainer.ContainedEntity != null)
+        if (!ContainerSystem.TryGetContainer(uid, handId, out var handContainer))
+            return false;
+
+        if (handContainer.ContainedEntities.FirstOrNull() != null)
             return false;
 
         if (!Resolve(entity, ref item, false))
@@ -263,8 +248,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
     {
         if (uid == null
             || !Resolve(uid.Value, ref handsComp, false)
-            || !TryGetEmptyHand(uid.Value, out var hand, handsComp)
-            || !TryPickup(uid.Value, entity, hand, checkActionBlocker, animate, handsComp, item))
+            || !TryPickupAnyHand(uid.Value, entity, checkActionBlocker, animateUser, animate, handsComp, item))
         {
             // TODO make this check upwards for any container, and parent to that.
             // Currently this just checks the direct parent, so items can still teleport through containers.
@@ -280,18 +264,20 @@ public abstract partial class SharedHandsSystem : EntitySystem
     /// <summary>
     ///     Puts an entity into the player's hand, assumes that the insertion is allowed. In general, you should not be calling this function directly.
     /// </summary>
-    public virtual void DoPickup(EntityUid uid, Hand hand, EntityUid entity, HandsComponent? hands = null, bool log = true)
+    public virtual void DoPickup(EntityUid uid, string hand, EntityUid entity, HandsComponent? hands = null, bool log = true)
     {
         if (!Resolve(uid, ref hands))
             return;
 
-        var handContainer = hand.Container;
-        if (handContainer == null || handContainer.ContainedEntity != null)
+        if (!ContainerSystem.TryGetContainer(uid, hand, out var handContainer))
+            return;
+
+        if (handContainer.ContainedEntities.FirstOrNull() != null)
             return;
 
         if (!ContainerSystem.Insert(entity, handContainer))
         {
-            Log.Error($"Failed to insert {ToPrettyString(entity)} into users hand container when picking up. User: {ToPrettyString(uid)}. Hand: {hand.Name}.");
+            Log.Error($"Failed to insert {ToPrettyString(entity)} into users hand container when picking up. User: {ToPrettyString(uid)}. Hand: {hand}.");
             return;
         }
 
@@ -302,7 +288,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
 
         Dirty(uid, hands);
 
-        if (hand == hands.ActiveHand)
-            RaiseLocalEvent(entity, new HandSelectedEvent(uid), false);
+        if (hand == hands.ActiveHandId)
+            RaiseLocalEvent(entity, new HandSelectedEvent(uid));
     }
 }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
index 67db193894..bfb9a41b0b 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Atmos;
 using Content.Shared.Camera;
+using Content.Shared.Cuffs;
 using Content.Shared.Hands.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Projectiles;
@@ -22,6 +23,7 @@ public abstract partial class SharedHandsSystem
         SubscribeLocalEvent<HandsComponent, HitScanReflectAttemptEvent>(RefRelayEvent);
         SubscribeLocalEvent<HandsComponent, WieldAttemptEvent>(RefRelayEvent);
         SubscribeLocalEvent<HandsComponent, UnwieldAttemptEvent>(RefRelayEvent);
+        SubscribeLocalEvent<HandsComponent, TargetHandcuffedEvent>(RefRelayEvent);
     }
 
     private void RelayEvent<T>(Entity<HandsComponent> entity, ref T args) where T : EntityEventArgs
@@ -39,7 +41,7 @@ public abstract partial class SharedHandsSystem
     {
         var ev = new HeldRelayedEvent<T>(args);
 
-        foreach (var held in EnumerateHeld(entity, entity.Comp))
+        foreach (var held in EnumerateHeld(entity.AsNullable()))
         {
             RaiseLocalEvent(held, ref ev);
         }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index 84beabf9ac..af5e82f417 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Hands.EntitySystems;
 
@@ -23,6 +24,8 @@ public abstract partial class SharedHandsSystem
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private readonly SharedVirtualItemSystem _virtualSystem = default!;
 
+    public event Action<Entity<HandsComponent>, string, HandLocation>? OnPlayerAddHand;
+    public event Action<Entity<HandsComponent>, string>? OnPlayerRemoveHand;
     protected event Action<Entity<HandsComponent>?>? OnHandSetActive;
 
     public override void Initialize()
@@ -33,6 +36,10 @@ public abstract partial class SharedHandsSystem
         InitializeDrop();
         InitializePickup();
         InitializeRelay();
+        InitializeEventListeners();
+
+        SubscribeLocalEvent<HandsComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<HandsComponent, MapInitEvent>(OnMapInit);
     }
 
     public override void Shutdown()
@@ -41,71 +48,94 @@ public abstract partial class SharedHandsSystem
         CommandBinds.Unregister<SharedHandsSystem>();
     }
 
-    public virtual void AddHand(EntityUid uid, string handName, HandLocation handLocation, HandsComponent? handsComp = null)
+    private void OnInit(Entity<HandsComponent> ent, ref ComponentInit args)
     {
-        if (!Resolve(uid, ref handsComp, false))
-            return;
-
-        if (handsComp.Hands.ContainsKey(handName))
-            return;
-
-        var container = ContainerSystem.EnsureContainer<ContainerSlot>(uid, handName);
-        container.OccludesLight = false;
-
-        var newHand = new Hand(handName, handLocation, container);
-        handsComp.Hands.Add(handName, newHand);
-        handsComp.SortedHands.Add(handName);
-
-        if (handsComp.ActiveHand == null)
-            SetActiveHand(uid, newHand, handsComp);
-
-        RaiseLocalEvent(uid, new HandCountChangedEvent(uid));
-        Dirty(uid, handsComp);
+        var container = EnsureComp<ContainerManagerComponent>(ent);
+        foreach (var id in ent.Comp.Hands.Keys)
+        {
+            ContainerSystem.EnsureContainer<ContainerSlot>(ent, id, container);
+        }
     }
 
-    public virtual void RemoveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
+    private void OnMapInit(Entity<HandsComponent> ent, ref MapInitEvent args)
     {
-        if (!Resolve(uid, ref handsComp, false))
+        if (ent.Comp.ActiveHandId == null)
+            SetActiveHand(ent.AsNullable(), ent.Comp.SortedHands.FirstOrDefault());
+    }
+
+    /// <summary>
+    /// Adds a hand with the given container id and supplied location to the specified entity.
+    /// </summary>
+    public void AddHand(Entity<HandsComponent?> ent, string handName, HandLocation handLocation)
+    {
+        AddHand(ent, handName, new Hand(handLocation));
+    }
+
+    /// <summary>
+    /// Adds a hand with the given container id and supplied hand definition to the given entity.
+    /// </summary>
+    public void AddHand(Entity<HandsComponent?> ent, string handName, Hand hand)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        if (!handsComp.Hands.Remove(handName, out var hand))
+        if (ent.Comp.Hands.ContainsKey(handName))
             return;
 
-        handsComp.SortedHands.Remove(hand.Name);
-        TryDrop(uid, hand, null, false, true, handsComp);
-        if (hand.Container != null)
-            ContainerSystem.ShutdownContainer(hand.Container);
+        var container = ContainerSystem.EnsureContainer<ContainerSlot>(ent, handName);
+        container.OccludesLight = false;
 
-        if (handsComp.ActiveHand == hand)
-            TrySetActiveHand(uid, handsComp.SortedHands.FirstOrDefault(), handsComp);
+        ent.Comp.Hands.Add(handName, hand);
+        ent.Comp.SortedHands.Add(handName);
+        Dirty(ent);
 
-        RaiseLocalEvent(uid, new HandCountChangedEvent(uid));
-        Dirty(uid, handsComp);
+        OnPlayerAddHand?.Invoke((ent, ent.Comp), handName, hand.Location);
+
+        if (ent.Comp.ActiveHandId == null)
+            SetActiveHand(ent, handName);
+
+        RaiseLocalEvent(ent, new HandCountChangedEvent(ent));
+    }
+
+    /// <summary>
+    /// Removes the specified hand from the specified entity
+    /// </summary>
+    public virtual void RemoveHand(Entity<HandsComponent?> ent, string handName)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        OnPlayerRemoveHand?.Invoke((ent, ent.Comp), handName);
+
+        TryDrop(ent, handName, null, false);
+
+        if (!ent.Comp.Hands.Remove(handName))
+            return;
+
+        if (ContainerSystem.TryGetContainer(ent, handName, out var container))
+            ContainerSystem.ShutdownContainer(container);
+
+        ent.Comp.SortedHands.Remove(handName);
+        if (ent.Comp.ActiveHandId == handName)
+            TrySetActiveHand(ent, ent.Comp.SortedHands.FirstOrDefault());
+
+        RaiseLocalEvent(ent, new HandCountChangedEvent(ent));
+        Dirty(ent);
     }
 
     /// <summary>
     /// Gets rid of all the entity's hands.
     /// </summary>
-    /// <param name="uid"></param>
-    /// <param name="handsComp"></param>
-    public void RemoveHands(EntityUid uid, HandsComponent? handsComp = null)
+    public void RemoveHands(Entity<HandsComponent?> ent)
     {
-        if (!Resolve(uid, ref handsComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return;
 
-        RemoveHands(uid, EnumerateHands(uid), handsComp);
-    }
-
-    private void RemoveHands(EntityUid uid, IEnumerable<Hand> hands, HandsComponent handsComp)
-    {
-        if (!hands.Any())
-            return;
-
-        var hand = hands.First();
-        RemoveHand(uid, hand.Name, handsComp);
-
-        // Repeats it for any additional hands.
-        RemoveHands(uid, hands, handsComp);
+        var handIds = new List<string>(ent.Comp.Hands.Keys);
+        foreach (var handId in handIds)
+        {
+            RemoveHand(ent, handId);
+        }
     }
 
     private void HandleSetHand(RequestSetHandEvent msg, EntitySessionEventArgs eventArgs)
@@ -119,15 +149,15 @@ public abstract partial class SharedHandsSystem
     /// <summary>
     ///     Get any empty hand. Prioritizes the currently active hand.
     /// </summary>
-    public bool TryGetEmptyHand(EntityUid uid, [NotNullWhen(true)] out Hand? emptyHand, HandsComponent? handComp = null)
+    public bool TryGetEmptyHand(Entity<HandsComponent?> ent, [NotNullWhen(true)] out string? emptyHand)
     {
         emptyHand = null;
-        if (!Resolve(uid, ref handComp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        foreach (var hand in EnumerateHands(uid, handComp))
+        foreach (var hand in EnumerateHands(ent))
         {
-            if (hand.IsEmpty)
+            if (HandIsEmpty(ent, hand))
             {
                 emptyHand = hand;
                 return true;
@@ -137,28 +167,40 @@ public abstract partial class SharedHandsSystem
         return false;
     }
 
-    public bool TryGetActiveHand(Entity<HandsComponent?> entity, [NotNullWhen(true)] out Hand? hand)
+    /// <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))
+        if (!Resolve(entity, ref entity.Comp, false) || entity.Comp.Count == 0)
+            return 0;
+
+        var hands = 0;
+
+        foreach (var hand in EnumerateHands(entity))
         {
-            hand = null;
-            return false;
+            if (!HandIsEmpty(entity, hand))
+                continue;
+            hands++;
         }
 
-        hand = entity.Comp.ActiveHand;
-        return hand != null;
+        return hands;
     }
 
+    /// <summary>
+    /// Attempts to retrieve the item held in the entity's active hand.
+    /// </summary>
     public bool TryGetActiveItem(Entity<HandsComponent?> entity, [NotNullWhen(true)] out EntityUid? item)
     {
-        if (!TryGetActiveHand(entity, out var hand))
-        {
-            item = null;
+        item = null;
+        if (!Resolve(entity, ref entity.Comp, false))
             return false;
-        }
 
-        item = hand.HeldEntity;
-        return item != null;
+        if (!TryGetHeldItem(entity, entity.Comp.ActiveHandId, out var held))
+            return false;
+
+        item = held;
+        return true;
     }
 
     /// <summary>
@@ -174,55 +216,73 @@ public abstract partial class SharedHandsSystem
         return item.Value;
     }
 
-    public Hand? GetActiveHand(Entity<HandsComponent?> entity)
+    /// <summary>
+    /// Gets the current active hand's Id for the specified entity
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public string? GetActiveHand(Entity<HandsComponent?> entity)
     {
-        if (!Resolve(entity, ref entity.Comp))
+        if (!Resolve(entity, ref entity.Comp, false))
             return null;
 
-        return entity.Comp.ActiveHand;
+        return entity.Comp.ActiveHandId;
     }
 
+    /// <summary>
+    /// Gets the current active hand's held entity for the specified entity
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
     public EntityUid? GetActiveItem(Entity<HandsComponent?> entity)
     {
-        return GetActiveHand(entity)?.HeldEntity;
+        if (!Resolve(entity, ref entity.Comp, false))
+            return null;
+
+        return GetHeldItem(entity, entity.Comp.ActiveHandId);
+    }
+
+    public bool ActiveHandIsEmpty(Entity<HandsComponent?> entity)
+    {
+        return GetActiveItem(entity) == null;
     }
 
     /// <summary>
     ///     Enumerate over hands, starting with the currently active hand.
     /// </summary>
-    public IEnumerable<Hand> EnumerateHands(EntityUid uid, HandsComponent? handsComp = null)
+    public IEnumerable<string> EnumerateHands(Entity<HandsComponent?> ent)
     {
-        if (!Resolve(uid, ref handsComp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             yield break;
 
-        if (handsComp.ActiveHand != null)
-            yield return handsComp.ActiveHand;
+        if (ent.Comp.ActiveHandId != null)
+            yield return ent.Comp.ActiveHandId;
 
-        foreach (var name in handsComp.SortedHands)
+        foreach (var name in ent.Comp.SortedHands)
         {
-            if (name != handsComp.ActiveHand?.Name)
-                yield return handsComp.Hands[name];
+            if (name != ent.Comp.ActiveHandId)
+                yield return name;
         }
     }
 
     /// <summary>
     ///     Enumerate over held items, starting with the item in the currently active hand (if there is one).
     /// </summary>
-    public IEnumerable<EntityUid> EnumerateHeld(EntityUid uid, HandsComponent? handsComp = null)
+    public IEnumerable<EntityUid> EnumerateHeld(Entity<HandsComponent?> ent)
     {
-        if (!Resolve(uid, ref handsComp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             yield break;
 
-        if (handsComp.ActiveHandEntity != null)
-            yield return handsComp.ActiveHandEntity.Value;
+        if (TryGetActiveItem(ent, out var activeHeld))
+            yield return activeHeld.Value;
 
-        foreach (var name in handsComp.SortedHands)
+        foreach (var name in ent.Comp.SortedHands)
         {
-            if (name == handsComp.ActiveHand?.Name)
+            if (name == ent.Comp.ActiveHandId)
                 continue;
 
-            if (handsComp.Hands[name].HeldEntity is { } held)
-                yield return held;
+            if (TryGetHeldItem(ent, name, out var held))
+                yield return held.Value;
         }
     }
 
@@ -231,18 +291,17 @@ public abstract partial class SharedHandsSystem
     /// </summary>
     /// <returns>True if the active hand was set to a NEW value. Setting it to the same value returns false and does
     /// not trigger interactions.</returns>
-    public virtual bool TrySetActiveHand(EntityUid uid, string? name, HandsComponent? handComp = null)
+    public bool TrySetActiveHand(Entity<HandsComponent?> ent, string? name)
     {
-        if (!Resolve(uid, ref handComp))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (name == handComp.ActiveHand?.Name)
+        if (name == ent.Comp.ActiveHandId)
             return false;
 
-        Hand? hand = null;
-        if (name != null && !handComp.Hands.TryGetValue(name, out hand))
+        if (name != null && !ent.Comp.Hands.ContainsKey(name))
             return false;
-        return SetActiveHand(uid, hand, handComp);
+        return SetActiveHand(ent, name);
     }
 
     /// <summary>
@@ -250,50 +309,50 @@ public abstract partial class SharedHandsSystem
     /// </summary>
     /// <returns>True if the active hand was set to a NEW value. Setting it to the same value returns false and does
     /// not trigger interactions.</returns>
-    public bool SetActiveHand(EntityUid uid, Hand? hand, HandsComponent? handComp = null)
+    public bool SetActiveHand(Entity<HandsComponent?> ent, string? handId)
     {
-        if (!Resolve(uid, ref handComp))
+        if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        if (hand == handComp.ActiveHand)
+        if (handId == ent.Comp.ActiveHandId)
             return false;
 
-        if (handComp.ActiveHand?.HeldEntity is { } held)
-            RaiseLocalEvent(held, new HandDeselectedEvent(uid));
+        if (TryGetActiveItem(ent, out var oldHeld))
+            RaiseLocalEvent(oldHeld.Value, new HandDeselectedEvent(ent));
 
-        if (hand == null)
+        if (handId == null)
         {
-            handComp.ActiveHand = null;
+            ent.Comp.ActiveHandId = null;
             return true;
         }
 
-        handComp.ActiveHand = hand;
-        OnHandSetActive?.Invoke((uid, handComp));
+        ent.Comp.ActiveHandId = handId;
+        OnHandSetActive?.Invoke((ent, ent.Comp));
 
-        if (hand.HeldEntity != null)
-            RaiseLocalEvent(hand.HeldEntity.Value, new HandSelectedEvent(uid));
+        if (TryGetHeldItem(ent, handId, out var newHeld))
+            RaiseLocalEvent(newHeld.Value, new HandSelectedEvent(ent));
 
-        Dirty(uid, handComp);
+        Dirty(ent);
         return true;
     }
 
     public bool IsHolding(Entity<HandsComponent?> entity, [NotNullWhen(true)] EntityUid? item)
     {
-        return IsHolding(entity, item, out _, entity);
+        return IsHolding(entity, item, out _);
     }
 
-    public bool IsHolding(EntityUid uid, [NotNullWhen(true)] EntityUid? entity, [NotNullWhen(true)] out Hand? inHand, HandsComponent? handsComp = null)
+    public bool IsHolding(Entity<HandsComponent?> ent, [NotNullWhen(true)] EntityUid? entity, [NotNullWhen(true)] out string? inHand)
     {
         inHand = null;
         if (entity == null)
             return false;
 
-        if (!Resolve(uid, ref handsComp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        foreach (var hand in handsComp.Hands.Values)
+        foreach (var hand in ent.Comp.Hands.Keys)
         {
-            if (hand.HeldEntity == entity)
+            if (GetHeldItem(ent, hand) == entity)
             {
                 inHand = hand;
                 return true;
@@ -303,23 +362,89 @@ public abstract partial class SharedHandsSystem
         return false;
     }
 
-    public bool TryGetHand(EntityUid handsUid, string handId, [NotNullWhen(true)] out Hand? hand,
-        HandsComponent? hands = null)
+    /// <summary>
+    /// Attempts to retrieve the associated hand struct corresponding to a hand ID on a given entity.
+    /// </summary>
+    public bool TryGetHand(Entity<HandsComponent?> ent, [NotNullWhen(true)] string? handId, [NotNullWhen(true)] out Hand? hand)
     {
         hand = null;
 
-        if (!Resolve(handsUid, ref hands))
+        if (handId == null)
             return false;
 
-        return hands.Hands.TryGetValue(handId, out hand);
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        if (!ent.Comp.Hands.TryGetValue(handId, out var handsHand))
+            return false;
+
+        hand = handsHand;
+        return true;
+    }
+
+    /// <summary>
+    /// Gets the item currently held in the entity's specified hand. Returns null if no hands are present or there is no item.
+    /// </summary>
+    public EntityUid? GetHeldItem(Entity<HandsComponent?> ent, string? handId)
+    {
+        TryGetHeldItem(ent, handId, out var held);
+        return held;
+    }
+
+    /// <summary>
+    /// Gets the item currently held in the entity's specified hand. Returns false if no hands are present or there is no item.
+    /// </summary>
+    public bool TryGetHeldItem(Entity<HandsComponent?> ent, string? handId, [NotNullWhen(true)] out EntityUid? held)
+    {
+        held = null;
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        // Sanity check to make sure this is actually a hand.
+        if (handId == null || !ent.Comp.Hands.ContainsKey(handId))
+            return false;
+
+        if (!ContainerSystem.TryGetContainer(ent, handId, out var container))
+            return false;
+
+        held = container.ContainedEntities.FirstOrNull();
+        return held != null;
+    }
+
+    public bool HandIsEmpty(Entity<HandsComponent?> ent, string handId)
+    {
+        return GetHeldItem(ent, handId) == null;
+    }
+
+    public int GetHandCount(Entity<HandsComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return 0;
+
+        return ent.Comp.Hands.Count;
+    }
+
+    public int CountFreeHands(Entity<HandsComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return 0;
+
+        var free = 0;
+        foreach (var name in ent.Comp.Hands.Keys)
+        {
+            if (HandIsEmpty(ent, name))
+                free++;
+        }
+
+        return free;
     }
 
     public int CountFreeableHands(Entity<HandsComponent> hands)
     {
         var freeable = 0;
-        foreach (var hand in hands.Comp.Hands.Values)
+        foreach (var name in hands.Comp.Hands.Keys)
         {
-            if (hand.IsEmpty || CanDropHeld(hands, hand))
+            if (HandIsEmpty(hands.AsNullable(), name) || CanDropHeld(hands, name))
                 freeable++;
         }
 
diff --git a/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs b/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
index 9bcd218335..28dbb31324 100644
--- a/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
+++ b/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
@@ -12,7 +12,7 @@ public sealed partial class ActiveHotPotatoComponent : Component
     /// <summary>
     /// Hot potato effect spawn cooldown in seconds
     /// </summary>
-    [DataField("effectCooldown"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float EffectCooldown = 0.3f;
 
     /// <summary>
diff --git a/Content.Shared/HotPotato/HotPotatoComponent.cs b/Content.Shared/HotPotato/HotPotatoComponent.cs
index f5b2e16189..b077e91e8f 100644
--- a/Content.Shared/HotPotato/HotPotatoComponent.cs
+++ b/Content.Shared/HotPotato/HotPotatoComponent.cs
@@ -14,7 +14,6 @@ public sealed partial class HotPotatoComponent : Component
     /// <summary>
     /// If set to true entity can be removed by hitting entities if they have hands
     /// </summary>
-    [DataField("canTransfer"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool CanTransfer = true;
 }
diff --git a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs
index cd7a5d6da5..6f2f498782 100644
--- a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs
+++ b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs
@@ -1,18 +1,79 @@
+using Content.Shared.Audio;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Content.Shared.Trigger;
+using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Containers;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.HotPotato;
 
 public abstract class SharedHotPotatoSystem : EntitySystem
 {
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
+    [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HotPotatoComponent, ContainerGettingRemovedAttemptEvent>(OnRemoveAttempt);
+        SubscribeLocalEvent<HotPotatoComponent, ActiveTimerTriggerEvent>(OnActiveTimer);
+        SubscribeLocalEvent<HotPotatoComponent, MeleeHitEvent>(OnMeleeHit);
     }
 
-    private void OnRemoveAttempt(EntityUid uid, HotPotatoComponent comp, ContainerGettingRemovedAttemptEvent args)
+    private void OnRemoveAttempt(Entity<HotPotatoComponent> ent, ref ContainerGettingRemovedAttemptEvent args)
     {
-        if (!comp.CanTransfer)
+        if (!_timing.ApplyingState && !ent.Comp.CanTransfer)
             args.Cancel();
     }
+
+    private void OnActiveTimer(Entity<HotPotatoComponent> ent, ref ActiveTimerTriggerEvent args)
+    {
+        EnsureComp<ActiveHotPotatoComponent>(ent);
+        ent.Comp.CanTransfer = false;
+        _ambientSound.SetAmbience(ent.Owner, true);
+        _damageOnHolding.SetEnabled(ent.Owner, true);
+        Dirty(ent);
+    }
+
+    private void OnMeleeHit(Entity<HotPotatoComponent> ent, ref MeleeHitEvent args)
+    {
+        if (!HasComp<ActiveHotPotatoComponent>(ent))
+            return;
+
+        ent.Comp.CanTransfer = true;
+        foreach (var hitEntity in args.HitEntities)
+        {
+            if (!TryComp<HandsComponent>(hitEntity, out var hands))
+                continue;
+
+            if (!_hands.IsHolding((hitEntity, hands), ent.Owner, out _) && _hands.TryForcePickupAnyHand(hitEntity, ent.Owner, handsComp: hands))
+            {
+                _popup.PopupPredicted(
+                    Loc.GetString("hot-potato-passed", ("from", Identity.Entity(args.User, EntityManager)), ("to", Identity.Entity(hitEntity, EntityManager))),
+                    ent.Owner,
+                    args.User,
+                    PopupType.Medium);
+                break;
+            }
+
+            _popup.PopupClient(
+                Loc.GetString("hot-potato-failed", ("to", Identity.Entity(hitEntity, EntityManager))),
+                ent.Owner,
+                args.User,
+                PopupType.Medium);
+
+            break;
+        }
+
+        ent.Comp.CanTransfer = false;
+    }
 }
diff --git a/Content.Shared/Humanoid/HairStyles.cs b/Content.Shared/Humanoid/HairStyles.cs
index cb4befd85a..543a0de817 100644
--- a/Content.Shared/Humanoid/HairStyles.cs
+++ b/Content.Shared/Humanoid/HairStyles.cs
@@ -1,14 +1,13 @@
 using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Humanoid
 {
     public static class HairStyles
     {
-        [ValidatePrototypeId<MarkingPrototype>]
-        public const string DefaultHairStyle = "HairBald";
+        public static readonly ProtoId<MarkingPrototype> DefaultHairStyle = "HairBald";
 
-        [ValidatePrototypeId<MarkingPrototype>]
-        public const string DefaultFacialHairStyle = "FacialHairShaved";
+        public static readonly ProtoId<MarkingPrototype> DefaultFacialHairStyle = "FacialHairShaved";
 
         public static readonly IReadOnlyList<Color> RealisticHairColors = new List<Color>
         {
diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
index 73c000d0c0..8ec1ab3151 100644
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -209,76 +209,40 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
     {
         var random = IoCManager.Resolve<IRobustRandom>();
         var markingManager = IoCManager.Resolve<MarkingManager>();
+        var hairStyles = markingManager.MarkingsByCategoryAndSpecies(MarkingCategories.Hair, species).Keys.ToList();
+        var facialHairStyles = markingManager.MarkingsByCategoryAndSpecies(MarkingCategories.FacialHair, species).Keys.ToList();
 
-        var newFacialHairStyle = HairStyles.DefaultFacialHairStyle;
-        var newHairStyle = HairStyles.DefaultHairStyle;
-        List<Marking> newMarkings = [];
+        var newHairStyle = hairStyles.Count > 0
+            ? random.Pick(hairStyles)
+            : HairStyles.DefaultHairStyle.Id;
 
-        // grab a completely random color.
-        var baseColor = new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1);
+        var newFacialHairStyle = facialHairStyles.Count == 0 || sex == Sex.Female
+            ? HairStyles.DefaultFacialHairStyle.Id
+            : random.Pick(facialHairStyles);
 
-        // create a new color palette based on BaseColor. roll to determine what type of palette it is.
-        // personally I think this should be weighted, but I can't be bothered to implement that.
-        List<Color> colorPalette = [];
-        switch (random.Next(3))
-        {
-            case 0:
-                colorPalette = GetSplitComplementaries(baseColor);
-                break;
-            case 1:
-                colorPalette = GetTriadicComplementaries(baseColor);
-                break;
-            case 2:
-                colorPalette = GetOneComplementary(baseColor);
-                break;
-        }
+        var newHairColor = random.Pick(HairStyles.RealisticHairColors);
+        newHairColor = newHairColor
+            .WithRed(RandomizeColor(newHairColor.R))
+            .WithGreen(RandomizeColor(newHairColor.G))
+            .WithBlue(RandomizeColor(newHairColor.B));
+
+        // TODO: Add random markings
+
+        var newEyeColor = random.Pick(RealisticEyeColors);
 
-        // grab the species skin coloration type.
         var skinType = IoCManager.Resolve<IPrototypeManager>().Index<SpeciesPrototype>(species).SkinColoration;
 
-        // declare some defaults. ensures that the hair and eyes on hues-colored species don't match the skin or one another.
-        var newSkinColor = colorPalette[0];
-        var newHairColor = colorPalette[1];
-        var newEyeColor = colorPalette[2];
-
-        // now we do some color logic.
+        var newSkinColor = new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1);
         switch (skinType)
         {
-            // if the species is HumanToned:
             case HumanoidSkinColor.HumanToned:
-                // quantize the randomized skin color to the nearest acceptable HumanToned color.
-                var tone = Math.Round(Humanoid.SkinColor.HumanSkinToneFromColor(newSkinColor));
-                newSkinColor = Humanoid.SkinColor.HumanSkinTone((int)tone);
-
-                // pick a random realistic hair color from the list and randomize it juuuuust a little bit.
-                newHairColor = random.Pick(HairStyles.RealisticHairColors);
-                newHairColor = newHairColor
-                    .WithRed(RandomizeColor(newHairColor.R))
-                    .WithGreen(RandomizeColor(newHairColor.G))
-                    .WithBlue(RandomizeColor(newHairColor.B));
-
-                // and pick a random realistic eye color from the list.
-                newEyeColor = random.Pick(RealisticEyeColors);
-
-                // we're also going to crush the other colors down to the skin's luminosity so markings don't appear too bright on darker skin.
-                colorPalette[1] = SquashToSkinLuminosity(newSkinColor, colorPalette[1]);
-                colorPalette[2] = SquashToSkinLuminosity(newSkinColor, colorPalette[2]);
+                newSkinColor = Humanoid.SkinColor.HumanSkinTone(random.Next(0, 101));
                 break;
-
-            // if the species is Hues toned: it's fine the way it is.
             case HumanoidSkinColor.Hues:
                 break;
-
-            // if the species is TintedHues toned: tint them hues.
             case HumanoidSkinColor.TintedHues:
                 newSkinColor = Humanoid.SkinColor.ValidTintedHuesSkinTone(newSkinColor);
-
-                // we're also going to crush the other colors down to valid TintedHues skin colors.
-                colorPalette[1] = Humanoid.SkinColor.ValidTintedHuesSkinTone(colorPalette[1]);
-                colorPalette[2] = Humanoid.SkinColor.ValidTintedHuesSkinTone(colorPalette[2]);
                 break;
-
-            // if the species is VoxFeathers toned: confine the skin color to vox limits. Bright colors are otherwise fine, so leave the marking colors alone.
             case HumanoidSkinColor.VoxFeathers:
                 newSkinColor = Humanoid.SkinColor.ProportionalVoxColor(newSkinColor);
                 break;
@@ -287,151 +251,12 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
                 break;
         }
 
-        // now we loop through every extant marking category,
-        foreach (var category in Enum.GetValues<MarkingCategories>())
-        {
-            // grab a list of markings in that category for that species,
-            var markings = markingManager.MarkingsByCategoryAndSpecies(category, species).Keys.ToList();
-            var markingProtos = markingManager.MarkingsByCategoryAndSpecies(category, species).Values.ToList();
+        return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new ());
 
-            // if it's facial hair, there are entries in the category, and the character is not female, assign a random one. else bald
-            if (category == MarkingCategories.FacialHair)
-            {
-                newFacialHairStyle = markings.Count == 0 || sex == Sex.Female ? HairStyles.DefaultFacialHairStyle : random.Pick(markings);
-            }
-
-            // if it's hair, and there are hair styles, roll one. else bald
-            else if (category == MarkingCategories.Hair)
-            {
-                newHairStyle = markings.Count > 0 ? random.Pick(markings) : HairStyles.DefaultHairStyle;
-            }
-
-            // for every other category,
-            else if (markings.Count > 0)
-            {
-                // roll a die. currently a 1 in 3 chance per category, except Tails, which are 1 in 2 (because of the effect they have on the silhouettes of spiders and moths.)
-                int diceRoll;
-                if (category == MarkingCategories.Tail)
-                    diceRoll = random.Next(2);
-                else
-                    diceRoll = random.Next(3);
-
-                if (diceRoll == 0)
-                {
-                    MarkingPrototype? lastMarking = null;
-
-                    // roll to see how many markings from that category will be added. currently a maximum of 2.
-                    var loops = random.Next(2) + 1;
-
-                    // add a marking (loops) times
-                    for (var i = 0; i < loops; i++)
-                    {
-                        // pick a random marking from the list
-                        var protoToAdd = random.Pick(markingProtos);
-                        var markingToAdd = protoToAdd.AsMarking();
-                        Color markingColor;
-
-                        // prevent duplicates:
-                        if (lastMarking != null && lastMarking == protoToAdd)
-                            continue;
-
-                        // set gauze to white.
-                        // side note, I really hate that gauze isn't its own category. please fix that so that i can make this not suck as much.
-                        // or, like, give it its own color rules. or something.
-                        if (markingToAdd.MarkingId.Contains("gauze", StringComparison.OrdinalIgnoreCase))
-                        {
-                            markingToAdd.SetColor(Color.White);
-                            newMarkings.Add(markingToAdd);
-                            lastMarking = protoToAdd;
-                            continue;
-                        }
-
-                        // select a random color from our two secondary colors. if our marking is a Tail, add the skin color as well, otherwise lizards always look a little odd.
-                        // this will also make moths and spiders look less interesting on average, but I don't want a hardcoded exception for lizards.
-                        if (category == MarkingCategories.Tail)
-                            markingColor = random.Pick(colorPalette);
-                        else
-                            markingColor = random.Pick(colorPalette.Skip(0).ToList());
-
-                        // set the marking to that color
-                        markingToAdd.SetColor(markingColor);
-
-                        // otherwise, add it to the final list.
-                        newMarkings.Add(markingToAdd);
-                        lastMarking = protoToAdd;
-                    }
-                }
-            }
-        }
-
-        //Sunrise start
-        var speciesPrototype = IoCManager.Resolve<IPrototypeManager>().Index<SpeciesPrototype>(species);
-        var newWidth = random.NextFloat(speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
-        var newHeight = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
-        //Sunrise end
-
-        // at the end of all that, we should have new values for each of these, so we set the character appearance to these new values.
-        return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, newMarkings, MarkingEffectType.Color, null, MarkingEffectType.Color, null, newWidth, newHeight);
-
-        // helper functions:
         float RandomizeColor(float channel)
         {
             return MathHelper.Clamp01(channel + random.Next(-25, 25) / 100f);
         }
-
-        List<Color> GetComplementaryColors(Color color, double angle)
-        {
-            var hsl = Color.ToHsl(color);
-
-            var hVal = hsl.X + angle;
-            hVal = hVal >= 0.360 ? hVal - 0.360 : hVal;
-            var positiveHSL = new Robust.Shared.Maths.Vector4((float)hVal, hsl.Y, hsl.Z, hsl.W);
-
-            var hVal1 = hsl.X - angle;
-            hVal1 = hVal1 <= 0 ? hVal1 + 0.360 : hVal1;
-            var negativeHSL = new Robust.Shared.Maths.Vector4((float)hVal1, hsl.Y, hsl.Z, hsl.W);
-
-            var c0 = Color.FromHsl(positiveHSL);
-            var c1 = Color.FromHsl(negativeHSL);
-
-            var palette = new List<Color> { color, c0, c1 };
-            return palette;
-        }
-
-        // return a list of triadic complementary colors
-        List<Color> GetTriadicComplementaries(Color color)
-        {
-            return GetComplementaryColors(color, 0.120);
-        }
-
-        // return a list of split complementary colors
-        List<Color> GetSplitComplementaries(Color color)
-        {
-            return GetComplementaryColors(color, 0.150);
-        }
-
-        // return a list containing the base color and two copies of a single complemenary color
-        List<Color> GetOneComplementary(Color color)
-        {
-            return GetComplementaryColors(color, 0.180);
-        }
-
-        Color SquashToSkinLuminosity(Color skinColor, Color toSquash)
-        {
-            var skinColorHSL = Color.ToHsl(skinColor);
-            var toSquashHSL = Color.ToHsl(toSquash);
-
-            // check if the skin color is as dark as or darker than the marking color:
-            if (toSquashHSL.Z <= skinColorHSL.Z)
-            {
-                // if it is, don't fuck with it
-                return toSquash;
-            }
-
-            // otherwise, create a new color with the H, S, and A of toSquash, but the L of skinColor
-            var newColor = new Robust.Shared.Maths.Vector4(toSquashHSL.X, toSquashHSL.Y, skinColorHSL.Z, toSquashHSL.W);
-            return Color.FromHsl(newColor);
-        }
     }
 
     public static Color ClampColor(Color color)
@@ -520,6 +345,12 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
         }
         // sunrise gradient end
 
+        //Sunrise start
+        var speciesPrototype = IoCManager.Resolve<IPrototypeManager>().Index<SpeciesPrototype>(species);
+        var newWidth = random.NextFloat(speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
+        var newHeight = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+        //Sunrise end
+
         return new HumanoidCharacterAppearance(
             hairStyleId,
             hairColor,
diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index 6bdbd69c94..9fb7154982 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -12,6 +12,8 @@ namespace Content.Shared.Humanoid
     /// </summary>
     public sealed class NamingSystem : EntitySystem
     {
+        private static readonly ProtoId<SpeciesPrototype> FallbackSpecies = "Human";
+
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -21,8 +23,8 @@ namespace Content.Shared.Humanoid
             // Some downstream is probably gonna have this eventually but then they can deal with fallbacks.
             if (!_prototypeManager.TryIndex(species, out SpeciesPrototype? speciesProto))
             {
-                speciesProto = _prototypeManager.Index<SpeciesPrototype>("Human");
-                Log.Warning($"Unable to find species {species} for name, falling back to Human");
+                speciesProto = _prototypeManager.Index(FallbackSpecies);
+                Log.Warning($"Unable to find species {species} for name, falling back to {FallbackSpecies}");
             }
 
             switch (speciesProto.Naming)
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index f2946b8944..eeb94d4185 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Robust.Shared;
 using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -46,8 +47,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [Dependency] private readonly SharedIdentitySystem _identity = default!;
     private ISharedSponsorsManager? _sponsors;
 
-    [ValidatePrototypeId<SpeciesPrototype>]
-    public const string DefaultSpecies = "Human";
+    public static readonly ProtoId<SpeciesPrototype> DefaultSpecies = "Human";
 
     [ValidatePrototypeId<BodyTypePrototype>]
     public const string DefaultBodyType = "HumanNormal";
@@ -185,14 +185,13 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearanceComponent? sourceHumanoid = null,
         HumanoidAppearanceComponent? targetHumanoid = null)
     {
-        if (!Resolve(source, ref sourceHumanoid) || !Resolve(target, ref targetHumanoid))
+        if (!Resolve(source, ref sourceHumanoid, false) || !Resolve(target, ref targetHumanoid, false))
             return;
 
         targetHumanoid.Species = sourceHumanoid.Species;
         targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
-        SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
         SetTTSVoice(target, sourceHumanoid.Voice, targetHumanoid); // Sunrise-TTS
@@ -200,12 +199,9 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         targetHumanoid.Width = sourceHumanoid.Width; //Sunrise
         targetHumanoid.Height = sourceHumanoid.Height; //Sunrise
 
-        targetHumanoid.Gender = sourceHumanoid.Gender;
+        SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
+        SetGender((target, targetHumanoid), sourceHumanoid.Gender);
 
-        if (TryComp<GrammarComponent>(target, out var grammar))
-            _grammarSystem.SetGender((target, grammar), sourceHumanoid.Gender);
-
-        _identity.QueueIdentityUpdate(target);
         Dirty(target, targetHumanoid);
     }
 
@@ -308,6 +304,23 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
             Dirty(uid, humanoid);
     }
 
+    /// <summary>
+    /// Sets the gender in the entity's HumanoidAppearanceComponent and GrammarComponent.
+    /// </summary>
+    public void SetGender(Entity<HumanoidAppearanceComponent?> ent, Gender gender)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.Gender = gender;
+        Dirty(ent);
+
+        if (TryComp<GrammarComponent>(ent, out var grammar))
+            _grammarSystem.SetGender((ent, grammar), gender);
+
+        _identity.QueueIdentityUpdate(ent);
+    }
+
     /// <summary>
     ///     Sets the skin color of this humanoid mob. Will only affect base layers that are not custom,
     ///     custom base layers should use <see cref="SetBaseLayerColor"/> instead.
diff --git a/Content.Shared/Humanoid/SkinColor.cs b/Content.Shared/Humanoid/SkinColor.cs
index 025055c56d..aa42330863 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/Implants/Components/RattleComponent.cs b/Content.Shared/Implants/Components/RattleComponent.cs
deleted file mode 100644
index 3ec63e8e15..0000000000
--- a/Content.Shared/Implants/Components/RattleComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Radio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Implants.Components;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RattleComponent : Component
-{
-    // The radio channel the message will be sent to
-    [DataField]
-    public ProtoId<RadioChannelPrototype> RadioChannel = "Syndicate";
-
-    // The message that the implant will send when crit
-    [DataField]
-    public LocId CritMessage = "deathrattle-implant-critical-message";
-
-    // The message that the implant will send when dead
-    [DataField]
-    public LocId DeathMessage = "deathrattle-implant-dead-message";
-}
diff --git a/Content.Shared/Implants/Components/SubdermalImplantComponent.cs b/Content.Shared/Implants/Components/SubdermalImplantComponent.cs
index ccd76255c0..667d7019ef 100644
--- a/Content.Shared/Implants/Components/SubdermalImplantComponent.cs
+++ b/Content.Shared/Implants/Components/SubdermalImplantComponent.cs
@@ -71,11 +71,6 @@ public sealed partial class OpenStorageImplantEvent : InstantActionEvent
 
 }
 
-public sealed partial class UseFreedomImplantEvent : InstantActionEvent
-{
-
-}
-
 /// <summary>
 /// Used for triggering trigger events on the implant via action
 /// </summary>
@@ -91,13 +86,3 @@ public sealed partial class OpenUplinkImplantEvent : InstantActionEvent
 {
 
 }
-
-public sealed partial class UseScramImplantEvent : InstantActionEvent
-{
-
-}
-
-public sealed partial class UseDnaScramblerImplantEvent : InstantActionEvent
-{
-
-}
diff --git a/Content.Shared/Implants/Components/TriggerImplantActionComponent.cs b/Content.Shared/Implants/Components/TriggerImplantActionComponent.cs
deleted file mode 100644
index 0f9856f2a4..0000000000
--- a/Content.Shared/Implants/Components/TriggerImplantActionComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Implants.Components;
-
-/// <summary>
-/// Triggers implants when the action is pressed
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class TriggerImplantActionComponent : Component
-{
-
-}
diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs
index 09e555eb78..7685668b42 100644
--- a/Content.Shared/Implants/SharedImplanterSystem.cs
+++ b/Content.Shared/Implants/SharedImplanterSystem.cs
@@ -57,7 +57,7 @@ public abstract class SharedImplanterSystem : EntitySystem
 
     private void OnEntInserted(EntityUid uid, ImplanterComponent component, EntInsertedIntoContainerMessage args)
     {
-        var implantData = EntityManager.GetComponent<MetaDataComponent>(args.Entity);
+        var implantData = Comp<MetaDataComponent>(args.Entity);
         component.ImplantData = (implantData.EntityName, implantData.EntityDescription);
         ChangeOnImplantVisualizer(uid, component); // Sunrise-Edit
         Dirty(uid, component); // Sunrise-Edit
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index 9a20fbca2e..aa594d5035 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Actions;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
@@ -6,9 +7,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
-using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
-using System.Linq;
 
 namespace Content.Shared.Implants;
 
@@ -50,7 +49,8 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
             _actionsSystem.AddAction(component.ImplantedEntity.Value, ref component.Action, component.ImplantAction, uid);
         }
 
-        //replace micro bomb with macro bomb
+        // replace micro bomb with macro bomb
+        // TODO: this shouldn't be hardcoded here
         if (_container.TryGetContainer(component.ImplantedEntity.Value, ImplanterComponent.ImplantSlotId, out var implantContainer) && _tag.HasTag(uid, MacroBombTag))
         {
             foreach (var implant in implantContainer.ContainedEntities)
@@ -111,7 +111,7 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
     /// Add a list of implants to a person.
     /// Logs any implant ids that don't have <see cref="SubdermalImplantComponent"/>.
     /// </summary>
-    public void AddImplants(EntityUid uid, IEnumerable<String> implants)
+    public void AddImplants(EntityUid uid, IEnumerable<EntProtoId> implants)
     {
         foreach (var id in implants)
         {
@@ -200,7 +200,7 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
         if (!_container.TryGetContainer(uid, ImplanterComponent.ImplantSlotId, out var implantContainer))
             return;
 
-        var relayEv = new ImplantRelayEvent<T>(args);
+        var relayEv = new ImplantRelayEvent<T>(args, uid);
         foreach (var implant in implantContainer.ContainedEntities)
         {
             if (args is HandledEntityEventArgs { Handled : true })
@@ -215,9 +215,12 @@ public sealed class ImplantRelayEvent<T> where T : notnull
 {
     public readonly T Event;
 
-    public ImplantRelayEvent(T ev)
+    public readonly EntityUid ImplantedEntity;
+
+    public ImplantRelayEvent(T ev, EntityUid implantedEntity)
     {
         Event = ev;
+        ImplantedEntity = implantedEntity;
     }
 }
 
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index e505978c11..768ed5c3f2 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";
diff --git a/Content.Shared/Instruments/SharedInstrumentComponent.cs b/Content.Shared/Instruments/SharedInstrumentComponent.cs
index 97eef752eb..41bef64902 100644
--- a/Content.Shared/Instruments/SharedInstrumentComponent.cs
+++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Text;
 using Robust.Shared.Audio.Midi;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -207,6 +208,18 @@ public sealed class MidiTrack
             ProgramName = Truncate(ProgramName, limit);
     }
 
+    public void SanitizeFields()
+    {
+        if (InstrumentName != null)
+            InstrumentName = Sanitize(InstrumentName);
+
+        if (TrackName != null)
+            TrackName = Sanitize(TrackName);
+
+        if (ProgramName != null)
+            ProgramName = Sanitize(ProgramName);
+    }
+
     private const string Postfix = "…";
     // TODO: Make a general method to use in RT? idk if we have that.
     private string Truncate(string input, int limit)
@@ -218,4 +231,17 @@ public sealed class MidiTrack
 
         return input.Substring(0, truncatedLength) + Postfix;
     }
+
+    private static string Sanitize(string input)
+    {
+        var sanitized = new StringBuilder(input.Length);
+
+        foreach (char c in input)
+        {
+            if (!char.IsControl(c) && c <= 127) // no control characters, only ASCII
+                sanitized.Append(c);
+        }
+
+        return sanitized.ToString();
+    }
 }
diff --git a/Content.Shared/Intellicard/Components/IntellicardComponent.cs b/Content.Shared/Intellicard/Components/IntellicardComponent.cs
index e27174977f..5a299b1f80 100644
--- a/Content.Shared/Intellicard/Components/IntellicardComponent.cs
+++ b/Content.Shared/Intellicard/Components/IntellicardComponent.cs
@@ -20,20 +20,4 @@ public sealed partial class IntellicardComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public int UploadTime = 3;
-
-    /// <summary>
-    /// The sound that plays for the AI
-    /// when they are being downloaded
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier? WarningSound = new SoundPathSpecifier("/Audio/Misc/notice2.ogg");
-
-    /// <summary>
-    /// The delay before allowing the warning to play again in seconds.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TimeSpan WarningDelay = TimeSpan.FromSeconds(8);
-
-    [ViewVariables]
-    public TimeSpan NextWarningAllowed = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Interaction/Components/UnremoveableComponent.cs b/Content.Shared/Interaction/Components/UnremoveableComponent.cs
index cd10694865..a3606f3d2c 100644
--- a/Content.Shared/Interaction/Components/UnremoveableComponent.cs
+++ b/Content.Shared/Interaction/Components/UnremoveableComponent.cs
@@ -1,17 +1,14 @@
-using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Interaction.Components
+namespace Content.Shared.Interaction.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UnremoveableComponent : Component
 {
-    [RegisterComponent]
-    [NetworkedComponent]
-    public sealed partial class UnremoveableComponent : Component
-    {
-        /// <summary>
-        /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
-        /// Items within unremovable containers are not deleted when removed.
-        /// </summary>
-        [DataField("deleteOnDrop")]
-        public bool DeleteOnDrop = true;
-    }
+    /// <summary>
+    /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
+    /// Items within unremovable containers are not deleted when removed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteOnDrop = true;
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 978153f323..722aba75a1 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Database;
 using Content.Shared.Ghost;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
@@ -58,6 +59,7 @@ namespace Content.Shared.Interaction
         [Dependency] private readonly ISharedChatManager _chat = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookup = default!;
+        [Dependency] private readonly SharedHandsSystem _hands = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly PullingSystem _pullSystem = default!;
         [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
@@ -84,7 +86,11 @@ namespace Content.Shared.Interaction
         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;
@@ -344,7 +350,7 @@ namespace Content.Shared.Interaction
         public bool CombatModeCanHandInteract(EntityUid user, EntityUid? target)
         {
             // Always allow attack in these cases
-            if (target == null || !_handsQuery.TryComp(user, out var hands) || hands.ActiveHand?.HeldEntity is not null)
+            if (target == null || !_handsQuery.TryComp(user, out var hands) || _hands.GetActiveItem((user, hands)) is not null)
                 return false;
 
             // Only eat input if:
@@ -748,7 +754,7 @@ namespace Content.Shared.Interaction
             var inRange = true;
             MapCoordinates originPos = default;
             var targetPos = _transform.ToMapCoordinates(otherCoordinates);
-            Angle targetRot = default;
+            Angle targetRot = _transform.GetWorldRotation(otherCoordinates.EntityId) + otherAngle;
 
             // So essentially:
             // 1. If fixtures available check nearest point. We take in coordinates / angles because we might want to use a lag compensated position
@@ -767,8 +773,7 @@ namespace Content.Shared.Interaction
             {
                 var (worldPosA, worldRotA) = _transform.GetWorldPositionRotation(origin.Comp);
                 var xfA = new Transform(worldPosA, worldRotA);
-                var parentRotB = _transform.GetWorldRotation(otherCoordinates.EntityId);
-                var xfB = new Transform(targetPos.Position, parentRotB + otherAngle);
+                var xfB = new Transform(targetPos.Position, targetRot);
 
                 // Different map or the likes.
                 if (!_broadphase.TryGetNearest(
@@ -810,8 +815,6 @@ namespace Content.Shared.Interaction
             else
             {
                 originPos = _transform.GetMapCoordinates(origin, origin);
-                var otherParent = (other.Comp ?? Transform(other)).ParentUid;
-                targetRot = otherParent.IsValid() ? Transform(otherParent).LocalRotation + otherAngle : otherAngle;
             }
 
             // Do a raycast to check if relevant
@@ -852,7 +855,7 @@ namespace Content.Shared.Interaction
         /// if the target entity is a wallmount we ignore all other entities on the tile.
         /// </example>
         private Ignored GetPredicate(
-            MapCoordinates origin,
+            MapCoordinates originCoords,
             EntityUid target,
             MapCoordinates targetCoords,
             Angle targetRotation,
@@ -872,7 +875,7 @@ namespace Content.Shared.Interaction
                     if (target == otherEnt ||
                         !_physicsQuery.TryComp(otherEnt, out var otherBody) ||
                         !otherBody.CanCollide ||
-                        ((int) collisionMask & otherBody.CollisionLayer) == 0x0)
+                        ((int)collisionMask & otherBody.CollisionLayer) == 0x0)
                     {
                         continue;
                     }
@@ -889,7 +892,7 @@ namespace Content.Shared.Interaction
                     ignoreAnchored = true;
                 else
                 {
-                    var angle = Angle.FromWorldVec(origin.Position - targetCoords.Position);
+                    var angle = Angle.FromWorldVec(originCoords.Position - targetCoords.Position);
                     var angleDelta = (wallMount.Direction + targetRotation - angle).Reduced().FlipPositive();
                     ignoreAnchored = angleDelta < wallMount.Arc / 2 || Math.Tau - angleDelta < wallMount.Arc / 2;
                 }
diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs
index e49c6d4e58..63c2ae8f36 100644
--- a/Content.Shared/Interaction/SmartEquipSystem.cs
+++ b/Content.Shared/Interaction/SmartEquipSystem.cs
@@ -64,10 +64,10 @@ public sealed class SmartEquipSystem : EntitySystem
             return;
 
         // early out if we don't have any hands or a valid inventory slot
-        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHandId == null)
             return;
 
-        var handItem = hands.ActiveHand.HeldEntity;
+        var handItem = _hands.GetActiveItem((uid, hands));
 
         // can the user interact, and is the item interactable? e.g. virtual items
         if (!_actionBlocker.CanInteract(uid, handItem))
@@ -80,7 +80,7 @@ public sealed class SmartEquipSystem : EntitySystem
         }
 
         // early out if we have an item and cant drop it at all
-        if (handItem != null && !_hands.CanDropHeld(uid, hands.ActiveHand))
+        if (handItem != null && !_hands.CanDropHeld(uid, hands.ActiveHandId))
         {
             _popup.PopupClient(Loc.GetString("smart-equip-cant-drop"), uid, uid);
             return;
@@ -121,10 +121,50 @@ public sealed class SmartEquipSystem : EntitySystem
                 return;
             }
 
-            _hands.TryDrop(uid, hands.ActiveHand, handsComp: hands);
+            _hands.TryDrop((uid, hands), hands.ActiveHandId!);
             _inventory.TryEquip(uid, handItem.Value, equipmentSlot, predicted: true, checkDoafter:true);
             return;
-        } else if (TryComp<ItemSlotsComponent>(slotItem, out var slots)) // case 3 (itemslot item): // Sunrise-edit
+        }
+
+        // case 2 (storage item):
+        if (TryComp<StorageComponent>(slotItem, out var storage))
+        {
+            switch (handItem)
+            {
+                case null when storage.Container.ContainedEntities.Count == 0:
+                    _popup.PopupClient(emptyEquipmentSlotString, uid, uid);
+                    return;
+                case null:
+                    var removing = storage.Container.ContainedEntities[^1];
+                    _container.RemoveEntity(slotItem, removing);
+                    _hands.TryPickup(uid, removing, handsComp: hands);
+                    return;
+            }
+
+            if (!_storage.CanInsert(slotItem, handItem.Value, out var reason))
+            {
+                if (reason != null)
+                    _popup.PopupClient(Loc.GetString(reason), uid, uid);
+
+                return;
+            }
+
+            _hands.TryDrop((uid, hands), hands.ActiveHandId!);
+            _storage.Insert(slotItem, handItem.Value, out var stacked, out _);
+
+            // if the hand item stacked with the things in inventory, but there's no more space left for the rest
+            // of the stack, place the stack back in hand rather than dropping it on the floor
+            if (stacked != null && !_storage.CanInsert(slotItem, handItem.Value, out _))
+            {
+                if (TryComp<StackComponent>(handItem.Value, out var handStack) && handStack.Count > 0)
+                    _hands.TryPickup(uid, handItem.Value, handsComp: hands);
+            }
+
+            return;
+        }
+
+        // case 3 (itemslot item):
+        if (TryComp<ItemSlotsComponent>(slotItem, out var slots))
         {
             if (handItem == null)
             {
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 61e0114ff2..664fdd6d56 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.DisplacementMap;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Inventory;
 
@@ -10,28 +10,46 @@ namespace Content.Shared.Inventory;
 [AutoGenerateComponentState(true)]
 public sealed partial class InventoryComponent : Component
 {
-    [DataField("templateId", customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
-    [AutoNetworkedField]
-    public string TemplateId { get; set; } = "human";
+    /// <summary>
+    /// The template defining how the inventory layout will look like.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables] // use the API method
+    public ProtoId<InventoryTemplatePrototype> TemplateId = "human";
 
-    [DataField("speciesId")] public string? SpeciesId { get; set; }
+    /// <summary>
+    /// For setting the TemplateId.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<InventoryTemplatePrototype> TemplateIdVV
+    {
+        get => TemplateId;
+        set => IoCManager.Resolve<IEntityManager>().System<InventorySystem>().SetTemplateId((Owner, this), value);
+    }
 
+    [DataField, AutoNetworkedField]
+    public string? SpeciesId;
+
+
+    [ViewVariables]
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
+
+    [ViewVariables]
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> Displacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> FemaleDisplacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> MaleDisplacements = new();
 }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index f2fb3987b7..ae038b63f3 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -15,6 +15,7 @@ using Content.Shared.Strip.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -35,8 +36,7 @@ public abstract partial class InventorySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly SharedStrippableSystem _strippable = default!;
 
-    [ValidatePrototypeId<ItemSizePrototype>]
-    private const string PocketableItemSize = "Small";
+    private static readonly ProtoId<ItemSizePrototype> PocketableItemSize = "Small";
 
     private void InitializeEquip()
     {
@@ -83,7 +83,7 @@ public abstract partial class InventorySystem
         if (!TryComp(actor, out InventoryComponent? inventory) || !TryComp<HandsComponent>(actor, out var hands))
             return;
 
-        var held = hands.ActiveHandEntity;
+        var held = _handsSystem.GetActiveItem((actor, hands));
         TryGetSlotEntity(actor, ev.Slot, out var itemUid, inventory);
 
         // attempt to perform some interaction
@@ -115,7 +115,7 @@ public abstract partial class InventorySystem
             return;
         }
 
-        if (!_handsSystem.CanDropHeld(actor, hands.ActiveHand!, checkActionBlocker: false))
+        if (!_handsSystem.CanDropHeld(actor, hands.ActiveHandId!, checkActionBlocker: false))
             return;
 
         RaiseLocalEvent(held.Value, new HandDeselectedEvent(actor));
@@ -194,8 +194,6 @@ public abstract partial class InventorySystem
         if (triggerHandContact && !((slotDefinition.SlotFlags & SlotFlags.GLOVES) == 0))
             TriggerHandContactInteraction(target);
 
-        Dirty(target, inventory);
-
         _movementSpeed.RefreshMovementSpeedModifiers(target);
 
         return true;
@@ -487,8 +485,6 @@ public abstract partial class InventorySystem
         if (triggerHandContact && !((slotDefinition.SlotFlags & SlotFlags.GLOVES) == 0))
             TriggerHandContactInteraction(target);
 
-        Dirty(target, inventory);
-
         _movementSpeed.RefreshMovementSpeedModifiers(target);
 
         return true;
diff --git a/Content.Shared/Inventory/InventorySystem.Helpers.cs b/Content.Shared/Inventory/InventorySystem.Helpers.cs
index 746342e2f1..259c3b6c8d 100644
--- a/Content.Shared/Inventory/InventorySystem.Helpers.cs
+++ b/Content.Shared/Inventory/InventorySystem.Helpers.cs
@@ -16,12 +16,9 @@ public partial class InventorySystem
     {
         if (Resolve(user.Owner, ref user.Comp1, false))
         {
-            foreach (var hand in user.Comp1.Hands.Values)
+            foreach (var held in _handsSystem.EnumerateHeld(user))
             {
-                if (hand.HeldEntity == null)
-                    continue;
-
-                yield return hand.HeldEntity.Value;
+                yield return held;
             }
         }
 
@@ -76,12 +73,12 @@ public partial class InventorySystem
             return false;
 
         // Let's spawn this first...
-        var item = EntityManager.SpawnEntity(prototype, Transform(uid).Coordinates);
+        var item = Spawn(prototype, Transform(uid).Coordinates);
 
         // Helper method that deletes the item and returns false.
         bool DeleteItem()
         {
-            EntityManager.DeleteEntity(item);
+            Del(item);
             return false;
         }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 07e24c2939..3478a6c652 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -9,8 +9,10 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Electrocution;
+using Content.Shared.Emoting;
 using Content.Shared.Explosion;
 using Content.Shared.Eye.Blinding.Systems;
+using Content.Shared.Flash;
 using Content.Shared.Gravity;
 using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Implants;
@@ -18,6 +20,7 @@ using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Nutrition;
 using Content.Shared.Overlays;
 using Content.Shared.Projectiles;
 using Content.Shared.Radio;
@@ -55,6 +58,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, IsEquippingTargetAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, IsUnequippingTargetAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ChameleonControllerOutfitSelectedEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, BeforeEmoteEvent>(RelayInventoryEvent);
 
         // by-ref events
         SubscribeLocalEvent<InventoryComponent, RefreshFrictionModifiersEvent>(RefRelayInventoryEvent);
@@ -68,9 +72,11 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, ProjectileReflectAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, HitScanReflectAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, GetContrabandDetailsEvent>(RefRelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, FlashAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ShotAttemptedEvent>(RefRelayInventoryEvent); // Sunrise-Edit
         SubscribeLocalEvent<InventoryComponent, WieldAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, UnwieldAttemptEvent>(RefRelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(RefRelayInventoryEvent);
 
         // Eye/vision events
         SubscribeLocalEvent<InventoryComponent, CanSeeAttemptEvent>(RelayInventoryEvent);
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 04d58c1cd5..3f0bdf10d4 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.DisplacementMap;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
@@ -43,7 +44,7 @@ public partial class InventorySystem : EntitySystem
                 if (!TryComp<T>(item, out var required))
                     continue;
 
-                if ((((IClothingSlots) required).Slots & slot.SlotFlags) == 0x0)
+                if ((((IClothingSlots)required).Slots & slot.SlotFlags) == 0x0)
                     continue;
 
                 target = (item, required);
@@ -55,20 +56,27 @@ public partial class InventorySystem : EntitySystem
         return false;
     }
 
-    protected virtual void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because the template needs to be applied using the API method.
+    /// <summary>
+    public void CopyComponent(Entity<InventoryComponent?> source, EntityUid target)
     {
-        if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
+        if (!Resolve(source, ref source.Comp))
             return;
 
-        component.Slots = invTemplate.Slots;
-        component.Containers = new ContainerSlot[component.Slots.Length];
-        for (var i = 0; i < component.Containers.Length; i++)
-        {
-            var slot = component.Slots[i];
-            var container = _containerSystem.EnsureContainer<ContainerSlot>(uid, slot.Name);
-            container.OccludesLight = false;
-            component.Containers[i] = container;
-        }
+        var targetComp = EnsureComp<InventoryComponent>(target);
+        targetComp.SpeciesId = source.Comp.SpeciesId;
+        targetComp.Displacements = new Dictionary<string, DisplacementData>(source.Comp.Displacements);
+        targetComp.FemaleDisplacements = new Dictionary<string, DisplacementData>(source.Comp.FemaleDisplacements);
+        targetComp.MaleDisplacements = new Dictionary<string, DisplacementData>(source.Comp.MaleDisplacements);
+        SetTemplateId((target, targetComp), source.Comp.TemplateId);
+        Dirty(target, targetComp);
+    }
+
+    protected virtual void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
+    {
+        UpdateInventoryTemplate(ent);
     }
 
     private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleStateEvent args)
@@ -78,15 +86,31 @@ public partial class InventorySystem : EntitySystem
 
     protected virtual void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
     {
-        if (ent.Comp.LifeStage < ComponentLifeStage.Initialized)
+        if (!_prototypeManager.Resolve(ent.Comp.TemplateId, out var invTemplate))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.TemplateId, out InventoryTemplatePrototype? invTemplate))
-            return;
+        // Remove any containers that aren't in the new template.
+        foreach (var container in ent.Comp.Containers)
+        {
+            if (invTemplate.Slots.Any(s => s.Name == container.ID))
+                continue;
 
-        DebugTools.Assert(ent.Comp.Slots.Length == invTemplate.Slots.Length);
+            // Empty container before deletion so the contents don't get deleted.
+            // For cases when we update the template while items are already worn.
+            _containerSystem.EmptyContainer(container);
+            _containerSystem.ShutdownContainer(container);
+        }
 
+        // Ensure the containers from the template.
         ent.Comp.Slots = invTemplate.Slots;
+        ent.Comp.Containers = new ContainerSlot[ent.Comp.Slots.Length];
+        for (var i = 0; i < ent.Comp.Containers.Length; i++)
+        {
+            var slot = ent.Comp.Slots[i];
+            var container = _containerSystem.EnsureContainer<ContainerSlot>(ent.Owner, slot.Name);
+            container.OccludesLight = false;
+            ent.Comp.Containers[i] = container;
+        }
 
         var ev = new InventoryTemplateUpdated();
         RaiseLocalEvent(ent, ref ev);
@@ -195,27 +219,21 @@ public partial class InventorySystem : EntitySystem
     }
 
     /// <summary>
-    /// Change the inventory template ID an entity is using. The new template must be compatible.
+    /// Change the inventory template ID an entity is using
+    /// and drop any item that does not have a slot according to the new template.
+    /// This will update the client-side UI accordingly.
     /// </summary>
     /// <remarks>
-    /// <para>
-    /// For an inventory template to be compatible with another, it must have exactly the same slot names.
-    /// All other changes are rejected.
-    /// </para>
     /// </remarks>
     /// <param name="ent">The entity to update.</param>
     /// <param name="newTemplate">The ID of the new inventory template prototype.</param>
-    /// <exception cref="ArgumentException">
-    /// Thrown if the new template is not compatible with the existing one.
-    /// </exception>
     public void SetTemplateId(Entity<InventoryComponent> ent, ProtoId<InventoryTemplatePrototype> newTemplate)
     {
-        var newPrototype = _prototypeManager.Index(newTemplate);
-
-        if (!newPrototype.Slots.Select(x => x.Name).SequenceEqual(ent.Comp.Slots.Select(x => x.Name)))
-            throw new ArgumentException("Incompatible inventory template!");
+        if (ent.Comp.TemplateId == newTemplate)
+            return;
 
         ent.Comp.TemplateId = newTemplate;
+        UpdateInventoryTemplate(ent);
         Dirty(ent);
     }
 
@@ -231,12 +249,12 @@ public partial class InventorySystem : EntitySystem
         private int _nextIdx = 0;
         public static InventorySlotEnumerator Empty = new(Array.Empty<SlotDefinition>(), Array.Empty<ContainerSlot>());
 
-        public InventorySlotEnumerator(InventoryComponent inventory,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(InventoryComponent inventory, SlotFlags flags = SlotFlags.All)
             : this(inventory.Slots, inventory.Containers, flags)
         {
         }
 
-        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers, SlotFlags flags = SlotFlags.All)
         {
             DebugTools.Assert(flags != SlotFlags.NONE);
             DebugTools.AssertEqual(slots.Length, containers.Length);
diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
index 779ad18789..8842223afc 100644
--- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
+++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Hands;
-using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -8,7 +7,6 @@ using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
 using Content.Shared.Popups;
 using Robust.Shared.Containers;
-using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Inventory.VirtualItem;
@@ -32,8 +30,7 @@ public abstract class SharedVirtualItemSystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string VirtualItem = "VirtualItem";
+    private static readonly EntProtoId VirtualItem = "VirtualItem";
 
     public override void Initialize()
     {
@@ -88,9 +85,9 @@ public abstract class SharedVirtualItemSystem : EntitySystem
 
         // if the user is holding the real item the virtual item points to,
         // we allow them to use it in the interaction
-        foreach (var hand in _handsSystem.EnumerateHands(args.User))
+        foreach (var held in _handsSystem.EnumerateHeld(args.User))
         {
-            if (hand.HeldEntity == ent.Comp.BlockingEntity)
+            if (held == ent.Comp.BlockingEntity)
             {
                 args.Used = ent.Comp.BlockingEntity;
                 return;
@@ -112,7 +109,7 @@ public abstract class SharedVirtualItemSystem : EntitySystem
     }
 
     /// <inheritdoc cref="TrySpawnVirtualItemInHand(Robust.Shared.GameObjects.EntityUid,Robust.Shared.GameObjects.EntityUid,bool)"/>
-    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem, bool dropOthers = false, Hand? empty = null)
+    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem, bool dropOthers = false, string? empty = null)
     {
         virtualItem = null;
         if (empty == null && !_handsSystem.TryGetEmptyHand(user, out empty))
@@ -122,7 +119,7 @@ public abstract class SharedVirtualItemSystem : EntitySystem
 
             foreach (var hand in _handsSystem.EnumerateHands(user))
             {
-                if (hand.HeldEntity is not { } held)
+                if (!_handsSystem.TryGetHeldItem(user, hand, out var held))
                     continue;
 
                 if (held == blockingEnt)
@@ -155,11 +152,11 @@ public abstract class SharedVirtualItemSystem : EntitySystem
     /// </summary>
     public void DeleteInHandsMatching(EntityUid user, EntityUid matching)
     {
-        foreach (var hand in _handsSystem.EnumerateHands(user))
+        foreach (var held in _handsSystem.EnumerateHeld(user))
         {
-            if (TryComp(hand.HeldEntity, out VirtualItemComponent? virt) && virt.BlockingEntity == matching)
+            if (TryComp(held, out VirtualItemComponent? virt) && virt.BlockingEntity == matching)
             {
-                DeleteVirtualItem((hand.HeldEntity.Value, virt), user);
+                DeleteVirtualItem((held, virt), user);
             }
         }
     }
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 1575279596..1151d45d17 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -59,25 +59,37 @@ public sealed partial class ItemToggleComponent : Component
     /// /// <remarks>
     /// If server-side systems affect the item's toggle, like charge/fuel systems, then the item is not predictable.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool Predictable = true;
 
     /// <summary>
     ///     The noise this item makes when it is toggled on.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundActivate;
 
     /// <summary>
     ///     The noise this item makes when it is toggled off.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundDeactivate;
 
+    /// <summary>
+    ///     The popup to show to someone activating this item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? PopupActivate;
+
+    /// <summary>
+    ///     The popup to show to someone deactivating this item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? PopupDeactivate;
+
     /// <summary>
     ///     The noise this item makes when it is toggled on.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundFailToActivate;
 
     [ViewVariables(VVAccess.ReadWrite), DataField]
diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index c213f10911..4090982297 100644
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -186,30 +186,30 @@ public sealed class ItemToggleSystem : EntitySystem
     /// Sets its state to the opposite of what it is.
     /// </summary>
     /// <returns>Same as <see cref="TrySetActive"/></returns>
-    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
 
-        return TrySetActive(ent, !ent.Comp.Activated, user, predicted);
+        return TrySetActive(ent, !ent.Comp.Activated, user, predicted, showPopup);
     }
 
     /// <summary>
     /// Tries to set the activated bool from a value.
     /// </summary>
     /// <returns>false if the attempt fails for any reason</returns>
-    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true)
+    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (active)
-            return TryActivate(ent, user, predicted: predicted);
+            return TryActivate(ent, user, predicted: predicted, showPopup);
         else
-            return TryDeactivate(ent, user, predicted: predicted);
+            return TryDeactivate(ent, user, predicted: predicted, showPopup);
     }
 
     /// <summary>
     /// Used when an item is attempting to be activated. It returns false if the attempt fails any reason, interrupting the activation.
     /// </summary>
-    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
@@ -238,7 +238,7 @@ public sealed class ItemToggleSystem : EntitySystem
             else
                 _audio.PlayPvs(comp.SoundFailToActivate, uid);
 
-            if (attempt.Popup != null && user != null)
+            if (showPopup && attempt.Popup != null && user != null)
             {
                 if (predicted)
                     _popup.PopupClient(attempt.Popup, uid, user.Value);
@@ -249,14 +249,14 @@ public sealed class ItemToggleSystem : EntitySystem
             return false;
         }
 
-        Activate((uid, comp), predicted, user);
+        Activate((uid, comp), predicted, user, showPopup);
         return true;
     }
 
     /// <summary>
     /// Used when an item is attempting to be deactivated. It returns false if the attempt fails any reason, interrupting the deactivation.
     /// </summary>
-    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
@@ -280,7 +280,7 @@ public sealed class ItemToggleSystem : EntitySystem
             if (attempt.Silent)
                 return false;
 
-            if (attempt.Popup != null && user != null)
+            if (showPopup && attempt.Popup != null && user != null)
             {
                 if (predicted)
                     _popup.PopupClient(attempt.Popup, uid, user.Value);
@@ -291,18 +291,26 @@ public sealed class ItemToggleSystem : EntitySystem
             return false;
         }
 
-        Deactivate((uid, comp), predicted, user);
+        Deactivate((uid, comp), predicted, user, showPopup);
         return true;
     }
 
-    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
+    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null, bool showPopup = true)
     {
         var (uid, comp) = ent;
         var soundToPlay = comp.SoundActivate;
         if (predicted)
+        {
             _audio.PlayPredicted(soundToPlay, uid, user);
+            if (showPopup && ent.Comp.PopupActivate != null && user != null)
+                _popup.PopupClient(Loc.GetString(ent.Comp.PopupActivate), user.Value, user.Value);
+        }
         else
+        {
             _audio.PlayPvs(soundToPlay, uid);
+            if (showPopup && ent.Comp.PopupActivate != null && user != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.PopupActivate), user.Value, user.Value);
+        }
 
         comp.Activated = true;
         UpdateVisuals((uid, comp));
@@ -315,14 +323,22 @@ public sealed class ItemToggleSystem : EntitySystem
     /// <summary>
     /// Used to make the actual changes to the item's components on deactivation.
     /// </summary>
-    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
+    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null, bool showPopup = true)
     {
         var (uid, comp) = ent;
         var soundToPlay = comp.SoundDeactivate;
         if (predicted)
+        {
             _audio.PlayPredicted(soundToPlay, uid, user);
+            if (showPopup && ent.Comp.PopupDeactivate != null && user != null)
+                _popup.PopupClient(Loc.GetString(ent.Comp.PopupDeactivate), user.Value, user.Value);
+        }
         else
+        {
             _audio.PlayPvs(soundToPlay, uid);
+            if (showPopup && ent.Comp.PopupDeactivate != null && user != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.PopupDeactivate), user.Value, user.Value);
+        }
 
         comp.Activated = false;
         UpdateVisuals((uid, comp));
diff --git a/Content.Shared/Item/MultiHandedItemSystem.cs b/Content.Shared/Item/MultiHandedItemSystem.cs
index da9d895dd2..db64610eae 100644
--- a/Content.Shared/Item/MultiHandedItemSystem.cs
+++ b/Content.Shared/Item/MultiHandedItemSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Hands;
-using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Popups;
@@ -38,7 +37,7 @@ public sealed class MultiHandedItemSystem : EntitySystem
 
     private void OnAttemptPickup(Entity<MultiHandedItemComponent> ent, ref GettingPickedUpAttemptEvent args)
     {
-        if (TryComp<HandsComponent>(args.User, out var hands) && hands.CountFreeHands() >= ent.Comp.HandsNeeded)
+        if (_hands.CountFreeHands(args.User) >= ent.Comp.HandsNeeded)
             return;
 
         args.Cancel();
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index 578ec1c197..bcd7727a0a 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -111,7 +111,7 @@ public abstract class SharedItemSystem : EntitySystem
         if (args.Handled)
             return;
 
-        args.Handled = _handsSystem.TryPickup(args.User, uid, animateUser: false);
+        args.Handled = _handsSystem.TryPickup(args.User, uid, null, animateUser: false);
     }
 
     private void AddPickupVerb(EntityUid uid, ItemComponent component, GetVerbsEvent<InteractionVerb> args)
diff --git a/Content.Shared/Jittering/SharedJitteringSystem.cs b/Content.Shared/Jittering/SharedJitteringSystem.cs
index 1ac8413375..fd0758c3c4 100644
--- a/Content.Shared/Jittering/SharedJitteringSystem.cs
+++ b/Content.Shared/Jittering/SharedJitteringSystem.cs
@@ -25,7 +25,7 @@ namespace Content.Shared.Jittering
 
         private void OnRejuvenate(EntityUid uid, JitteringComponent component, RejuvenateEvent args)
         {
-            EntityManager.RemoveComponentDeferred<JitteringComponent>(uid);
+            RemCompDeferred<JitteringComponent>(uid);
         }
 
         /// <summary>
@@ -54,7 +54,7 @@ namespace Content.Shared.Jittering
 
             if (StatusEffects.TryAddStatusEffect<JitteringComponent>(uid, "Jitter", time, refresh, status))
             {
-                var jittering = EntityManager.GetComponent<JitteringComponent>(uid);
+                var jittering = Comp<JitteringComponent>(uid);
 
                 if(forceValueChange || jittering.Amplitude < amplitude)
                     jittering.Amplitude = amplitude;
diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs
index 80f4f62a31..8b701ff64e 100644
--- a/Content.Shared/Lathe/LatheComponent.cs
+++ b/Content.Shared/Lathe/LatheComponent.cs
@@ -29,7 +29,7 @@ namespace Content.Shared.Lathe
         /// The lathe's construction queue
         /// </summary>
         [DataField]
-        public List<LatheRecipePrototype> Queue = new();
+        public Queue<ProtoId<LatheRecipePrototype>> Queue = new();
 
         /// <summary>
         /// The sound that plays when the lathe is producing an item, if any
@@ -64,7 +64,7 @@ namespace Content.Shared.Lathe
         /// The recipe the lathe is currently producing
         /// </summary>
         [ViewVariables]
-        public LatheRecipePrototype? CurrentRecipe;
+        public ProtoId<LatheRecipePrototype>? CurrentRecipe;
 
         #region MachineUpgrading
         /// <summary>
diff --git a/Content.Shared/Lathe/LatheMessages.cs b/Content.Shared/Lathe/LatheMessages.cs
index 820c496d30..1c1c6440f1 100644
--- a/Content.Shared/Lathe/LatheMessages.cs
+++ b/Content.Shared/Lathe/LatheMessages.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Research.Prototypes;
+using NetSerializer;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
@@ -9,11 +10,11 @@ public sealed class LatheUpdateState : BoundUserInterfaceState
 {
     public List<ProtoId<LatheRecipePrototype>> Recipes;
 
-    public List<LatheRecipePrototype> Queue;
+    public ProtoId<LatheRecipePrototype>[] Queue;
 
-    public LatheRecipePrototype? CurrentlyProducing;
+    public ProtoId<LatheRecipePrototype>? CurrentlyProducing;
 
-    public LatheUpdateState(List<ProtoId<LatheRecipePrototype>> recipes, List<LatheRecipePrototype> queue, LatheRecipePrototype? currentlyProducing = null)
+    public LatheUpdateState(List<ProtoId<LatheRecipePrototype>> recipes, ProtoId<LatheRecipePrototype>[] queue, ProtoId<LatheRecipePrototype>? currentlyProducing = null)
     {
         Recipes = recipes;
         Queue = queue;
diff --git a/Content.Shared/Light/SharedHandheldLightSystem.cs b/Content.Shared/Light/SharedHandheldLightSystem.cs
index e93ca0a041..0f507e1365 100644
--- a/Content.Shared/Light/SharedHandheldLightSystem.cs
+++ b/Content.Shared/Light/SharedHandheldLightSystem.cs
@@ -1,10 +1,10 @@
 using Content.Shared.Actions;
 using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Item;
+using Content.Shared.Light;
 using Content.Shared.Light.Components;
 using Content.Shared.Toggleable;
 using Content.Shared.Verbs;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
@@ -63,6 +63,9 @@ public abstract class SharedHandheldLightSystem : EntitySystem
 
         Dirty(uid, component);
         UpdateVisuals(uid, component);
+
+        var ev = new LightToggleEvent(activated);
+        RaiseLocalEvent(uid, ev);
     }
 
     public void UpdateVisuals(EntityUid uid, HandheldLightComponent? component = null, AppearanceComponent? appearance = null)
diff --git a/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs b/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs
new file mode 100644
index 0000000000..94b8729476
--- /dev/null
+++ b/Content.Shared/Lock/ItemToggleRequiresLockComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for toggleable items that require the entity to have a lock in a certain state.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class ItemToggleRequiresLockComponent : Component
+{
+    /// <summary>
+    /// TRUE: the lock must be locked to toggle the item.
+    /// FALSE: the lock must be unlocked to toggle the item.
+    /// </summary>
+    [DataField]
+    public bool RequireLocked;
+}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index e6a6b649fd..8dc8683acc 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Storage.Components;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
+using Content.Shared.Item.ItemToggle.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
@@ -56,6 +57,8 @@ public sealed class LockSystem : EntitySystem
 
         SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
+
+        SubscribeLocalEvent<ItemToggleRequiresLockComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
     }
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
@@ -71,11 +74,13 @@ public sealed class LockSystem : EntitySystem
         // 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);
         }
     }
 
@@ -430,4 +435,19 @@ public sealed class LockSystem : EntitySystem
 
         _activatableUI.CloseAll(uid);
     }
+    private void OnActivateAttempt(EntityUid uid, ItemToggleRequiresLockComponent component, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.RequireLocked)
+        {
+            args.Cancelled = true;
+            if (lockComp.Locked)
+                _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+                ("target", Identity.Entity(uid, EntityManager))),
+                uid,
+                args.User);
+        }
+    }
 }
diff --git a/Content.Shared/Magic/Components/SpellbookComponent.cs b/Content.Shared/Magic/Components/SpellbookComponent.cs
index f1b307c245..69c2bac2a4 100644
--- a/Content.Shared/Magic/Components/SpellbookComponent.cs
+++ b/Content.Shared/Magic/Components/SpellbookComponent.cs
@@ -16,12 +16,14 @@ public sealed partial class SpellbookComponent : Component
     [ViewVariables]
     public readonly List<EntityUid> Spells = new();
 
+    // The three fields below are just used for initialization.
     /// <summary>
-    /// The three fields below is just used for initialization.
+    /// Dictionary of spell prototypes to charge counts.
+    /// If the charge count is null, it means the spell has infinite charges.
     /// </summary>
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public Dictionary<EntProtoId, int> SpellActions = new();
+    public Dictionary<EntProtoId, int?> SpellActions = new();
 
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 4bfe2e1fe5..19d649d1f3 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -62,6 +62,7 @@ public abstract class SharedMagicSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     private static readonly ProtoId<TagPrototype> InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";
 
@@ -158,7 +159,7 @@ public abstract class SharedMagicSystem : EntitySystem
 
                 if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
                     return new List<EntityCoordinates>();
-                if (!directionPos.TryGetTileRef(out var tileReference, EntityManager, _mapManager))
+                if (!_turf.TryGetTileRef(directionPos, out var tileReference))
                     return new List<EntityCoordinates>();
 
                 var tileIndex = tileReference.Value.GridIndices;
@@ -171,7 +172,7 @@ public abstract class SharedMagicSystem : EntitySystem
                 if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
                     return new List<EntityCoordinates>();
 
-                if (!directionPos.TryGetTileRef(out var tileReference, EntityManager, _mapManager))
+                if (!_turf.TryGetTileRef(directionPos, out var tileReference))
                     return new List<EntityCoordinates>();
 
                 var tileIndex = tileReference.Value.GridIndices;
@@ -358,7 +359,7 @@ public abstract class SharedMagicSystem : EntitySystem
             var component = (Component)Factory.GetComponent(name);
             var temp = (object)component;
             _seriMan.CopyTo(data.Component, ref temp);
-            EntityManager.AddComponent(target, (Component)temp!);
+            AddComp(target, (Component)temp!);
         }
     }
 
@@ -433,7 +434,7 @@ public abstract class SharedMagicSystem : EntitySystem
             return;
 
         EntityUid? wand = null;
-        foreach (var item in _hands.EnumerateHeld(ev.Performer, handsComp))
+        foreach (var item in _hands.EnumerateHeld((ev.Performer, handsComp)))
         {
             if (!_tag.HasTag(item, ev.WandTag))
                 continue;
@@ -509,8 +510,8 @@ public abstract class SharedMagicSystem : EntitySystem
             _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);
     }
 
     #endregion
diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs
index 6ef0a10b0c..ca01819bce 100644
--- a/Content.Shared/Magic/SpellbookSystem.cs
+++ b/Content.Shared/Magic/SpellbookSystem.cs
@@ -33,7 +33,9 @@ public sealed class SpellbookSystem : EntitySystem
             if (spell == null)
                 continue;
 
-            _sharedCharges.SetCharges(spell.Value, charges);
+            // Null means infinite charges.
+            if (charges is { } count)
+                _sharedCharges.SetCharges(spell.Value, count);
             ent.Comp.Spells.Add(spell.Value);
         }
     }
@@ -73,8 +75,9 @@ public sealed class SpellbookSystem : EntitySystem
             foreach (var (id, charges) in ent.Comp.SpellActions)
             {
                 EntityUid? actionId = null;
-                if (_actions.AddAction(args.Args.User, ref actionId, id))
-                    _sharedCharges.SetCharges(actionId.Value, charges);
+                if (_actions.AddAction(args.Args.User, ref actionId, id)
+                    && charges is { } count) // Null means infinite charges
+                    _sharedCharges.SetCharges(actionId.Value, count);
             }
         }
 
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 9fc4bee481..64975b5616 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -15,8 +15,7 @@ namespace Content.Shared.Maps
     [Prototype("tile")]
     public sealed partial class ContentTileDefinition : IPrototype, IInheritingPrototype, ITileDefinition
     {
-        [ValidatePrototypeId<ToolQualityPrototype>]
-        public const string PryingToolQuality = "Prying";
+        public static readonly ProtoId<ToolQualityPrototype> PryingToolQuality = "Prying";
 
         public const string SpaceID = "Space";
 
diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs
deleted file mode 100644
index dfa12f3d8f..0000000000
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using Content.Shared.Physics;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Maps
-{
-    // TODO move all these methods to LookupSystem or TurfSystem
-    // That, or make the interface arguments non-optional so people stop failing to pass them in.
-    public static class TurfHelpers
-    {
-        /// <summary>
-        ///     Attempts to get the turf at a certain coordinates or null if no such turf is found.
-        /// </summary>
-        public static TileRef? GetTileRef(this EntityCoordinates coordinates, IEntityManager? entityManager = null, IMapManager? mapManager = null)
-        {
-            entityManager ??= IoCManager.Resolve<IEntityManager>();
-
-            if (!coordinates.IsValid(entityManager))
-                return null;
-
-            mapManager ??= IoCManager.Resolve<IMapManager>();
-            var pos = entityManager.System<SharedTransformSystem>().ToMapCoordinates(coordinates);
-            if (!mapManager.TryFindGridAt(pos, out _, out var grid))
-                return null;
-
-            if (!grid.TryGetTileRef(coordinates, out var tile))
-                return null;
-
-            return tile;
-        }
-
-        public static bool TryGetTileRef(this EntityCoordinates coordinates, [NotNullWhen(true)] out TileRef? turf, IEntityManager? entityManager = null, IMapManager? mapManager = null)
-        {
-            return (turf = coordinates.GetTileRef(entityManager, mapManager)) != null;
-        }
-
-        /// <summary>
-        ///     Returns the content tile definition for a tile.
-        /// </summary>
-        public static ContentTileDefinition GetContentTileDefinition(this Tile tile, ITileDefinitionManager? tileDefinitionManager = null)
-        {
-            tileDefinitionManager ??= IoCManager.Resolve<ITileDefinitionManager>();
-            return (ContentTileDefinition)tileDefinitionManager[tile.TypeId];
-        }
-
-        /// <summary>
-        ///     Returns whether a tile is considered space.
-        /// </summary>
-        public static bool IsSpace(this Tile tile, ITileDefinitionManager? tileDefinitionManager = null)
-        {
-            return tile.GetContentTileDefinition(tileDefinitionManager).MapAtmosphere;
-        }
-
-        /// <summary>
-        ///     Returns the content tile definition for a tile ref.
-        /// </summary>
-        public static ContentTileDefinition GetContentTileDefinition(this TileRef tile, ITileDefinitionManager? tileDefinitionManager = null)
-        {
-            return tile.Tile.GetContentTileDefinition(tileDefinitionManager);
-        }
-
-        /// <summary>
-        ///     Returns whether a tile ref is considered space.
-        /// </summary>
-        public static bool IsSpace(this TileRef tile, ITileDefinitionManager? tileDefinitionManager = null)
-        {
-            return tile.Tile.IsSpace(tileDefinitionManager);
-        }
-
-        /// <summary>
-        ///     Helper that returns all entities in a turf.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        [Obsolete("Use the lookup system")]
-        public static IEnumerable<EntityUid> GetEntitiesInTile(this TileRef turf, LookupFlags flags = LookupFlags.Static, EntityLookupSystem? lookupSystem = null)
-        {
-            lookupSystem ??= EntitySystem.Get<EntityLookupSystem>();
-
-            if (!GetWorldTileBox(turf, out var worldBox))
-                return Enumerable.Empty<EntityUid>();
-
-            return lookupSystem.GetEntitiesIntersecting(turf.GridUid, worldBox, flags);
-        }
-
-        /// <summary>
-        ///     Helper that returns all entities in a turf.
-        /// </summary>
-        [Obsolete("Use the lookup system")]
-        public static IEnumerable<EntityUid> GetEntitiesInTile(this EntityCoordinates coordinates, LookupFlags flags = LookupFlags.Static, EntityLookupSystem? lookupSystem = null)
-        {
-            var turf = coordinates.GetTileRef();
-
-            if (turf == null)
-                return Enumerable.Empty<EntityUid>();
-
-            return GetEntitiesInTile(turf.Value, flags, lookupSystem);
-        }
-
-        /// <summary>
-        /// Checks if a turf has something dense on it.
-        /// </summary>
-        [Obsolete("Use turf system")]
-        public static bool IsBlockedTurf(this TileRef turf, bool filterMobs, EntityLookupSystem? physics = null)
-        {
-            CollisionGroup mask = filterMobs
-                ? CollisionGroup.MobMask
-                : CollisionGroup.Impassable;
-
-            return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<TurfSystem>().IsTileBlocked(turf, mask);
-        }
-
-        /// <summary>
-        /// Creates a box the size of a tile, at the same position in the world as the tile.
-        /// </summary>
-        [Obsolete]
-        private static bool GetWorldTileBox(TileRef turf, out Box2Rotated res)
-        {
-            var entManager = IoCManager.Resolve<IEntityManager>();
-            var xformSystem = entManager.System<SharedTransformSystem>();
-
-            if (entManager.TryGetComponent<MapGridComponent>(turf.GridUid, out var tileGrid))
-            {
-                var gridRot = xformSystem.GetWorldRotation(turf.GridUid);
-
-                // This is scaled to 90 % so it doesn't encompass walls on other tiles.
-                var tileBox = Box2.UnitCentered.Scale(0.9f);
-                tileBox = tileBox.Scale(tileGrid.TileSize);
-                var worldPos = tileGrid.GridTileToWorldPos(turf.GridIndices);
-                tileBox = tileBox.Translated(worldPos);
-                // Now tileBox needs to be rotated to match grid rotation
-                res = new Box2Rotated(tileBox, gridRot, worldPos);
-                return true;
-            }
-
-            // Have to "return something"
-            res = Box2Rotated.UnitCentered;
-            return false;
-        }
-    }
-}
diff --git a/Content.Shared/Maps/TurfSystem.cs b/Content.Shared/Maps/TurfSystem.cs
index 8a4bbf68be..f5477441d9 100644
--- a/Content.Shared/Maps/TurfSystem.cs
+++ b/Content.Shared/Maps/TurfSystem.cs
@@ -1,8 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Numerics;
 using Content.Shared.Physics;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
+using Robust.Shared.Toolshed.Commands.Values;
 
 namespace Content.Shared.Maps;
 
@@ -11,8 +14,43 @@ namespace Content.Shared.Maps;
 /// </summary>
 public sealed class TurfSystem : EntitySystem
 {
+    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly ITileDefinitionManager _tileDefinitions = default!;
+
+
+    /// <summary>
+    /// Attempts to get the turf at or under some given coordinates or null if no such turf exists.
+    /// </summary>
+    /// <param name="coordinates">The coordinates to search for a turf.</param>
+    /// <returns>A <see cref="TileRef"/> for the turf found at the given coordinates or null if no such turf exists.</returns>
+    public TileRef? GetTileRef(EntityCoordinates coordinates)
+    {
+        if (!coordinates.IsValid(EntityManager))
+            return null;
+
+        var pos = _transform.ToMapCoordinates(coordinates);
+        if (!_mapManager.TryFindGridAt(pos, out var gridUid, out var gridComp))
+            return null;
+
+        if (!_mapSystem.TryGetTileRef(gridUid, gridComp, coordinates, out var tile))
+            return null;
+
+        return tile;
+    }
+
+    /// <summary>
+    /// Attempts to get the turf at or under some given coordinates.
+    /// </summary>
+    /// <param name="coordinates">The coordinates to search for a turf.</param>
+    /// <param name="tile">Returns the turf found at the given coordinates if any.</param>
+    /// <returns>True if a turf was found at the given coordinates, false otherwise.</returns>
+    public bool TryGetTileRef(EntityCoordinates coordinates, [NotNullWhen(true)] out TileRef? tile)
+    {
+        return (tile = GetTileRef(coordinates)) is not null;
+    }
 
     /// <summary>
     ///     Returns true if a given tile is blocked by physics-enabled entities.
@@ -63,14 +101,14 @@ public sealed class TurfSystem : EntitySystem
             rot -= gridRot;
             pos = (-gridRot).RotateVec(pos - gridPos);
 
-            var xform = new Transform(pos, (float) rot.Theta);
+            var xform = new Transform(pos, (float)rot.Theta);
 
             foreach (var fixture in fixtures.Fixtures.Values)
             {
                 if (!fixture.Hard)
                     continue;
 
-                if ((fixture.CollisionLayer & (int) mask) == 0)
+                if ((fixture.CollisionLayer & (int)mask) == 0)
                     continue;
 
                 for (var i = 0; i < fixture.Shape.ChildCount; i++)
@@ -86,6 +124,26 @@ public sealed class TurfSystem : EntitySystem
         return false;
     }
 
+    /// <summary>
+    /// Returns whether a tile is considered to be space or directly exposed to space.
+    /// </summary>
+    /// <param name="tile">The tile in question.</param>
+    /// <returns>True if the tile is considered to be space, false otherwise.</returns>
+    public bool IsSpace(Tile tile)
+    {
+        return GetContentTileDefinition(tile).MapAtmosphere;
+    }
+
+    /// <summary>
+    /// Returns whether a tile is considered to be space or directly exposed to space.
+    /// </summary>
+    /// <param name="tile">The tile in question.</param>
+    /// <returns>True if the tile is considered to be space, false otherwise.</returns>
+    public bool IsSpace(TileRef tile)
+    {
+        return IsSpace(tile.Tile);
+    }
+
     /// <summary>
     /// Returns the location of the centre of the tile in grid coordinates.
     /// </summary>
@@ -95,4 +153,78 @@ public sealed class TurfSystem : EntitySystem
         var center = (turf.GridIndices + new Vector2(0.5f, 0.5f)) * grid.TileSize;
         return new EntityCoordinates(turf.GridUid, center);
     }
+
+    /// <summary>
+    ///     Returns the content tile definition for a tile.
+    /// </summary>
+    public ContentTileDefinition GetContentTileDefinition(Tile tile)
+    {
+        return (ContentTileDefinition)_tileDefinitions[tile.TypeId];
+    }
+
+    /// <summary>
+    ///     Returns the content tile definition for a tile ref.
+    /// </summary>
+    public ContentTileDefinition GetContentTileDefinition(TileRef tile)
+    {
+        return GetContentTileDefinition(tile.Tile);
+    }
+
+    /// <summary>
+    ///     Collects all of the entities intersecting with the turf at a given position into a provided <see cref="HashSet{EntityUid}"/>
+    /// </summary>
+    /// <param name="coords">The position of the turf to search for entities.</param>
+    /// <param name="intersecting">The hashset used to collect the relevant entities.</param>
+    /// <param name="flags">A set of lookup categories to search for relevant entities.</param>
+    public void GetEntitiesInTile(EntityCoordinates coords, HashSet<EntityUid> intersecting, LookupFlags flags = LookupFlags.Static)
+    {
+        if (!TryGetTileRef(coords, out var tileRef))
+            return;
+
+        _entityLookup.GetEntitiesInTile(tileRef.Value, intersecting, flags);
+    }
+
+    /// <summary>
+    ///     Returns a collection containing all of the entities overlapping with the turf at a given position.
+    /// </summary>
+    /// <inheritdoc cref="GetEntitiesInTile(EntityCoordinates, HashSet{EntityUid}, LookupFlags)"/>
+    /// <returns>A hashset containing all of the entities overlapping with the turf in question.</returns>
+    public HashSet<EntityUid> GetEntitiesInTile(EntityCoordinates coords, LookupFlags flags = LookupFlags.Static)
+    {
+        if (!TryGetTileRef(coords, out var tileRef))
+            return [];
+
+        return _entityLookup.GetEntitiesInTile(tileRef.Value, flags);
+    }
+}
+
+/// <summary>
+///     Extension methods for looking up entities with respect to given turfs.
+/// </summary>
+public static partial class TurfLookupExtensions
+{
+    /// <summary>
+    ///     Collects all of the entities overlapping with a given turf into a provided <see cref="HashSet{EntityUid}"/>.
+    /// </summary>
+    /// <param name="turf">The turf in question.</param>
+    /// <param name="intersecting">The hashset used to collect the relevant entities.</param>
+    /// <param name="flags">A set of lookup categories to search for relevant entities.</param>
+    public static void GetEntitiesInTile(this EntityLookupSystem lookupSystem, TileRef turf, HashSet<EntityUid> intersecting, LookupFlags flags = LookupFlags.Static)
+    {
+        var bounds = lookupSystem.GetWorldBounds(turf);
+        bounds.Box = bounds.Box.Scale(0.9f); // Otherwise the box can clip into neighboring tiles.
+        lookupSystem.GetEntitiesIntersecting(turf.GridUid, bounds, intersecting, flags);
+    }
+
+    /// <summary>
+    ///     Returns a collection containing all of the entities overlapping with a given turf.
+    /// </summary>
+    /// <inheritdoc cref="GetEntitiesInTile(EntityLookupSystem, TileRef, HashSet{EntityUid}, LookupFlags)"/>
+    /// <returns>A hashset containing all of the entities overlapping with the turf in question.</returns>
+    public static HashSet<EntityUid> GetEntitiesInTile(this EntityLookupSystem lookupSystem, TileRef turf, LookupFlags flags = LookupFlags.Static)
+    {
+        var intersecting = new HashSet<EntityUid>();
+        lookupSystem.GetEntitiesInTile(turf, intersecting, flags);
+        return intersecting;
+    }
 }
diff --git a/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
index e242fd7502..d017ef73aa 100644
--- a/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
@@ -1,9 +1,9 @@
-namespace Content.Shared.Medical.Cryogenics;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Cryogenics;
 
 /// <summary>
 /// Tracking component for an enabled cryo pod (which periodically tries to inject chemicals in the occupant, if one exists)
 /// </summary>
-[RegisterComponent]
-public sealed partial class ActiveCryoPodComponent : Component
-{
-}
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveCryoPodComponent : Component;
diff --git a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
index 43244a5f0d..ed9e9cb904 100644
--- a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
@@ -1,57 +1,68 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Tools;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Medical.Cryogenics;
 
+/// <summary>
+/// Component for medical cryo pods.
+/// Handles transferring reagents from a beaker slot into an inserted mob, as well as exposing them to connected atmos pipes.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class CryoPodComponent : Component
 {
+    /// <summary>
+    /// The name of the container the patient is stored in.
+    /// </summary>
+    public const string BodyContainerName = "scanner-body";
+
     /// <summary>
     /// Specifies the name of the atmospherics port to draw gas from.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("port")]
-    public string PortName { get; set; } = "port";
+    [DataField]
+    public string PortName = "port";
 
     /// <summary>
-    /// Specifies the name of the slot that holds beaker with medicine.
+    /// Specifies the name of the slot that holds the beaker with medicine.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("solutionContainerName")]
-    public string SolutionContainerName { get; set; } = "beakerSlot";
+    [DataField]
+    public string SolutionContainerName = "beakerSlot";
 
     /// <summary>
-    /// How often (seconds) are chemicals transferred from the beaker to the body?
+    /// How often are chemicals transferred from the beaker to the body?
+    /// (injection interval)
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("beakerTransferTime")]
-    public float BeakerTransferTime = 1f;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("nextInjectionTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
-    public TimeSpan? NextInjectionTime;
+    [DataField]
+    public TimeSpan BeakerTransferTime = TimeSpan.FromSeconds(1);
 
     /// <summary>
-    /// How many units to transfer per tick from the beaker to the mob?
+    /// The timestamp for the next injection.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("beakerTransferAmount")]
-    public float BeakerTransferAmount = 1f;
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextInjectionTime = TimeSpan.Zero;
 
     /// <summary>
-    ///     Delay applied when inserting a mob in the pod.
+    /// How many units to transfer per injection from the beaker to the mob?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("entryDelay")]
+    [DataField]
+    public FixedPoint2 BeakerTransferAmount = 1;
+
+    /// <summary>
+    /// Delay applied when inserting a mob in the pod (in seconds).
+    /// </summary>
+    [DataField]
     public float EntryDelay = 2f;
 
     /// <summary>
-    /// Delay applied when trying to pry open a locked pod.
+    /// Delay applied when trying to pry open a locked pod (in seconds).
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("pryDelay")]
+    [DataField]
     public float PryDelay = 5f;
 
     /// <summary>
@@ -63,21 +74,25 @@ public sealed partial class CryoPodComponent : Component
     /// <summary>
     /// If true, the eject verb will not work on the pod and the user must use a crowbar to pry the pod open.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("locked")]
-    public bool Locked { get; set; }
+    [DataField, AutoNetworkedField]
+    public bool Locked;
 
     /// <summary>
     /// Causes the pod to be locked without being fixable by messing with wires.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("permaLocked")]
-    public bool PermaLocked { get; set; }
+    [DataField, AutoNetworkedField]
+    public bool PermaLocked;
 
-    [Serializable, NetSerializable]
-    public enum CryoPodVisuals : byte
-    {
-        ContainsEntity,
-        IsOn
-    }
+    /// <summary>
+    /// The tool quality needed to eject a body when the pod is locked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ToolQualityPrototype> UnlockToolQuality = "Prying";
+}
+
+[Serializable, NetSerializable]
+public enum CryoPodVisuals : byte
+{
+    ContainsEntity,
+    IsOn
 }
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index 88a266935f..083e6d884c 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -1,39 +1,212 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Climbing.Systems;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Standing;
 using Content.Shared.Stunnable;
+using Content.Shared.Tools.Systems;
+using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Medical.Cryogenics;
 
-public abstract partial class SharedCryoPodSystem: EntitySystem
+public abstract partial class SharedCryoPodSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private readonly SharedStandingStateSystem _standingStateSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedStandingStateSystem _standingState = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ClimbSystem _climb = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly SharedToolSystem _tool = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ReactiveSystem _reactive = default!;
+
+    private EntityQuery<BloodstreamComponent> _bloodstreamQuery;
+    private EntityQuery<ItemSlotsComponent> _itemSlotsQuery;
+    private EntityQuery<FitsInDispenserComponent> _dispenserQuery;
+    private EntityQuery<SolutionContainerManagerComponent> _solutionContainerQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<CryoPodComponent, CanDropTargetEvent>(OnCryoPodCanDropOn);
+        SubscribeLocalEvent<CryoPodComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
+        SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<CryoPodComponent, CryoPodDragFinished>(OnDragFinished);
+        SubscribeLocalEvent<CryoPodComponent, CryoPodPryFinished>(OnCryoPodPryFinished);
+        SubscribeLocalEvent<CryoPodComponent, DragDropTargetEvent>(HandleDragDropOn);
+        SubscribeLocalEvent<CryoPodComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<CryoPodComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
+
+        _bloodstreamQuery = GetEntityQuery<BloodstreamComponent>();
+        _itemSlotsQuery = GetEntityQuery<ItemSlotsComponent>();
+        _dispenserQuery = GetEntityQuery<FitsInDispenserComponent>();
+        _solutionContainerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
+
         InitializeInsideCryoPod();
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveCryoPodComponent, CryoPodComponent>();
+
+        while (query.MoveNext(out var uid, out _, out var cryoPod))
+        {
+            if (curTime < cryoPod.NextInjectionTime)
+                continue;
+
+            cryoPod.NextInjectionTime += cryoPod.BeakerTransferTime;
+            Dirty(uid, cryoPod);
+
+            if (!_itemSlotsQuery.TryComp(uid, out var itemSlotsComponent))
+                continue;
+
+            var container = _itemSlots.GetItemOrNull(uid, cryoPod.SolutionContainerName, itemSlotsComponent);
+            var patient = cryoPod.BodyContainer.ContainedEntity;
+            if (container != null
+                && container.Value.Valid
+                && patient != null
+                && _dispenserQuery.TryComp(container, out var fitsInDispenserComponent)
+                && _solutionContainerQuery.TryComp(container, out var solutionContainerManagerComponent)
+                && _solutionContainer.TryGetFitsInDispenser((container.Value, fitsInDispenserComponent, solutionContainerManagerComponent),
+                    out var containerSolution, out _)
+                && _bloodstreamQuery.TryComp(patient, out var bloodstream))
+            {
+                var solutionToInject = _solutionContainer.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
+                _bloodstream.TryAddToChemicals((patient.Value, bloodstream), solutionToInject);
+                _reactive.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
+            }
+        }
+    }
+
+    private void HandleDragDropOn(Entity<CryoPodComponent> ent, ref DragDropTargetEvent args)
+    {
+        if (ent.Comp.BodyContainer.ContainedEntity != null)
+            return;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.EntryDelay, new CryoPodDragFinished(), ent, target: args.Dragged, used: ent)
+        {
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = false,
+        };
+        _doAfter.TryStartDoAfter(doAfterArgs);
+        args.Handled = true;
+    }
+
+    private void OnDragFinished(Entity<CryoPodComponent> ent, ref CryoPodDragFinished args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        if (InsertBody(ent.Owner, args.Args.Target.Value, ent.Comp))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Medium,
+                $"{ToPrettyString(args.User)} inserted {ToPrettyString(args.Args.Target.Value)} into {ToPrettyString(ent.Owner)}");
+        }
+        args.Handled = true;
+    }
+
+    private void OnActivateUIAttempt(Entity<CryoPodComponent> ent, ref ActivatableUIOpenAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        var containedEntity = ent.Comp.BodyContainer.ContainedEntity;
+        if (containedEntity == null || containedEntity == args.User || !HasComp<ActiveCryoPodComponent>(ent))
+            args.Cancel();
+    }
+
+    private void OnInteractUsing(Entity<CryoPodComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled || !ent.Comp.Locked || ent.Comp.BodyContainer.ContainedEntity == null)
+            return;
+
+        args.Handled = _tool.UseTool(args.Used, args.User, ent.Owner, ent.Comp.PryDelay, ent.Comp.UnlockToolQuality, new CryoPodPryFinished());
+    }
+
+    private void OnCryoPodPryFinished(EntityUid uid, CryoPodComponent cryoPodComponent, CryoPodPryFinished args)
+    {
+        if (args.Cancelled)
+            return;
+
+        var ejected = EjectBody(uid, cryoPodComponent);
+        if (ejected != null)
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ejected.Value)} pried out of {ToPrettyString(uid)} by {ToPrettyString(args.User)}");
+    }
+
+    private void OnPowerChanged(Entity<CryoPodComponent> ent, ref PowerChangedEvent args)
+    {
+        // Needed to avoid adding/removing components on a deleted entity
+        if (Terminating(ent))
+            return;
+
+        if (args.Powered)
+        {
+            EnsureComp<ActiveCryoPodComponent>(ent);
+            ent.Comp.NextInjectionTime = _timing.CurTime + ent.Comp.BeakerTransferTime;
+            Dirty(ent);
+        }
+        else
+        {
+            RemComp<ActiveCryoPodComponent>(ent);
+            _ui.CloseUi(ent.Owner, HealthAnalyzerUiKey.Key);
+        }
+
+        UpdateAppearance(ent.Owner, ent.Comp);
+    }
+
+    private void OnExamined(Entity<CryoPodComponent> entity, ref ExaminedEvent args)
+    {
+        var container = _itemSlots.GetItemOrNull(entity.Owner, entity.Comp.SolutionContainerName);
+        if (args.IsInDetailsRange && container != null && _solutionContainer.TryGetFitsInDispenser(container.Value, out _, out var containerSolution))
+        {
+            using (args.PushGroup(nameof(CryoPodComponent)))
+            {
+                args.PushMarkup(Loc.GetString("cryo-pod-examine", ("beaker", Name(container.Value))));
+                if (containerSolution.Volume == 0)
+                {
+                    args.PushMarkup(Loc.GetString("cryo-pod-empty-beaker"));
+                }
+            }
+        }
+    }
+
     private void OnCryoPodCanDropOn(EntityUid uid, CryoPodComponent component, ref CanDropTargetEvent args)
     {
         if (args.Handled)
@@ -43,12 +216,12 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
         args.Handled = true;
     }
 
-    protected void OnComponentInit(EntityUid uid, CryoPodComponent cryoPodComponent, ComponentInit args)
+    private void OnComponentInit(EntityUid uid, CryoPodComponent cryoPodComponent, ComponentInit args)
     {
-        cryoPodComponent.BodyContainer = _containerSystem.EnsureContainer<ContainerSlot>(uid, "scanner-body");
+        cryoPodComponent.BodyContainer = _container.EnsureContainer<ContainerSlot>(uid, CryoPodComponent.BodyContainerName);
     }
 
-    protected void UpdateAppearance(EntityUid uid, CryoPodComponent? cryoPod = null, AppearanceComponent? appearance = null)
+    private void UpdateAppearance(EntityUid uid, CryoPodComponent? cryoPod = null, AppearanceComponent? appearance = null)
     {
         if (!Resolve(uid, ref cryoPod))
             return;
@@ -57,14 +230,14 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
 
         if (_light.TryGetLight(uid, out var light))
         {
-            _light.SetEnabled(uid, cryoPodEnabled && cryoPod.BodyContainer.ContainedEntity != null, light);
+            _light.SetEnabled(uid, cryoPodEnabled && cryoPod.BodyContainer?.ContainedEntity != null, light);
         }
 
         if (!Resolve(uid, ref appearance))
             return;
 
-        _appearanceSystem.SetData(uid, CryoPodComponent.CryoPodVisuals.ContainsEntity, cryoPod.BodyContainer.ContainedEntity == null, appearance);
-        _appearanceSystem.SetData(uid, CryoPodComponent.CryoPodVisuals.IsOn, cryoPodEnabled, appearance);
+        _appearance.SetData(uid, CryoPodVisuals.ContainsEntity, cryoPod.BodyContainer?.ContainedEntity == null, appearance);
+        _appearance.SetData(uid, CryoPodVisuals.IsOn, cryoPodEnabled, appearance);
     }
 
     public bool InsertBody(EntityUid uid, EntityUid target, CryoPodComponent cryoPodComponent)
@@ -76,10 +249,10 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
             return false;
 
         var xform = Transform(target);
-        _containerSystem.Insert((target, xform), cryoPodComponent.BodyContainer);
+        _container.Insert((target, xform), cryoPodComponent.BodyContainer);
 
         EnsureComp<InsideCryoPodComponent>(target);
-        _standingStateSystem.Stand(target, force: true); // Force-stand the mob so that the cryo pod sprite overlays it fully
+        _standingState.Stand(target, force: true); // Force-stand the mob so that the cryo pod sprite overlays it fully
 
         UpdateAppearance(uid, cryoPodComponent);
         return true;
@@ -94,7 +267,7 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
 
         if (cryoPodComponent.Locked)
         {
-            _popupSystem.PopupEntity(Loc.GetString("cryo-pod-locked"), uid, userId);
+            _popup.PopupClient(Loc.GetString("cryo-pod-locked"), uid, userId);
             return;
         }
 
@@ -109,28 +282,25 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
     /// <param name="uid">The cryopod entity</param>
     /// <param name="cryoPodComponent">Cryopod component of <see cref="uid"/></param>
     /// <returns>Ejected entity</returns>
-    public virtual EntityUid? EjectBody(EntityUid uid, CryoPodComponent? cryoPodComponent)
+    public EntityUid? EjectBody(EntityUid uid, CryoPodComponent? cryoPodComponent)
     {
         if (!Resolve(uid, ref cryoPodComponent))
             return null;
 
-        if (cryoPodComponent.BodyContainer.ContainedEntity is not {Valid: true} contained)
+        if (cryoPodComponent.BodyContainer.ContainedEntity is not { Valid: true } contained)
             return null;
 
-        _containerSystem.Remove(contained, cryoPodComponent.BodyContainer);
+        _container.Remove(contained, cryoPodComponent.BodyContainer);
         // InsideCryoPodComponent is removed automatically in its EntGotRemovedFromContainerMessage listener
         // RemComp<InsideCryoPodComponent>(contained);
 
         // Restore the correct position of the patient. Checking the components manually feels hacky, but I did not find a better way for now.
-        if (HasComp<KnockedDownComponent>(contained) || _mobStateSystem.IsIncapacitated(contained))
-        {
-            _standingStateSystem.Down(contained);
-        }
+        if (HasComp<KnockedDownComponent>(contained) || _mobState.IsIncapacitated(contained))
+            _standingState.Down(contained);
         else
-        {
-            _standingStateSystem.Stand(contained);
-        }
+            _standingState.Stand(contained);
 
+        _climb.ForciblySetClimbing(contained, uid);
         UpdateAppearance(uid, cryoPodComponent);
         return contained;
     }
@@ -166,26 +336,13 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
 
         cryoPodComponent.PermaLocked = true;
         cryoPodComponent.Locked = true;
+        Dirty(uid, cryoPodComponent);
         args.Handled = true;
     }
 
-    protected void OnCryoPodPryFinished(EntityUid uid, CryoPodComponent cryoPodComponent, CryoPodPryFinished args)
-    {
-        if (args.Cancelled)
-            return;
-
-        var ejected = EjectBody(uid, cryoPodComponent);
-        if (ejected != null)
-            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ejected.Value)} pried out of {ToPrettyString(uid)} by {ToPrettyString(args.User)}");
-    }
+    [Serializable, NetSerializable]
+    public sealed partial class CryoPodPryFinished : SimpleDoAfterEvent;
 
     [Serializable, NetSerializable]
-    public sealed partial class CryoPodPryFinished : SimpleDoAfterEvent
-    {
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class CryoPodDragFinished : SimpleDoAfterEvent
-    {
-    }
+    public sealed partial class CryoPodDragFinished : SimpleDoAfterEvent;
 }
diff --git a/Content.Shared/Medical/Healing/HealingComponent.cs b/Content.Shared/Medical/Healing/HealingComponent.cs
new file mode 100644
index 0000000000..53358fd28d
--- /dev/null
+++ b/Content.Shared/Medical/Healing/HealingComponent.cs
@@ -0,0 +1,65 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Medical.Healing;
+
+/// <summary>
+/// Applies a damage change to the target when used in an interaction.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class HealingComponent : Component
+{
+    /// <remarks>
+    /// The amount of damage to heal per use.
+    /// </remarks>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+
+    /// <remarks>
+    /// This should generally be negative,
+    /// since you're, like, trying to heal damage.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public float BloodlossModifier = 0.0f;
+
+    /// <summary>
+    /// Restore missing blood.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ModifyBloodLevel = 0.0f;
+
+    /// <remarks>
+    /// The supported damage types are specified using a <see cref="DamageContainerPrototype"/>s. For a
+    /// HealingComponent this filters what damage container type this component should work on. If null,
+    /// all damage container types are supported.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public List<ProtoId<DamageContainerPrototype>>? DamageContainers;
+
+    /// <summary>
+    /// How long it takes to apply the damage.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Delay = 3f;
+
+    /// <summary>
+    /// Delay multiplier when healing yourself.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SelfHealPenaltyMultiplier = 3f;
+
+    /// <summary>
+    /// Sound played on healing begin.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? HealingBeginSound = null;
+
+    /// <summary>
+    /// Sound played on healing end.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? HealingEndSound = null;
+}
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Shared/Medical/Healing/HealingSystem.cs
similarity index 63%
rename from Content.Server/Medical/HealingSystem.cs
rename to Content.Shared/Medical/Healing/HealingSystem.cs
index b157abfbc5..5d6afe166a 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Shared/Medical/Healing/HealingSystem.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Components;
@@ -16,77 +19,74 @@ using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.Medical;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-using Robust.Shared.Audio;
 
-namespace Content.Server.Medical;
+namespace Content.Shared.Medical.Healing;
 
 public sealed class HealingSystem : EntitySystem
 {
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly StackSystem _stacks = default!;
+    [Dependency] private readonly SharedStackSystem _stacks = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HealingComponent, UseInHandEvent>(OnHealingUse);
         SubscribeLocalEvent<HealingComponent, AfterInteractEvent>(OnHealingAfterInteract);
         SubscribeLocalEvent<DamageableComponent, HealingDoAfterEvent>(OnDoAfter);
     }
 
-    private void OnDoAfter(Entity<DamageableComponent> entity, ref HealingDoAfterEvent args)
+    private void OnDoAfter(Entity<DamageableComponent> target, ref HealingDoAfterEvent args)
     {
-        var dontRepeat = false;
-
-        if (!TryComp(args.Used, out HealingComponent? healing))
-            return;
 
         if (args.Handled || args.Cancelled)
             return;
 
+        if (!TryComp(args.Used, out HealingComponent? healing))
+            return;
+
         if (healing.DamageContainers is not null &&
-            entity.Comp.DamageContainerID is not null &&
-            !healing.DamageContainers.Contains(entity.Comp.DamageContainerID))
+            target.Comp.DamageContainerID is not null &&
+            !healing.DamageContainers.Contains(target.Comp.DamageContainerID.Value))
         {
             return;
         }
 
+        TryComp<BloodstreamComponent>(target, out var bloodstream);
+
         // Heal some bloodloss damage.
-        if (healing.BloodlossModifier != 0)
+        if (healing.BloodlossModifier != 0 && bloodstream != null)
         {
-            if (!TryComp<BloodstreamComponent>(entity, out var bloodstream))
-                return;
             var isBleeding = bloodstream.BleedAmount > 0;
-            _bloodstreamSystem.TryModifyBleedAmount(entity.Owner, healing.BloodlossModifier);
+            _bloodstreamSystem.TryModifyBleedAmount((target.Owner, bloodstream), healing.BloodlossModifier);
             if (isBleeding != bloodstream.BleedAmount > 0)
             {
-                var popup = (args.User == entity.Owner)
+                var popup = (args.User == target.Owner)
                     ? Loc.GetString("medical-item-stop-bleeding-self")
-                    : Loc.GetString("medical-item-stop-bleeding", ("target", Identity.Entity(entity.Owner, EntityManager)));
-                _popupSystem.PopupEntity(popup, entity, args.User);
+                    : Loc.GetString("medical-item-stop-bleeding", ("target", Identity.Entity(target.Owner, EntityManager)));
+                _popupSystem.PopupClient(popup, target, args.User);
             }
         }
 
         // Restores missing blood
-        if (healing.ModifyBloodLevel != 0)
-            _bloodstreamSystem.TryModifyBloodLevel(entity.Owner, healing.ModifyBloodLevel);
+        if (healing.ModifyBloodLevel != 0 && bloodstream != null)
+            _bloodstreamSystem.TryModifyBloodLevel((target.Owner, bloodstream), healing.ModifyBloodLevel);
 
-        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage * _damageable.UniversalTopicalsHealModifier, true, origin: args.Args.User);
+        var healed = _damageable.TryChangeDamage(target.Owner, healing.Damage * _damageable.UniversalTopicalsHealModifier, true, origin: args.Args.User);
 
         if (healed == null && healing.BloodlossModifier != 0)
             return;
@@ -94,7 +94,7 @@ public sealed class HealingSystem : EntitySystem
         var total = healed?.GetTotal() ?? FixedPoint2.Zero;
 
         // Re-verify that we can heal the damage.
-
+        var dontRepeat = false;
         if (TryComp<StackComponent>(args.Used.Value, out var stackComp))
         {
             _stacks.Use(args.Used.Value, 1, stackComp);
@@ -129,33 +129,33 @@ public sealed class HealingSystem : EntitySystem
         // Starlight end
         else
         {
-            QueueDel(args.Used.Value);
+            PredictedQueueDel(args.Used.Value);
         }
 
-        if (entity.Owner != args.User)
+        if (target.Owner != args.User)
         {
             _adminLogger.Add(LogType.Healed,
-                $"{EntityManager.ToPrettyString(args.User):user} healed {EntityManager.ToPrettyString(entity.Owner):target} for {total:damage} damage");
+                $"{ToPrettyString(args.User):user} healed {ToPrettyString(target.Owner):target} for {total:damage} damage");
         }
         else
         {
             _adminLogger.Add(LogType.Healed,
-                $"{EntityManager.ToPrettyString(args.User):user} healed themselves for {total:damage} damage");
+                $"{ToPrettyString(args.User):user} healed themselves for {total:damage} damage");
         }
 
-        _audio.PlayPvs(healing.HealingEndSound, entity.Owner);
+        _audio.PlayPredicted(healing.HealingEndSound, target.Owner, args.User);
 
         // Logic to determine the whether or not to repeat the healing action
-        args.Repeat = (HasDamage(entity, healing) && !dontRepeat);
+        args.Repeat = HasDamage((args.Used.Value, healing), target) && !dontRepeat;
         if (!args.Repeat && !dontRepeat)
-            _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User);
+            _popupSystem.PopupClient(Loc.GetString("medical-item-finished-using", ("item", args.Used)), target.Owner, args.User);
         args.Handled = true;
     }
 
-    private bool HasDamage(Entity<DamageableComponent> ent, HealingComponent healing)
+    private bool HasDamage(Entity<HealingComponent> healing, Entity<DamageableComponent> target)
     {
-        var damageableDict = ent.Comp.Damage.DamageDict;
-        var healingDict = healing.Damage.DamageDict;
+        var damageableDict = target.Comp.Damage.DamageDict;
+        var healingDict = healing.Comp.Damage.DamageDict;
         foreach (var type in healingDict)
         {
             if (damageableDict.TryGetValue(type.Key, out var damageValue) && damageValue.Value > 0 && type.Key != "Mangleness") //Sunrise-edit: fix server crashes
@@ -164,18 +164,18 @@ public sealed class HealingSystem : EntitySystem
             }
         }
 
-        if (TryComp<BloodstreamComponent>(ent, out var bloodstream))
+        if (TryComp<BloodstreamComponent>(target, out var bloodstream))
         {
             // Is ent missing blood that we can restore?
-            if (healing.ModifyBloodLevel > 0
-                && _solutionContainerSystem.ResolveSolution(ent.Owner, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
+            if (healing.Comp.ModifyBloodLevel > 0
+                && _solutionContainerSystem.ResolveSolution(target.Owner, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
                 && bloodSolution.Volume < bloodSolution.MaxVolume)
             {
                 return true;
             }
 
             // Is ent bleeding and can we stop it?
-            if (healing.BloodlossModifier < 0 && bloodstream.BleedAmount > 0)
+            if (healing.Comp.BloodlossModifier < 0 && bloodstream.BleedAmount > 0)
             {
                 return true;
             }
@@ -184,40 +184,40 @@ public sealed class HealingSystem : EntitySystem
         return false;
     }
 
-    private void OnHealingUse(Entity<HealingComponent> entity, ref UseInHandEvent args)
+    private void OnHealingUse(Entity<HealingComponent> healing, ref UseInHandEvent args)
     {
         if (args.Handled)
             return;
 
-        if (TryHeal(entity, args.User, args.User, entity.Comp))
+        if (TryHeal(healing, args.User, args.User))
             args.Handled = true;
     }
 
-    private void OnHealingAfterInteract(Entity<HealingComponent> entity, ref AfterInteractEvent args)
+    private void OnHealingAfterInteract(Entity<HealingComponent> healing, ref AfterInteractEvent args)
     {
         if (args.Handled || !args.CanReach || args.Target == null)
             return;
 
-        if (TryHeal(entity, args.User, args.Target.Value, entity.Comp))
+        if (TryHeal(healing, args.Target.Value, args.User))
             args.Handled = true;
     }
 
-    private bool TryHeal(EntityUid uid, EntityUid user, EntityUid target, HealingComponent component)
+    private bool TryHeal(Entity<HealingComponent> healing, Entity<DamageableComponent?> target, EntityUid user)
     {
-        if (!TryComp<DamageableComponent>(target, out var targetDamage))
+        if (!Resolve(target, ref target.Comp, false))
             return false;
 
-        if (component.DamageContainers is not null &&
-            targetDamage.DamageContainerID is not null &&
-            !component.DamageContainers.Contains(targetDamage.DamageContainerID))
+        if (healing.Comp.DamageContainers is not null &&
+            target.Comp.DamageContainerID is not null &&
+            !healing.Comp.DamageContainers.Contains(target.Comp.DamageContainerID.Value))
         {
             return false;
         }
 
-        if (user != target && !_interactionSystem.InRangeUnobstructed(user, target, popup: true))
+        if (user != target.Owner && !_interactionSystem.InRangeUnobstructed(user, target.Owner, popup: true))
             return false;
 
-        if (TryComp<StackComponent>(uid, out var stack) && stack.Count < 1)
+        if (TryComp<StackComponent>(healing, out var stack) && stack.Count < 1)
             return false;
 
         // Starlight start
@@ -236,28 +236,28 @@ public sealed class HealingSystem : EntitySystem
                 return false;
         }
         // Starlight end
-        if (!HasDamage((target, targetDamage), component))
+        if (!HasDamage(healing, target!))
         {
-            _popupSystem.PopupEntity(Loc.GetString("medical-item-cant-use", ("item", uid)), uid, user);
+            _popupSystem.PopupClient(Loc.GetString("medical-item-cant-use", ("item", healing.Owner)), healing, user);
             return false;
         }
 
-        _audio.PlayPvs(component.HealingBeginSound, uid);
+        _audio.PlayPredicted(healing.Comp.HealingBeginSound, healing, user);
 
-        var isNotSelf = user != target;
+        var isNotSelf = user != target.Owner;
 
         if (isNotSelf)
         {
-            var msg = Loc.GetString("medical-item-popup-target", ("user", Identity.Entity(user, EntityManager)), ("item", uid));
+            var msg = Loc.GetString("medical-item-popup-target", ("user", Identity.Entity(user, EntityManager)), ("item", healing.Owner));
             _popupSystem.PopupEntity(msg, target, target, PopupType.Medium);
         }
 
         var delay = isNotSelf
-            ? component.Delay
-            : component.Delay * GetScaledHealingPenalty(user, component);
+            ? healing.Comp.Delay
+            : healing.Comp.Delay * GetScaledHealingPenalty(healing);
 
         var doAfterEventArgs =
-            new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), target, target: target, used: uid)
+            new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), target, target: target, used: healing)
             {
                 // Didn't break on damage as they may be trying to prevent it and
                 // not being able to heal your own ticking damage would be frustrating.
@@ -276,18 +276,18 @@ public sealed class HealingSystem : EntitySystem
     /// <param name="uid"></param>
     /// <param name="component"></param>
     /// <returns></returns>
-    public float GetScaledHealingPenalty(EntityUid uid, HealingComponent component)
+    public float GetScaledHealingPenalty(Entity<HealingComponent> healing)
     {
-        var output = component.Delay;
-        if (!TryComp<MobThresholdsComponent>(uid, out var mobThreshold) ||
-            !TryComp<DamageableComponent>(uid, out var damageable))
+        var output = healing.Comp.Delay;
+        if (!TryComp<MobThresholdsComponent>(healing, out var mobThreshold) ||
+            !TryComp<DamageableComponent>(healing, out var damageable))
             return output;
-        if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var amount, mobThreshold))
+        if (!_mobThresholdSystem.TryGetThresholdForState(healing, MobState.Critical, out var amount, mobThreshold))
             return 1;
 
-        var percentDamage = (float) (damageable.TotalDamage / amount);
+        var percentDamage = (float)(damageable.TotalDamage / amount);
         //basically make it scale from 1 to the multiplier.
-        var modifier = percentDamage * (component.SelfHealPenaltyMultiplier - 1) + 1;
+        var modifier = percentDamage * (healing.Comp.SelfHealPenaltyMultiplier - 1) + 1;
         return Math.Max(modifier, 1);
     }
 }
diff --git a/Content.Shared/Mind/Filters/AliveHumansPool.cs b/Content.Shared/Mind/Filters/AliveHumansPool.cs
new file mode 100644
index 0000000000..c8e5c55bae
--- /dev/null
+++ b/Content.Shared/Mind/Filters/AliveHumansPool.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind pool that uses <see cref="SharedMindSystem.AddAliveHumans"/>.
+/// </summary>
+public sealed partial class AliveHumansPool : IMindPool
+{
+    void IMindPool.FindMinds(HashSet<Entity<MindComponent>> minds, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        mindSys.AddAliveHumans(minds, exclude);
+    }
+}
diff --git a/Content.Shared/Mind/Filters/AntagonistMindFilter.cs b/Content.Shared/Mind/Filters/AntagonistMindFilter.cs
new file mode 100644
index 0000000000..d805138ac3
--- /dev/null
+++ b/Content.Shared/Mind/Filters/AntagonistMindFilter.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Roles;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind filter that requires minds to have an antagonist role.
+/// </summary>
+public sealed partial class AntagonistMindFilter : MindFilter
+{
+    protected override bool ShouldRemove(Entity<MindComponent> mind, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        var roleSys = entMan.System<SharedRoleSystem>();
+        return !roleSys.MindIsAntagonist(mind);
+    }
+}
diff --git a/Content.Shared/Mind/Filters/BodyMindFilter.cs b/Content.Shared/Mind/Filters/BodyMindFilter.cs
new file mode 100644
index 0000000000..334539634f
--- /dev/null
+++ b/Content.Shared/Mind/Filters/BodyMindFilter.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind filter that checks the mind's owned entity against a whitelist.
+/// </summary>
+public sealed partial class BodyMindFilter : MindFilter
+{
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
+
+    protected override bool ShouldRemove(Entity<MindComponent> ent, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        if (ent.Comp.OwnedEntity is not {} mob)
+            return true;
+
+        var sys = entMan.System<EntityWhitelistSystem>();
+        return sys.IsWhitelistFail(Whitelist, mob);
+    }
+}
diff --git a/Content.Shared/Mind/Filters/HasRoleMindFilter.cs b/Content.Shared/Mind/Filters/HasRoleMindFilter.cs
new file mode 100644
index 0000000000..e8098d72a2
--- /dev/null
+++ b/Content.Shared/Mind/Filters/HasRoleMindFilter.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Roles;
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind filter that requires minds to have a role matching a whitelist.
+/// </summary>
+public sealed partial class HasRoleMindFilter : MindFilter
+{
+    /// <summary>
+    /// The whitelist a role must match for the mind to pass the filter.
+    /// </summary>
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist;
+
+    protected override bool ShouldRemove(Entity<MindComponent> mind, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        var roleSys = entMan.System<SharedRoleSystem>();
+        return !roleSys.MindHasRole(mind, Whitelist);
+    }
+}
diff --git a/Content.Shared/Mind/Filters/IMindPool.cs b/Content.Shared/Mind/Filters/IMindPool.cs
new file mode 100644
index 0000000000..263d15d812
--- /dev/null
+++ b/Content.Shared/Mind/Filters/IMindPool.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind pool that can find minds to use for objectives etc.
+/// Further filtered by <see cref="IMindFilter"/>.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public partial interface IMindPool
+{
+    /// <summary>
+    /// Add minds for this pool to a hashset.
+    /// The hashset gets reused and is cleared before this is called.
+    /// </summary>
+    /// <param name="minds">The hashset to add to</param>
+    /// <param name="exclude">A mind entity that must not be returned</param>
+    void FindMinds(HashSet<Entity<MindComponent>> minds, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys);
+}
diff --git a/Content.Shared/Mind/Filters/JobMindFilter.cs b/Content.Shared/Mind/Filters/JobMindFilter.cs
new file mode 100644
index 0000000000..a6565e4d33
--- /dev/null
+++ b/Content.Shared/Mind/Filters/JobMindFilter.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind filter that requires minds to have a specific job.
+/// This uses mind roles, not ID cards.
+/// </summary>
+public sealed partial class JobMindFilter : MindFilter
+{
+    [DataField(required: true)]
+    public ProtoId<JobPrototype> Job;
+
+    protected override bool ShouldRemove(Entity<MindComponent> mind, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        var jobSys = entMan.System<SharedJobSystem>();
+        return jobSys.MindHasJobWithId(mind, Job);
+    }
+}
diff --git a/Content.Shared/Mind/Filters/MindFilter.cs b/Content.Shared/Mind/Filters/MindFilter.cs
new file mode 100644
index 0000000000..c2daf3e361
--- /dev/null
+++ b/Content.Shared/Mind/Filters/MindFilter.cs
@@ -0,0 +1,32 @@
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind filter that can be used to filter out minds from a <see cref="IMindPool"/>.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class MindFilter
+{
+    /// <summary>
+    /// The actual filter function, this has to return false for minds that get removed from the pool.
+    /// An excluded mind will be the same one passed to <see cref="IMindPool.FindMinds"/>.
+    /// </summary>
+    /// <param name="mind">The mind to check</param>
+    /// <param name="exclude">The same mind passed to FindMinds</param>
+    protected abstract bool ShouldRemove(Entity<MindComponent> mind, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys);
+
+    /// <summary>
+    /// The high-level filter function to be used by the mind system.
+    /// </summary>
+    public bool Filter(Entity<MindComponent> mind, EntityUid? exclude, EntityManager entMan, SharedMindSystem mindSys)
+    {
+        return ShouldRemove(mind, exclude, entMan, mindSys) ^ Inverted;
+    }
+
+    /// <summary>
+    /// Whether to invert functionality, only keeping minds that would otherwise be removed.
+    /// </summary>
+    [DataField]
+    public bool Inverted;
+}
diff --git a/Content.Shared/Mind/Filters/ObjectiveMindFilter.cs b/Content.Shared/Mind/Filters/ObjectiveMindFilter.cs
new file mode 100644
index 0000000000..2d3cf6a263
--- /dev/null
+++ b/Content.Shared/Mind/Filters/ObjectiveMindFilter.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.Mind.Filters;
+
+/// <summary>
+/// A mind filter that removes minds with a blacklist objective.
+/// </summary>
+public sealed partial class ObjectiveMindFilter : MindFilter
+{
+    [DataField(required: true)]
+    public EntityWhitelist Blacklist = new();
+
+    protected override bool ShouldRemove(Entity<MindComponent> mind, EntityUid? exclude, IEntityManager entMan, SharedMindSystem mindSys)
+    {
+        var whitelistSys = entMan.System<EntityWhitelistSystem>();
+        foreach (var obj in mind.Comp.Objectives)
+        {
+            // mind has a blacklisted objective, remove it from the pool
+            if (whitelistSys.IsBlacklistPass(Blacklist, obj))
+                return true;
+        }
+
+        return false;
+    }
+}
diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs
index 7864d61a8c..57cd628f90 100644
--- a/Content.Shared/Mind/MindComponent.cs
+++ b/Content.Shared/Mind/MindComponent.cs
@@ -55,6 +55,9 @@ public sealed partial class MindComponent : Component
     [ViewVariables]
     public bool IsVisitingEntity => VisitingEntity != null;
 
+    /// <summary>
+    /// The entity that this mind may be currently visiting. Used, for example, to allow admin ghosting to not make the owner's body catatonic, as opposed to when normally ghosting.
+    /// </summary>
     [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
     public EntityUid? VisitingEntity { get; set; }
 
diff --git a/Content.Shared/Mind/RoleTypePrototype.cs b/Content.Shared/Mind/RoleTypePrototype.cs
index 03f88ba751..690bd894a0 100644
--- a/Content.Shared/Mind/RoleTypePrototype.cs
+++ b/Content.Shared/Mind/RoleTypePrototype.cs
@@ -5,27 +5,31 @@ namespace Content.Shared.Mind;
 /// <summary>
 ///     The core properties of Role Types
 /// </summary>
-[Prototype, Serializable]
+[Prototype]
 public sealed partial class RoleTypePrototype : IPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    public static readonly LocId FallbackName = "role-type-crew-aligned-name";
+    public const string FallbackSymbol = "";
+    public static readonly Color FallbackColor = Color.FromHex("#eeeeee");
+
     /// <summary>
     ///     The role's name as displayed on the UI.
     /// </summary>
     [DataField]
-    public LocId Name = "role-type-crew-aligned-name";
+    public LocId Name = FallbackName;
 
     /// <summary>
     ///     The role's displayed color.
     /// </summary>
     [DataField]
-    public Color Color = Color.FromHex("#eeeeee");
+    public Color Color = FallbackColor;
 
     /// <summary>
     ///     A symbol used to represent the role type.
     /// </summary>
     [DataField]
-    public string Symbol = string.Empty;
+    public string Symbol = FallbackSymbol;
 }
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index de8d4f0567..98ff77810c 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -2,19 +2,25 @@ using System.Diagnostics.CodeAnalysis;
 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.Mind.Filters;
 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;
 using Robust.Shared.Player;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Mind;
@@ -23,6 +29,7 @@ public abstract partial class SharedMindSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
     [Dependency] private readonly SharedPlayerSystem _player = default!;
@@ -33,6 +40,8 @@ public abstract partial class SharedMindSystem : EntitySystem
     [ViewVariables]
     protected readonly Dictionary<NetUserId, EntityUid> UserMinds = new();
 
+    private HashSet<Entity<MindComponent>> _pickingMinds = new();
+
     public override void Initialize()
     {
         base.Initialize();
@@ -614,23 +623,95 @@ public abstract partial class SharedMindSystem : EntitySystem
 
     /// <summary>
     /// Returns a list of every living humanoid player's minds, except for a single one which is exluded.
+    /// A new hashset is allocated for every call, consider using <see cref="AddAliveHumans"/> instead.
     /// </summary>
     public HashSet<Entity<MindComponent>> GetAliveHumans(EntityUid? exclude = null)
     {
         var allHumans = new HashSet<Entity<MindComponent>>();
+        AddAliveHumans(allHumans, exclude);
+        return allHumans;
+    }
+
+    /// <summary>
+    /// Adds to a hashset every living humanoid player's minds, except for a single one which is exluded.
+    /// </summary>
+    public void AddAliveHumans(HashSet<Entity<MindComponent>> allHumans, EntityUid? exclude = null)
+    {
         // HumanoidAppearanceComponent is used to prevent mice, pAIs, etc from being chosen
-        var query = EntityQueryEnumerator<MobStateComponent, HumanoidAppearanceComponent>();
-        while (query.MoveNext(out var uid, out var mobState, out _))
+        var query = EntityQueryEnumerator<HumanoidAppearanceComponent, MobStateComponent>();
+        while (query.MoveNext(out var uid, out _, out var mobState))
         {
             // the player needs to have a mind and not be the excluded one +
             // the player has to be alive
             if (!TryGetMind(uid, out var mind, out var mindComp) || mind == exclude || !_mobState.IsAlive(uid, mobState))
                 continue;
 
-            allHumans.Add(new Entity<MindComponent>(mind, mindComp));
+            allHumans.Add((mind, mindComp));
+        }
+    }
+
+    /// <summary>
+    /// Picks a random mind from a pool after applying a list of filters.
+    /// Returns null if no valid mind could be found.
+    /// </summary>
+    public Entity<MindComponent>? PickFromPool(IMindPool pool, List<MindFilter> filters, EntityUid? exclude = null)
+    {
+        _pickingMinds.Clear();
+        pool.FindMinds(_pickingMinds, exclude, EntityManager, this);
+        FilterMinds(_pickingMinds, filters, exclude);
+
+        if (_pickingMinds.Count == 0)
+            return null;
+
+        return _random.Pick(_pickingMinds);
+    }
+
+    /// <summary>
+    /// Filters minds from a hashset using a single <see cref="MindFilter"/>.
+    /// </summary>
+    public void FilterMinds(HashSet<Entity<MindComponent>> minds, MindFilter filter, EntityUid? exclude = null)
+    {
+        minds.RemoveWhere(mind => filter.Filter(mind, exclude, EntityManager, this));
+    }
+
+    /// <summary>
+    /// Filters minds from a hashset using a list of <see cref="MindFilter"/>s to apply sequentially.
+    /// </summary>
+    public void FilterMinds(HashSet<Entity<MindComponent>> minds, List<MindFilter> filters, EntityUid? exclude = null)
+    {
+        foreach (var filter in filters)
+        {
+            // no point calling it if there are none left
+            if (minds.Count == 0)
+                break;
+
+            FilterMinds(minds, filter, exclude);
+        }
+    }
+
+    /// <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);
         }
 
-        return allHumans;
+        if (allowSpeech)
+        {
+            EnsureComp<SpeechComponent>(uid);
+            EnsureComp<EmotingComponent>(uid);
+        }
+
+        EnsureComp<ExaminerComponent>(uid);
     }
 }
 
diff --git a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
index acdced0213..a6faa8418e 100644
--- a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
+++ b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Body.Components;
 using Content.Shared.Morgue.Components;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
@@ -20,7 +19,9 @@ public sealed class EntityStorageLayingDownOverrideSystem : EntitySystem
     {
         foreach (var ent in args.Contents)
         {
-            if (HasComp<BodyComponent>(ent) && !_standing.IsDown(ent))
+            // Explicitly check for standing state component, as entities without it will return false for IsDown()
+            // which prevents inserting any kind of non-mobs into this container (which is unintended)
+            if (TryComp<StandingStateComponent>(ent, out var standingState) && !_standing.IsDown(ent, standingState))
                 args.Contents.Remove(ent);
         }
     }
diff --git a/Content.Shared/MouseRotator/MouseRotatorComponent.cs b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
index c22e5df3a6..8d557ed1ef 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 836acaa518..155aa2c226 100644
--- a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
+++ b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
@@ -57,6 +57,11 @@ public abstract class SharedMouseRotatorSystem : EntitySystem
 
     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/Mousetrap/MousetrapComponent.cs b/Content.Shared/Mousetrap/MousetrapComponent.cs
index 6d7483802b..4f48f00b3a 100644
--- a/Content.Shared/Mousetrap/MousetrapComponent.cs
+++ b/Content.Shared/Mousetrap/MousetrapComponent.cs
@@ -2,20 +2,20 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Mousetrap;
 
-[RegisterComponent, NetworkedComponent]
+/// <summary>
+/// Component inteded to be used for mouse traps.
+/// Will stop step triggers from happening unless armed via <see cref="Item.ItemToggle.Components.ItemToggleComponent"/>
+/// and will scale damage taken from <see cref="Trigger.Components.Effects.DamageOnTriggerComponent"/>
+/// depending on mass.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class MousetrapComponent : Component
 {
-    [ViewVariables]
-    [DataField("isActive")]
-    public bool IsActive = false;
-
     /// <summary>
-    ///     Set this to change where the
-    ///     inflection point in the scaling
-    ///     equation will occur.
-    ///     The default is 10.
+    /// Set this to change where the
+    /// inflection point in the damage scaling
+    /// equation will occur.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("massBalance")]
+    [DataField, AutoNetworkedField]
     public int MassBalance = 10;
 }
diff --git a/Content.Shared/Mousetrap/MousetrapSystem.cs b/Content.Shared/Mousetrap/MousetrapSystem.cs
new file mode 100644
index 0000000000..96f74114b2
--- /dev/null
+++ b/Content.Shared/Mousetrap/MousetrapSystem.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Trigger.Systems;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Mousetrap;
+
+public sealed class MousetrapSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MousetrapComponent, BeforeDamageOnTriggerEvent>(BeforeDamageOnTrigger);
+        SubscribeLocalEvent<MousetrapComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
+    }
+
+    // only allow step triggers to trigger if the trap is armed
+    // TODO: refactor Steptriggers to get rid of this
+    // they should just use the new trigger conditions
+    private void OnStepTriggerAttempt(Entity<MousetrapComponent> ent, ref StepTriggerAttemptEvent args)
+    {
+        if (!TryComp<ItemToggleComponent>(ent, out var toggle))
+            return;
+
+        args.Continue |= toggle.Activated;
+    }
+
+    // scale the damage according to mass
+    private void BeforeDamageOnTrigger(Entity<MousetrapComponent> ent, ref BeforeDamageOnTriggerEvent args)
+    {
+        if (TryComp(args.Tripper, out PhysicsComponent? physics) && physics.Mass != 0)
+        {
+            // The idea here is inverse,
+            // Small - big damage,
+            // Large - small damage
+            // yes i punched numbers into a calculator until the graph looked right
+            var scaledDamage = -50 * Math.Atan(physics.Mass - ent.Comp.MassBalance) + 25 * Math.PI;
+            args.Damage *= scaledDamage;
+        }
+    }
+}
diff --git a/Content.Shared/Mousetrap/MousetrapVisuals.cs b/Content.Shared/Mousetrap/MousetrapVisuals.cs
deleted file mode 100644
index 9685157aad..0000000000
--- a/Content.Shared/Mousetrap/MousetrapVisuals.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Mousetrap;
-
-[Serializable, NetSerializable]
-public enum MousetrapVisuals : byte
-{
-    Visual,
-    Armed,
-    Unarmed
-}
diff --git a/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs b/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs
new file mode 100644
index 0000000000..33c5389fd3
--- /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/JumpAbilityComponent.cs b/Content.Shared/Movement/Components/JumpAbilityComponent.cs
new file mode 100644
index 0000000000..6da9161578
--- /dev/null
+++ b/Content.Shared/Movement/Components/JumpAbilityComponent.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Actions;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// A component for configuring the settings for the jump action.
+/// To give the jump action to an entity use <see cref="ActionGrantComponent"/> and <see cref="ItemActionGrantComponent"/>.
+/// The basic action prototype is "ActionGravityJump".
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedJumpAbilitySystem))]
+public sealed partial class JumpAbilityComponent : Component
+{
+    /// <summary>
+    /// How far you will jump (in tiles).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float JumpDistance = 5f;
+
+    /// <summary>
+    /// Basic “throwing” speed for TryThrow method.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float JumpThrowSpeed = 10f;
+
+    /// <summary>
+    /// This gets played whenever the jump action is used.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? JumpSound;
+}
+
+public sealed partial class GravityJumpEvent : InstantActionEvent;
+
diff --git a/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs b/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs
new file mode 100644
index 0000000000..22b196d127
--- /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/Components/WormComponent.cs b/Content.Shared/Movement/Components/WormComponent.cs
new file mode 100644
index 0000000000..a717659fef
--- /dev/null
+++ b/Content.Shared/Movement/Components/WormComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+///     This component ensures an entity is always in the KnockedDown State and cannot stand. Great for any entities you
+///     don't want to collide with other mobs, don't want eating projectiles and don't want to get knocked down.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class WormComponent : Component
+{
+    /// <summary>
+    /// Modifier for KnockedDown Friction, or in this components case, all friction
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float FrictionModifier = 1f;
+
+    /// <summary>
+    /// Modifier for KnockedDown Movement, or in this components case, all movement
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SpeedModifier = 1f;
+}
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 85d1bfdfa0..a8c4aba38b 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -111,16 +111,12 @@ public sealed class PullingSystem : EntitySystem
 
         // Try find hand that is doing this pull.
         // and clear it.
-        foreach (var hand in component.Hands.Values)
+        foreach (var held in _handsSystem.EnumerateHeld((uid, component)))
         {
-            if (hand.HeldEntity == null
-                || !TryComp(hand.HeldEntity, out VirtualItemComponent? virtualItem)
-                || virtualItem.BlockingEntity != args.PulledUid)
-            {
+            if (!TryComp(held, out VirtualItemComponent? virtualItem) || virtualItem.BlockingEntity != args.PulledUid)
                 continue;
-            }
 
-            _handsSystem.TryDrop(args.PullerUid, hand, handsComp: component);
+            _handsSystem.TryDrop((args.PullerUid, component), held);
             break;
         }
     }
@@ -232,7 +228,7 @@ public sealed class PullingSystem : EntitySystem
         if (component.Pulling != args.BlockingEntity)
             return;
 
-        if (EntityManager.TryGetComponent(args.BlockingEntity, out PullableComponent? comp))
+        if (TryComp(args.BlockingEntity, out PullableComponent? comp))
         {
             TryStopPull(args.BlockingEntity, comp);
         }
@@ -434,7 +430,7 @@ public sealed class PullingSystem : EntitySystem
             return false;
         }
 
-        if (!EntityManager.TryGetComponent<PhysicsComponent>(pullableUid, out var physics))
+        if (!TryComp<PhysicsComponent>(pullableUid, out var physics))
         {
             return false;
         }
diff --git a/Content.Shared/Movement/Systems/FrictionContactsSystem.cs b/Content.Shared/Movement/Systems/FrictionContactsSystem.cs
index 09d74bfb40..44fc3933e3 100644
--- a/Content.Shared/Movement/Systems/FrictionContactsSystem.cs
+++ b/Content.Shared/Movement/Systems/FrictionContactsSystem.cs
@@ -77,7 +77,7 @@ public sealed class FrictionContactsSystem : EntitySystem
 
     private void OnRefreshFrictionModifiers(Entity<FrictionModifiedByContactComponent> entity, ref RefreshFrictionModifiersEvent args)
     {
-        if (!EntityManager.TryGetComponent<PhysicsComponent>(entity, out var physicsComponent))
+        if (!TryComp<PhysicsComponent>(entity, out var physicsComponent))
             return;
 
         var friction = 0.0f;
diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
new file mode 100644
index 0000000000..99ac22e330
--- /dev/null
+++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
@@ -0,0 +1,287 @@
+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);
+    }
+
+    /// <inheritdoc cref="TryAddFrictionModDuration(EntityUid,TimeSpan,float,float)"/>
+    public bool TryAddFrictionModDuration(
+        EntityUid uid,
+        TimeSpan duration,
+        float friction
+    )
+    {
+        return TryAddFrictionModDuration(uid, duration, friction, friction);
+    }
+
+    /// <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);
+    }
+
+    /// <inheritdoc cref="TryUpdateFrictionModDuration(EntityUid,TimeSpan,float,float)"/>
+    public bool TryUpdateFrictionModDuration(
+        EntityUid uid,
+        TimeSpan duration,
+        float friction
+    )
+    {
+        return TryUpdateFrictionModDuration(uid,duration, friction, friction);
+    }
+
+    /// <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/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
index b5bb633491..d0faad8b50 100644
--- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
@@ -1,8 +1,7 @@
-using System.Text.Json.Serialization.Metadata;
 using Content.Shared.CCVar;
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Events;
+using Content.Shared.Standing;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
 
@@ -11,7 +10,7 @@ namespace Content.Shared.Movement.Systems
     public sealed class MovementSpeedModifierSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private   readonly IConfigurationManager _configManager = default!;
+        [Dependency] private readonly IConfigurationManager _configManager = default!;
 
         private float _frictionModifier;
         private float _airDamping;
@@ -21,6 +20,8 @@ namespace Content.Shared.Movement.Systems
         {
             base.Initialize();
             SubscribeLocalEvent<MovementSpeedModifierComponent, MapInitEvent>(OnModMapInit);
+            SubscribeLocalEvent<MovementSpeedModifierComponent, DownedEvent>(OnDowned);
+            SubscribeLocalEvent<MovementSpeedModifierComponent, StoodEvent>(OnStand);
 
             Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true);
             Subs.CVar(_configManager, CCVars.AirFriction, value => _airDamping = value, true);
@@ -41,6 +42,33 @@ namespace Content.Shared.Movement.Systems
             Dirty(ent);
         }
 
+        private void OnDowned(Entity<MovementSpeedModifierComponent> entity, ref DownedEvent args)
+        {
+            RefreshFrictionModifiers(entity);
+            RefreshMovementSpeedModifiers(entity);
+        }
+
+        private void OnStand(Entity<MovementSpeedModifierComponent> entity, ref StoodEvent args)
+        {
+            RefreshFrictionModifiers(entity);
+            RefreshMovementSpeedModifiers(entity);
+        }
+
+        /// <summary>
+        /// Copy this component's datafields from one entity to another.
+        /// This needs to refresh the modifiers after using CopyComp.
+        /// <summary>
+        public void CopyComponent(Entity<MovementSpeedModifierComponent?> source, EntityUid target)
+        {
+            if (!Resolve(source, ref source.Comp))
+                return;
+
+            CopyComp(source, target, source.Comp);
+            RefreshWeightlessModifiers(target);
+            RefreshMovementSpeedModifiers(target);
+            RefreshFrictionModifiers(target);
+        }
+
         public void RefreshWeightlessModifiers(EntityUid uid, MovementSpeedModifierComponent? move = null)
         {
             if (!Resolve(uid, ref move, false))
diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
index 71bc65a79e..8063948eea 100644
--- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
@@ -142,6 +142,15 @@ public abstract class SharedContentEyeSystem : EntitySystem
 
     public void UpdateEyeOffset(Entity<EyeComponent> eye)
     {
+        var evAttempt = new GetEyeOffsetAttemptEvent();
+        RaiseLocalEvent(eye, ref evAttempt);
+
+        if (evAttempt.Cancelled)
+        {
+            _eye.SetOffset(eye, Vector2.Zero, eye);
+            return;
+        }
+
         var ev = new GetEyeOffsetEvent();
         RaiseLocalEvent(eye, ref ev);
 
@@ -156,6 +165,15 @@ public abstract class SharedContentEyeSystem : EntitySystem
         if (!Resolve(uid, ref contentEye) || !Resolve(uid, ref eye))
             return;
 
+        var evAttempt = new GetEyePvsScaleAttemptEvent();
+        RaiseLocalEvent(uid, ref evAttempt);
+
+        if (evAttempt.Cancelled)
+        {
+            _eye.SetPvsScale((uid, eye), 1);
+            return;
+        }
+
         var ev = new GetEyePvsScaleEvent();
         RaiseLocalEvent(uid, ref ev);
 
diff --git a/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs
new file mode 100644
index 0000000000..ac720cae68
--- /dev/null
+++ b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Gravity;
+using Content.Shared.Movement.Components;
+using Content.Shared.Throwing;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Movement.Systems;
+
+public sealed partial class SharedJumpAbilitySystem : EntitySystem
+{
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<JumpAbilityComponent, GravityJumpEvent>(OnGravityJump);
+    }
+
+    private void OnGravityJump(Entity<JumpAbilityComponent> entity, ref GravityJumpEvent args)
+    {
+        if (_gravity.IsWeightless(args.Performer))
+            return;
+
+        var xform = Transform(args.Performer);
+        var throwing = xform.LocalRotation.ToWorldVec() * entity.Comp.JumpDistance;
+        var direction = xform.Coordinates.Offset(throwing); // to make the character jump in the direction he's looking
+
+        _throwing.TryThrow(args.Performer, direction, entity.Comp.JumpThrowSpeed);
+
+        _audio.PlayPredicted(entity.Comp.JumpSound, args.Performer, args.Performer);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index e43800dc9f..f8495fcd18 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -72,6 +72,8 @@ public abstract partial class SharedMoverController : VirtualController
     /// </summary>
     public Dictionary<EntityUid, bool> UsedMobMovement = new();
 
+    private readonly HashSet<EntityUid> _aroundColliderSet = [];
+
     public override void Initialize()
     {
         UpdatesBefore.Add(typeof(TileFrictionController));
@@ -454,7 +456,9 @@ public abstract partial class SharedMoverController : VirtualController
         var (uid, collider, mover, transform) = entity;
         var enlargedAABB = _lookup.GetWorldAABB(entity.Owner, transform).Enlarged(mover.GrabRange);
 
-        foreach (var otherEntity in lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB))
+        _aroundColliderSet.Clear();
+        lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB, _aroundColliderSet);
+        foreach (var otherEntity in _aroundColliderSet)
         {
             if (otherEntity == uid)
                 continue; // Don't try to push off of yourself!
diff --git a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
index e2dee87019..8a0b085a83 100644
--- a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
+++ b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
@@ -78,7 +78,7 @@ public sealed class SpeedModifierContactsSystem : EntitySystem
 
     private void OnRefreshMovementSpeedModifiers(EntityUid uid, SpeedModifiedByContactComponent component, RefreshMovementSpeedModifiersEvent args)
     {
-        if (!EntityManager.TryGetComponent<PhysicsComponent>(uid, out var physicsComponent))
+        if (!TryComp<PhysicsComponent>(uid, out var physicsComponent))
             return;
 
         var walkSpeed = 0.0f;
diff --git a/Content.Shared/Movement/Systems/WormSystem.cs b/Content.Shared/Movement/Systems/WormSystem.cs
new file mode 100644
index 0000000000..8dc7f86a08
--- /dev/null
+++ b/Content.Shared/Movement/Systems/WormSystem.cs
@@ -0,0 +1,53 @@
+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;
+
+/// <summary>
+/// This handles the worm component
+/// </summary>
+public sealed class WormSystem : EntitySystem
+{
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<WormComponent, StandUpAttemptEvent>(OnStandAttempt);
+        SubscribeLocalEvent<WormComponent, KnockedDownRefreshEvent>(OnKnockedDownRefresh);
+        SubscribeLocalEvent<WormComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<WormComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<WormComponent> ent, ref MapInitEvent args)
+    {
+        EnsureComp<KnockedDownComponent>(ent, out var knocked);
+        _alerts.ShowAlert(ent, SharedStunSystem.KnockdownAlert);
+        _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)
+    {
+        if (args.Cancelled)
+            return;
+
+        args.Cancelled = true;
+        args.Message = (Loc.GetString("worm-component-stand-attempt"), PopupType.SmallCaution);
+        args.Autostand = false;
+    }
+
+    private void OnKnockedDownRefresh(Entity<WormComponent> ent, ref KnockedDownRefreshEvent args)
+    {
+        args.FrictionModifier *= ent.Comp.FrictionModifier;
+        args.SpeedModifier *= ent.Comp.SpeedModifier;
+    }
+}
diff --git a/Content.Shared/NameIdentifier/NameIdentifierComponent.cs b/Content.Shared/NameIdentifier/NameIdentifierComponent.cs
index 49be08a6a3..f9f9eef49b 100644
--- a/Content.Shared/NameIdentifier/NameIdentifierComponent.cs
+++ b/Content.Shared/NameIdentifier/NameIdentifierComponent.cs
@@ -1,5 +1,5 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.NameIdentifier;
 
@@ -9,18 +9,18 @@ namespace Content.Shared.NameIdentifier;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class NameIdentifierComponent : Component
 {
-    [DataField("group", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<NameIdentifierGroupPrototype>))]
-    public string Group = string.Empty;
+    [DataField]
+    public ProtoId<NameIdentifierGroupPrototype>? Group;
 
     /// <summary>
     /// The randomly generated ID for this entity.
     /// </summary>
-    [DataField("identifier"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public int Identifier = -1;
 
     /// <summary>
     /// The full name identifier for this entity.
     /// </summary>
-    [DataField("fullIdentifier"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string FullIdentifier = string.Empty;
 }
diff --git a/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs b/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
index e3dceca489..933902e222 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/Ninja/Components/SpiderChargeComponent.cs b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
index 3ba4494cca..75053011ff 100644
--- a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
+++ b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
@@ -10,11 +10,21 @@ namespace Content.Shared.Ninja.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSpiderChargeSystem))]
 public sealed partial class SpiderChargeComponent : Component
 {
-    /// Range for planting within the target area
+    /// <summary>
+    /// Range for planting within the target area.
+    /// </summary>
     [DataField]
     public float Range = 10f;
 
-    /// The ninja that planted this charge
+    /// <summary>
+    /// The ninja that planted this charge.
+    /// </summary>
     [DataField]
     public EntityUid? Planter;
+
+    /// <summary>
+    /// The trigger that will mark the objective as successful.
+    /// </summary>
+    [DataField]
+    public string TriggerKey = "timer";
 }
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
index 8b892190b7..1f3cc3881d 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Clothing.Components;
 using Content.Shared.CombatMode;
 using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item.ItemToggle;
@@ -19,6 +20,7 @@ public abstract class SharedNinjaGlovesSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -128,8 +130,7 @@ public abstract class SharedNinjaGlovesSystem : EntitySystem
         target = args.Target;
         return _timing.IsFirstTimePredicted
             && !_combatMode.IsInCombatMode(uid)
-            && TryComp<HandsComponent>(uid, out var hands)
-            && hands.ActiveHandEntity == null
+            && _hands.GetActiveItem(uid) == null
             && _interaction.InRangeUnobstructed(uid, target);
     }
 }
diff --git a/Content.Shared/Nutrition/Components/DrinkComponent.cs b/Content.Shared/Nutrition/Components/DrinkComponent.cs
index 210e22a31d..f1cc6edd02 100644
--- a/Content.Shared/Nutrition/Components/DrinkComponent.cs
+++ b/Content.Shared/Nutrition/Components/DrinkComponent.cs
@@ -5,6 +5,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Nutrition.Components;
 
+[Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
 [NetworkedComponent, AutoGenerateComponentState]
 [RegisterComponent, Access(typeof(SharedDrinkSystem))]
 public sealed partial class DrinkComponent : Component
@@ -24,9 +25,6 @@ public sealed partial class DrinkComponent : Component
     [DataField, AutoNetworkedField]
     public float Delay = 1;
 
-    [DataField, AutoNetworkedField]
-    public bool Examinable = true;
-
     /// <summary>
     /// If true, trying to drink when empty will not handle the event.
     /// This means other systems such as equipping on use can run.
diff --git a/Content.Shared/Nutrition/Components/EdibleComponent.cs b/Content.Shared/Nutrition/Components/EdibleComponent.cs
new file mode 100644
index 0000000000..4fcd9770eb
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/EdibleComponent.cs
@@ -0,0 +1,86 @@
+using Content.Shared.Body.Components;
+using Content.Shared.FixedPoint;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// This is used on an entity with a solution container to flag a specific solution as being able to have its
+/// reagents consumed directly.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem))]
+public sealed partial class EdibleComponent : Component
+{
+    /// <summary>
+    /// Name of the solution that stores the consumable reagents
+    /// </summary>
+    [DataField]
+    public string Solution = "food";
+
+    /// <summary>
+    /// Should this entity be deleted when our solution is emptied?
+    /// </summary>
+    [DataField]
+    public bool DestroyOnEmpty = true;
+
+    /// <summary>
+    /// Trash we spawn when eaten, will not spawn if the item isn't deleted when empty.
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> Trash = new();
+
+    /// <summary>
+    /// How much of our solution is eaten on a do-after completion. Set to null to eat the whole thing.
+    /// </summary>
+    [DataField]
+    public FixedPoint2? TransferAmount = FixedPoint2.New(5);
+
+    /// <summary>
+    /// Acceptable utensils to use
+    /// </summary>
+    [DataField]
+    public UtensilType Utensil = UtensilType.Fork; //There are more "solid" than "liquid" food
+
+    /// <summary>
+    /// Do we need a utensil to access this solution?
+    /// </summary>
+    [DataField]
+    public bool UtensilRequired;
+
+    /// <summary>
+    ///     If this is set to true, food can only be eaten if you have a stomach with a
+    ///     <see cref="StomachComponent.SpecialDigestible"/> that includes this entity in its whitelist,
+    ///     rather than just being digestible by anything that can eat food.
+    ///     Whitelist the food component to allow eating of normal food.
+    /// </summary>
+    [DataField]
+    public bool RequiresSpecialDigestion;
+
+    /// <summary>
+    /// How long it takes to eat the food personally.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1f);
+
+    /// <summary>
+    ///     This is how many seconds it takes to force-feed someone this food.
+    ///     Should probably be smaller for small items like pills.
+    /// </summary>
+    [DataField]
+    public TimeSpan ForceFeedDelay = TimeSpan.FromSeconds(3f);
+
+    /// <summary>
+    /// For mobs that are food, requires killing them before eating.
+    /// </summary>
+    [DataField]
+    public bool RequireDead = true;
+
+    /// <summary>
+    /// Verb, icon, and sound data for our edible.
+    /// </summary>
+    [DataField]
+    public ProtoId<EdiblePrototype> Edible = IngestionSystem.Food;
+}
diff --git a/Content.Shared/Nutrition/Components/FoodComponent.cs b/Content.Shared/Nutrition/Components/FoodComponent.cs
index ce04569fcb..5f1ec41717 100644
--- a/Content.Shared/Nutrition/Components/FoodComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Nutrition.Components;
-
+[Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
 [RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))]
 public sealed partial class FoodComponent : Component
 {
@@ -53,7 +53,7 @@ public sealed partial class FoodComponent : Component
     /// The localization identifier for the eat message. Needs a "food" entity argument passed to it.
     /// </summary>
     [DataField]
-    public LocId EatMessage = "food-nom";
+    public LocId EatMessage = "edible-nom";
 
     /// <summary>
     /// How long it takes to eat the food personally.
diff --git a/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs b/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
index 803bf1f8b2..931d47838b 100644
--- a/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
+++ b/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
@@ -9,13 +9,12 @@ namespace Content.Shared.Nutrition.Components;
 ///     In the event that more head-wear & mask functionality is added (like identity systems, or raising/lowering of
 ///     masks), then this component might become redundant.
 /// </remarks>
-[RegisterComponent, Access(typeof(FoodSystem), typeof(SharedDrinkSystem), typeof(IngestionBlockerSystem))]
+[RegisterComponent, Access(typeof(IngestionSystem))]
 public sealed partial class IngestionBlockerComponent : Component
 {
     /// <summary>
     ///     Is this component currently blocking consumption.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("enabled")]
+    [DataField]
     public bool Enabled { get; set; } = true;
 }
diff --git a/Content.Shared/Nutrition/Components/OpenableComponent.cs b/Content.Shared/Nutrition/Components/OpenableComponent.cs
index 58d6665c58..6a32c0bdeb 100644
--- a/Content.Shared/Nutrition/Components/OpenableComponent.cs
+++ b/Content.Shared/Nutrition/Components/OpenableComponent.cs
@@ -36,7 +36,7 @@ public sealed partial class OpenableComponent : Component
     /// Text shown when examining and its open.
     /// </summary>
     [DataField]
-    public LocId ExamineText = "drink-component-on-examine-is-opened";
+    public LocId ExamineText = "openable-component-on-examine-is-opened";
 
     /// <summary>
     /// The locale id for the popup shown when IsClosed is called and closed. Needs a "owner" entity argument passed to it.
@@ -44,7 +44,7 @@ public sealed partial class OpenableComponent : Component
     /// It's still generic enough that you should change it if you make openable non-drinks, i.e. unwrap it first, peel it first.
     /// </summary>
     [DataField]
-    public LocId ClosedPopup = "drink-component-try-use-drink-not-open";
+    public LocId ClosedPopup = "openable-component-try-use-closed";
 
     /// <summary>
     /// Text to show in the verb menu for the "Open" action.
diff --git a/Content.Shared/Nutrition/Components/SealableComponent.cs b/Content.Shared/Nutrition/Components/SealableComponent.cs
index 1c2f732e7a..71a63f103b 100644
--- a/Content.Shared/Nutrition/Components/SealableComponent.cs
+++ b/Content.Shared/Nutrition/Components/SealableComponent.cs
@@ -22,11 +22,11 @@ public sealed partial class SealableComponent : Component
     /// Text shown when examining and the item's seal has not been broken.
     /// </summary>
     [DataField]
-    public LocId ExamineTextSealed = "drink-component-on-examine-is-sealed";
+    public LocId ExamineTextSealed = "sealable-component-on-examine-is-sealed";
 
     /// <summary>
     /// Text shown when examining and the item's seal has been broken.
     /// </summary>
     [DataField]
-    public LocId ExamineTextUnsealed = "drink-component-on-examine-is-unsealed";
+    public LocId ExamineTextUnsealed = "sealable-component-on-examine-is-unsealed";
 }
diff --git a/Content.Shared/Nutrition/Components/UtensilComponent.cs b/Content.Shared/Nutrition/Components/UtensilComponent.cs
index e8da588186..f3c4323592 100644
--- a/Content.Shared/Nutrition/Components/UtensilComponent.cs
+++ b/Content.Shared/Nutrition/Components/UtensilComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Nutrition.Components
 {
-    [RegisterComponent, NetworkedComponent, Access(typeof(UtensilSystem))]
+    [RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem))]
     public sealed partial class UtensilComponent : Component
     {
         [DataField("types")]
diff --git a/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs b/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs
index 31384f3a18..e887486e93 100644
--- a/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs
@@ -19,22 +19,30 @@ public sealed class FlavorProfileSystem : EntitySystem
 
     private int FlavorLimit => _configManager.GetCVar(CCVars.FlavorLimit);
 
-    public string GetLocalizedFlavorsMessage(EntityUid uid, EntityUid user, Solution solution,
-        FlavorProfileComponent? flavorProfile = null)
+    public string GetLocalizedFlavorsMessage(Entity<FlavorProfileComponent?> entity, EntityUid user, Solution? solution)
     {
-        if (!Resolve(uid, ref flavorProfile, false))
+        HashSet<string> flavors = new();
+        HashSet<string>? ignore = null;
+
+        if (Resolve(entity, ref entity.Comp, false))
         {
-            return Loc.GetString(BackupFlavorMessage);
+            flavors = entity.Comp.Flavors;
+            ignore = entity.Comp.IgnoreReagents;
         }
 
-        var flavors = new HashSet<string>(flavorProfile.Flavors);
-        flavors.UnionWith(GetFlavorsFromReagents(solution, FlavorLimit - flavors.Count, flavorProfile.IgnoreReagents));
+
+        if (solution != null)
+            flavors.UnionWith(GetFlavorsFromReagents(solution, FlavorLimit - flavors.Count, ignore));
 
         var ev = new FlavorProfileModificationEvent(user, flavors);
+
         RaiseLocalEvent(ev);
-        RaiseLocalEvent(uid, ev);
+        RaiseLocalEvent(entity, ev);
         RaiseLocalEvent(user, ev);
 
+        if (flavors.Count == 0)
+            return Loc.GetString(BackupFlavorMessage);
+
         return FlavorsToFlavorMessage(flavors);
     }
 
diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
index ade833f06b..a599a1e74e 100644
--- a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,58 +1,36 @@
-using System.Linq;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.Destructible;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Hands.Components;
+using Content.Shared.Forensics;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
-using Content.Shared.Stacks;
-using Content.Shared.Storage;
 using Content.Shared.Verbs;
-using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
 /// <summary>
 /// Handles feeding attempts both on yourself and on the target.
 /// </summary>
+[Obsolete("Migration to Content.Shared.Nutrition.EntitySystems.IngestionSystem is required")]
 public sealed class FoodSystem : EntitySystem
 {
-    [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly ReactiveSystem _reaction = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedStackSystem _stack = default!;
-    [Dependency] private readonly StomachSystem _stomach = default!;
-    [Dependency] private readonly UtensilSystem _utensil = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const float MaxFeedDistance = 1.0f;
 
@@ -60,25 +38,35 @@ public sealed class FoodSystem : EntitySystem
     {
         base.Initialize();
 
-        // TODO add InteractNoHandEvent for entities like mice.
-        // run after openable for wrapped/peelable foods
         SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
         SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
+
         SubscribeLocalEvent<FoodComponent, GetVerbsEvent<AlternativeVerb>>(AddEatVerb);
-        SubscribeLocalEvent<FoodComponent, ConsumeDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(OnInventoryIngestAttempt);
+
+        SubscribeLocalEvent<FoodComponent, BeforeIngestedEvent>(OnBeforeFoodEaten);
+        SubscribeLocalEvent<FoodComponent, IngestedEvent>(OnFoodEaten);
+        SubscribeLocalEvent<FoodComponent, FullyEatenEvent>(OnFoodFullyEaten);
+
+        SubscribeLocalEvent<FoodComponent, GetUtensilsEvent>(OnGetUtensils);
+
+        SubscribeLocalEvent<FoodComponent, IsDigestibleEvent>(OnIsFoodDigestible);
+
+        SubscribeLocalEvent<FoodComponent, EdibleEvent>(OnFood);
+
+        SubscribeLocalEvent<FoodComponent, GetEdibleTypeEvent>(OnGetEdibleType);
+
+        SubscribeLocalEvent<FoodComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
     }
 
     /// <summary>
-    /// Eat item
+    /// Eat or drink an item
     /// </summary>
     private void OnUseFoodInHand(Entity<FoodComponent> entity, ref UseInHandEvent ev)
     {
         if (ev.Handled)
             return;
 
-        var result = TryFeed(ev.User, ev.User, entity, entity.Comp);
-        ev.Handled = result.Handled;
+        ev.Handled = _ingestion.TryIngest(ev.User, ev.User, entity);
     }
 
     /// <summary>
@@ -89,480 +77,177 @@ public sealed class FoodSystem : EntitySystem
         if (args.Handled || args.Target == null || !args.CanReach)
             return;
 
-        var result = TryFeed(args.User, args.Target.Value, entity, entity.Comp);
-        args.Handled = result.Handled;
+        args.Handled = _ingestion.TryIngest(args.User, args.Target.Value, entity);
     }
 
-    /// <summary>
-    /// Tries to feed the food item to the target entity
-    /// </summary>
-    public (bool Success, bool Handled) TryFeed(EntityUid user, EntityUid target, EntityUid food, FoodComponent foodComp)
+    private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        //Suppresses eating yourself and alive mobs
-        if (food == user || (_mobState.IsAlive(food) && foodComp.RequireDead))
-            return (false, false);
+        var user = args.User;
 
-        // Target can't be fed or they're already eating
-        if (!TryComp<BodyComponent>(target, out var body))
-            return (false, false);
+        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
+            return;
 
-        if (HasComp<UnremoveableComponent>(food))
-            return (false, false);
+        if (!_ingestion.TryGetIngestionVerb(user, entity, IngestionSystem.Food, out var verb))
+            return;
 
-        if (_openable.IsClosed(food, user, predicted: true))
-            return (false, true);
-
-        if (!_solutionContainer.TryGetSolution(food, foodComp.Solution, out _, out var foodSolution))
-            return (false, false);
-
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((target, body), out var stomachs))
-            return (false, false);
-
-        // Check for special digestibles
-        if (!IsDigestibleBy(food, foodComp, stomachs))
-            return (false, false);
-
-        if (!TryGetRequiredUtensils(user, foodComp, out _))
-            return (false, false);
-
-        // Check for used storage on the food item
-        if (TryComp<StorageComponent>(food, out var storageState) && storageState.Container.ContainedEntities.Any())
-        {
-            _popup.PopupClient(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
-            return (false, true);
-        }
-
-        // Checks for used item slots
-        if (TryComp<ItemSlotsComponent>(food, out var itemSlots))
-        {
-            if (itemSlots.Slots.Any(slot => slot.Value.HasItem))
-            {
-                _popup.PopupClient(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
-                return (false, true);
-            }
-        }
-
-        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(food, user, foodSolution);
-
-        if (GetUsesRemaining(food, foodComp) <= 0)
-        {
-            _popup.PopupClient(Loc.GetString("food-system-try-use-food-is-empty", ("entity", food)), user, user);
-            DeleteAndSpawnTrash(foodComp, food, user);
-            return (false, true);
-        }
-
-        if (IsMouthBlocked(target, user))
-            return (false, true);
-
-        if (!_interaction.InRangeUnobstructed(user, food, popup: true))
-            return (false, true);
-
-        if (!_interaction.InRangeUnobstructed(user, target, MaxFeedDistance, popup: true))
-            return (false, true);
-
-        // TODO make do-afters account for fixtures in the range check.
-        if (!_transform.GetMapCoordinates(user).InRange(_transform.GetMapCoordinates(target), MaxFeedDistance))
-        {
-            var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
-            _popup.PopupClient(message, user, user);
-            return (false, true);
-        }
-
-        var forceFeed = user != target;
-        if (forceFeed)
-        {
-            var userName = Identity.Entity(user, EntityManager);
-            _popup.PopupEntity(Loc.GetString("food-system-force-feed", ("user", userName)),
-                user, target);
-
-            // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
-        }
-        else
-        {
-            // log voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
-        }
-
-        var doAfterArgs = new DoAfterArgs(EntityManager,
-            user,
-            forceFeed ? foodComp.ForceFeedDelay : foodComp.Delay,
-            new ConsumeDoAfterEvent(foodComp.Solution, flavors),
-            eventTarget: food,
-            target: target,
-            used: food)
-        {
-            BreakOnHandChange = false,
-            BreakOnMove = forceFeed,
-            BreakOnDamage = true,
-            MovementThreshold = 0.01f,
-            DistanceThreshold = MaxFeedDistance,
-            // do-after will stop if item is dropped when trying to feed someone else
-            // or if the item started out in the user's own hands
-            NeedHand = forceFeed || _hands.IsHolding(user, food),
-        };
-
-        _doAfter.TryStartDoAfter(doAfterArgs);
-        return (true, true);
+        args.Verbs.Add(verb);
     }
 
-    private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent args)
+    private void OnBeforeFoodEaten(Entity<FoodComponent> food, ref BeforeIngestedEvent args)
     {
-        if (args.Cancelled || args.Handled || entity.Comp.Deleted || args.Target == null)
+        if (args.Cancelled || args.Solution is not { } solution)
             return;
 
-        if (!TryComp<BodyComponent>(args.Target.Value, out var body))
-            return;
+        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
+        args.Transfer = food.Comp.TransferAmount ?? solution.Volume;
+    }
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
+    private void OnFoodEaten(Entity<FoodComponent> entity, ref IngestedEvent args)
+    {
+        if (args.Handled)
             return;
 
-        if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
-            return;
-
-        if (!TryGetRequiredUtensils(args.User, entity.Comp, out var utensils))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (IsMouthBlocked(args.Target.Value))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
-            return;
-
-        var forceFeed = args.User != args.Target;
-
         args.Handled = true;
-        var transferAmount = entity.Comp.TransferAmount != null ? FixedPoint2.Min((FixedPoint2) entity.Comp.TransferAmount, solution.Volume) : solution.Volume;
 
-        var split = _solutionContainer.SplitSolution(soln.Value, transferAmount);
+        _audio.PlayPredicted(entity.Comp.UseSound, args.Target, args.User, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f));
 
-        // Get the stomach with the highest available solution volume
-        var highestAvailable = FixedPoint2.Zero;
-        Entity<StomachComponent>? stomachToUse = null;
-        foreach (var ent in stomachs)
+        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
+
+        if (args.ForceFed)
         {
-            var owner = ent.Owner;
-            if (!_stomach.CanTransferSolution(owner, split, ent.Comp1))
-                continue;
-
-            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
-                continue;
-
-            if (stomachSol.AvailableVolume <= highestAvailable)
-                continue;
-
-            stomachToUse = ent;
-            highestAvailable = stomachSol.AvailableVolume;
-        }
-
-        // No stomach so just popup a message that they can't eat.
-        if (stomachToUse == null)
-        {
-            _solutionContainer.TryAddSolution(soln.Value, split);
-            _popup.PopupClient(forceFeed ? Loc.GetString("food-system-you-cannot-eat-any-more-other", ("target", args.Target.Value)) : Loc.GetString("food-system-you-cannot-eat-any-more"), args.Target.Value, args.User);
-            return;
-        }
-
-        _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse);
-
-        var flavors = args.FlavorMessage;
-
-        if (forceFeed)
-        {
-            var targetName = Identity.Entity(args.Target.Value, EntityManager);
+            var targetName = Identity.Entity(args.Target, EntityManager);
             var userName = Identity.Entity(args.User, EntityManager);
-            _popup.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName), ("flavors", flavors)), entity.Owner, entity.Owner);
+            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Food)), ("flavors", flavors)), entity, entity);
 
-            _popup.PopupClient(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)), args.User, args.User);
+            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Food))), args.User, args.User);
 
-            // log successful force feed
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity.Owner):food}");
+            // log successful forced feeding
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity):food}");
         }
         else
         {
             _popup.PopupClient(Loc.GetString(entity.Comp.EatMessage, ("food", entity.Owner), ("flavors", flavors)), args.User, args.User);
 
             // log successful voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity.Owner):food}");
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity):food}");
         }
 
-        _audio.PlayPredicted(entity.Comp.UseSound, args.Target.Value, args.User, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f));
-
-        // Try to break all used utensils
-        foreach (var utensil in utensils)
+        // BREAK OUR UTENSILS
+        if (_ingestion.TryGetUtensils(args.User, entity, out var utensils))
         {
-            _utensil.TryBreak(utensil, args.User);
-        }
-
-        args.Repeat = !forceFeed;
-
-        if (TryComp<StackComponent>(entity, out var stack))
-        {
-            //Not deleting whole stack piece will make troubles with grinding object
-            if (stack.Count > 1)
+            foreach (var utensil in utensils)
             {
-                _stack.SetCount(entity.Owner, stack.Count - 1);
-                _solutionContainer.TryAddSolution(soln.Value, split);
-                return;
+                _ingestion.TryBreak(utensil, args.User);
             }
         }
-        else if (GetUsesRemaining(entity.Owner, entity.Comp) > 0)
+
+        if (_ingestion.GetUsesRemaining(entity, entity.Comp.Solution, args.Split.Volume) > 0)
         {
+            // Leave some of the consumer's DNA on the consumed item...
+            var ev = new TransferDnaEvent
+            {
+                Donor = args.Target,
+                Recipient = entity,
+                CanDnaBeCleaned = false,
+            };
+            RaiseLocalEvent(args.Target, ref ev);
+
+            args.Repeat = !args.ForceFed;
             return;
         }
 
-        // don't try to repeat if its being deleted
-        args.Repeat = false;
-        DeleteAndSpawnTrash(entity.Comp, entity.Owner, args.User);
+        // Food is always destroyed...
+        args.Destroy = true;
     }
 
-    public void DeleteAndSpawnTrash(FoodComponent component, EntityUid food, EntityUid user)
+    private void OnFoodFullyEaten(Entity<FoodComponent> food, ref FullyEatenEvent args)
     {
-        var ev = new BeforeFullyEatenEvent
-        {
-            User = user
-        };
-        RaiseLocalEvent(food, ev);
-        if (ev.Cancelled)
+        if (food.Comp.Trash.Count == 0)
             return;
 
-        var attemptEv = new DestructionAttemptEvent();
-        RaiseLocalEvent(food, attemptEv);
-        if (attemptEv.Cancelled)
-            return;
-
-        var afterEvent = new AfterFullyEatenEvent(user);
-        RaiseLocalEvent(food, ref afterEvent);
-
-        var dev = new DestructionEventArgs();
-        RaiseLocalEvent(food, dev);
-
-        //Sunrise-start
-
-        if (TryComp(food, out InventoryComponent? inventory))
-        {
-            foreach (SlotDefinition sl in inventory.Slots)
-            {
-                _inventory.TryUnequip(food, sl.Name, out EntityUid? item);
-                if (!TryComp(item, out TransformComponent? transform))
-                    continue;
-                _transform.DropNextTo((EntityUid)item, food);
-            }
-        }
-
-        //Sunrise-end
-
-        if (component.Trash.Count == 0)
-        {
-            QueueDel(food);
-            return;
-        }
-
-        //We're empty. Become trash.
-        //cache some data as we remove food, before spawning trash and passing it to the hand.
-
         var position = _transform.GetMapCoordinates(food);
-        var trashes = component.Trash;
-        var tryPickup = _hands.IsHolding(user, food, out _);
+        var trashes = food.Comp.Trash;
+        var tryPickup = _hands.IsHolding(args.User, food, out _);
 
-        Del(food);
         foreach (var trash in trashes)
         {
-            var spawnedTrash = Spawn(trash, position);
+            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
 
             // If the user is holding the item
             if (tryPickup)
             {
                 // Put the trash in the user's hand
-                _hands.TryPickupAnyHand(user, spawnedTrash);
+                _hands.TryPickupAnyHand(args.User, spawnedTrash);
             }
         }
     }
 
-    private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<AlternativeVerb> ev)
-    {
-        if (entity.Owner == ev.User ||
-            !ev.CanInteract ||
-            !ev.CanAccess ||
-            !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
-            return;
-
-        // have to kill mouse before eating it
-        if (_mobState.IsAlive(entity) && entity.Comp.RequireDead)
-            return;
-
-        // only give moths eat verb for clothes since it would just fail otherwise
-        if (!IsDigestibleBy(entity, entity.Comp, stomachs))
-            return;
-
-        var user = ev.User;
-        AlternativeVerb verb = new()
-        {
-            Act = () =>
-            {
-                TryFeed(user, user, entity, entity.Comp);
-            },
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/cutlery.svg.192dpi.png")),
-            Text = Loc.GetString("food-system-verb-eat"),
-            Priority = -1
-        };
-
-        ev.Verbs.Add(verb);
-    }
-
-    /// <summary>
-    ///     Returns true if the food item can be digested by the user.
-    /// </summary>
-    public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodComp = null)
-    {
-        if (!Resolve(food, ref foodComp, false))
-            return false;
-
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(uid, out var stomachs))
-            return false;
-
-        return IsDigestibleBy(food, foodComp, stomachs);
-    }
-
-    /// <summary>
-    ///     Returns true if <paramref name="stomachs"/> has a <see cref="StomachComponent.SpecialDigestible"/> that whitelists
-    ///     this <paramref name="food"/> (or if they even have enough stomachs in the first place).
-    /// </summary>
-    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity<StomachComponent, OrganComponent>> stomachs)
-    {
-        var digestible = true;
-
-        // Does the mob have enough stomachs?
-        if (stomachs.Count < component.RequiredStomachs)
-            return false;
-
-        // Run through the mobs' stomachs
-        foreach (var ent in stomachs)
-        {
-            // Find a stomach with a SpecialDigestible
-            if (ent.Comp1.SpecialDigestible == null)
-                continue;
-            // Check if the food is in the whitelist
-            if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
-                return true;
-
-            // If their diet is whitelist exclusive, then they cannot eat anything but what follows their whitelisted tags. Else, they can eat their tags AND human food.
-            if (ent.Comp1.IsSpecialDigestibleExclusive)
-                return false;
-        }
-
-        if (component.RequiresSpecialDigestion)
-            return false;
-
-        return digestible;
-    }
-
-    private bool TryGetRequiredUtensils(EntityUid user, FoodComponent component,
-        out List<EntityUid> utensils, HandsComponent? hands = null)
-    {
-        utensils = new List<EntityUid>();
-
-        if (component.Utensil == UtensilType.None)
-            return true;
-
-        if (!Resolve(user, ref hands, false))
-            return true; //mice
-
-        var usedTypes = UtensilType.None;
-
-        foreach (var item in _hands.EnumerateHeld(user, hands))
-        {
-            // Is utensil?
-            if (!TryComp<UtensilComponent>(item, out var utensil))
-                continue;
-
-            if ((utensil.Types & component.Utensil) != 0 && // Acceptable type?
-                (usedTypes & utensil.Types) != utensil.Types) // Type is not used already? (removes usage of identical utensils)
-            {
-                // Add to used list
-                usedTypes |= utensil.Types;
-                utensils.Add(item);
-            }
-        }
-
-        // If "required" field is set, try to block eating without proper utensils used
-        if (component.UtensilRequired && (usedTypes & component.Utensil) != component.Utensil)
-        {
-            _popup.PopupClient(Loc.GetString("food-you-need-to-hold-utensil", ("utensil", component.Utensil ^ usedTypes)), user, user);
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Block ingestion attempts based on the equipped mask or head-wear
-    /// </summary>
-    private void OnInventoryIngestAttempt(Entity<InventoryComponent> entity, ref IngestionAttemptEvent args)
+    private void OnFood(Entity<FoodComponent> food, ref EdibleEvent args)
     {
         if (args.Cancelled)
             return;
 
-        IngestionBlockerComponent? blocker;
+        if (args.Cancelled || args.Solution != null)
+            return;
 
-        if (_inventory.TryGetSlotEntity(entity.Owner, "mask", out var maskUid) &&
-            TryComp(maskUid, out blocker) &&
-            blocker.Enabled)
+        if (food.Comp.UtensilRequired && !_ingestion.HasRequiredUtensils(args.User, food.Comp.Utensil))
         {
-            args.Blocker = maskUid;
-            args.Cancel();
+            args.Cancelled = true;
             return;
         }
 
-        if (_inventory.TryGetSlotEntity(entity.Owner, "head", out var headUid) &&
-            TryComp(headUid, out blocker) &&
-            blocker.Enabled)
-        {
-            args.Blocker = headUid;
-            args.Cancel();
-        }
+        // Check this last
+        _solutionContainer.TryGetSolution(food.Owner, food.Comp.Solution, out args.Solution);
+        args.Time += TimeSpan.FromSeconds(food.Comp.Delay);
     }
 
-
-    /// <summary>
-    ///     Check whether the target's mouth is blocked by equipment (masks or head-wear).
-    /// </summary>
-    /// <param name="uid">The target whose equipment is checked</param>
-    /// <param name="popupUid">Optional entity that will receive an informative pop-up identifying the blocking
-    /// piece of equipment.</param>
-    /// <returns></returns>
-    public bool IsMouthBlocked(EntityUid uid, EntityUid? popupUid = null)
+    private void OnGetUtensils(Entity<FoodComponent> entity, ref GetUtensilsEvent args)
     {
-        var attempt = new IngestionAttemptEvent();
-        RaiseLocalEvent(uid, attempt, false);
-        if (attempt.Cancelled && attempt.Blocker != null && popupUid != null)
-        {
-            _popup.PopupClient(Loc.GetString("food-system-remove-mask", ("entity", attempt.Blocker.Value)),
-                uid, popupUid.Value);
-        }
+        if (entity.Comp.Utensil == UtensilType.None)
+            return;
 
-        return attempt.Cancelled;
+        if (entity.Comp.UtensilRequired)
+            args.AddRequiredTypes(entity.Comp.Utensil);
+        else
+            args.Types |= entity.Comp.Utensil;
     }
 
-    /// <summary>
-    /// Get the number of bites this food has left, based on how much food solution there is and how much of it to eat per bite.
-    /// </summary>
-    public int GetUsesRemaining(EntityUid uid, FoodComponent? comp = null)
+    // TODO: When DrinkComponent and FoodComponent are properly obseleted, make the IsDigestionBools in IngestionSystem private again.
+    private void OnIsFoodDigestible(Entity<FoodComponent> ent, ref IsDigestibleEvent args)
     {
-        if (!Resolve(uid, ref comp))
-            return 0;
+        if (ent.Comp.RequireDead && _mobState.IsAlive(ent))
+            return;
 
-        if (!_solutionContainer.TryGetSolution(uid, comp.Solution, out _, out var solution) || solution.Volume == 0)
-            return 0;
+        args.AddDigestible(ent.Comp.RequiresSpecialDigestion);
+    }
 
-        // eat all in 1 go, so non empty is 1 bite
-        if (comp.TransferAmount == null)
-            return 1;
+    private void OnGetEdibleType(Entity<FoodComponent> ent, ref GetEdibleTypeEvent args)
+    {
+        if (args.Type != null)
+            return;
 
-        return Math.Max(1, (int) Math.Ceiling((solution.Volume / (FixedPoint2) comp.TransferAmount).Float()));
+        args.SetPrototype(IngestionSystem.Food);
+    }
+
+    private void OnBeforeFullySliced(Entity<FoodComponent> food, ref BeforeFullySlicedEvent args)
+    {
+        if (food.Comp.Trash.Count == 0)
+            return;
+
+        var position = _transform.GetMapCoordinates(food);
+        var trashes = food.Comp.Trash;
+        var tryPickup = _hands.IsHolding(args.User, food, out _);
+
+        foreach (var trash in trashes)
+        {
+            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
+
+            // If the user is holding the item
+            if (tryPickup)
+            {
+                // Put the trash in the user's hand
+                _hands.TryPickupAnyHand(args.User, spawnedTrash);
+            }
+        }
     }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index c40ae1df78..c942247f49 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -31,14 +31,9 @@ public sealed class HungerSystem : EntitySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
 
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string HungerIconOverfedId = "HungerIconOverfed";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string HungerIconPeckishId = "HungerIconPeckish";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string HungerIconStarvingId = "HungerIconStarving";
+    private static readonly ProtoId<SatiationIconPrototype> HungerIconOverfedId = "HungerIconOverfed";
+    private static readonly ProtoId<SatiationIconPrototype> HungerIconPeckishId = "HungerIconPeckish";
+    private static readonly ProtoId<SatiationIconPrototype> HungerIconStarvingId = "HungerIconStarving";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
deleted file mode 100644
index f9cd233948..0000000000
--- a/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Clothing;
-using Content.Shared.Nutrition.Components;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-public sealed class IngestionBlockerSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<IngestionBlockerComponent, ItemMaskToggledEvent>(OnBlockerMaskToggled);
-    }
-
-    private void OnBlockerMaskToggled(Entity<IngestionBlockerComponent> ent, ref ItemMaskToggledEvent args)
-    {
-        ent.Comp.Enabled = !args.Mask.Comp.IsToggled;
-    }
-}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
new file mode 100644
index 0000000000..3a8ef333d7
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
@@ -0,0 +1,430 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Prototypes;
+using Content.Shared.Verbs;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+/// <summary>
+/// Public API for Ingestion System so you can build your own form of ingestion system.
+/// </summary>
+public sealed partial class IngestionSystem
+{
+    // List of prototypes that other components or systems might want.
+    public static readonly ProtoId<EdiblePrototype> Food = "Food";
+    public static readonly ProtoId<EdiblePrototype> Drink = "Drink";
+
+    public const float MaxFeedDistance = 1.0f; // We should really have generic interaction ranges like short, medium, long and use those instead...
+    // BodySystem has no way of telling us where the mouth is so we're making some assumptions.
+    public const SlotFlags DefaultFlags = SlotFlags.HEAD | SlotFlags.MASK;
+
+    #region Ingestion
+
+    /// <summary>
+    /// An entity is trying to ingest another entity in Space Station 14!!!
+    /// </summary>
+    /// <param name="user">The entity who is eating.</param>
+    /// <param name="ingested">The entity that is trying to be ingested.</param>
+    /// <returns>Returns true if we are now ingesting the item.</returns>
+    public bool TryIngest(EntityUid user, EntityUid ingested)
+    {
+        return TryIngest(user, user, ingested);
+    }
+
+    /// <inheritdoc cref="TryIngest(EntityUid,EntityUid)"/>
+    /// <summary>Overload of TryIngest for if an entity is trying to make another entity ingest an entity</summary>
+    /// <param name="user">The entity who is trying to make this happen.</param>
+    /// <param name="target">The entity who is being made to ingest something.</param>
+    /// <param name="ingested">The entity that is trying to be ingested.</param>
+    public bool TryIngest(EntityUid user, EntityUid target, EntityUid ingested)
+    {
+        return AttemptIngest(user, target, ingested, true);
+    }
+
+    /// <summary>
+    /// Checks if we can ingest a given entity without actually ingesting it.
+    /// </summary>
+    /// <param name="user">The entity doing the ingesting.</param>
+    /// <param name="ingested">The ingested entity.</param>
+    /// <returns>Returns true if it's possible for the entity to ingest this item.</returns>
+    public bool CanIngest(EntityUid user, EntityUid ingested)
+    {
+        return AttemptIngest(user, user, ingested, false);
+    }
+
+    /// <summary>
+    ///     Check whether we have an open pie-hole that's in range.
+    /// </summary>
+    /// <param name="user">The one performing the action</param>
+    /// <param name="target">The target whose mouth is checked</param>
+    /// <returns></returns>
+    public bool HasMouthAvailable(EntityUid user, EntityUid target)
+    {
+        return HasMouthAvailable(user, target, DefaultFlags);
+    }
+
+    /// <inheritdoc cref="HasMouthAvailable(EntityUid, EntityUid)"/>
+    /// Overflow which takes custom flags for a mouth being blocked, in case the entity has a mouth not on the face.
+    public bool HasMouthAvailable(EntityUid user, EntityUid target, SlotFlags flags)
+    {
+        if (!_transform.GetMapCoordinates(user).InRange(_transform.GetMapCoordinates(target), MaxFeedDistance))
+        {
+            var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
+            _popup.PopupClient(message, user, user);
+            return false;
+        }
+
+        var attempt = new IngestionAttemptEvent(flags);
+        RaiseLocalEvent(target, ref attempt);
+
+        if (!attempt.Cancelled)
+            return true;
+
+        if (attempt.Blocker != null)
+            _popup.PopupClient(Loc.GetString("ingestion-remove-mask", ("entity", attempt.Blocker.Value)), target, user);
+
+        return false;
+    }
+
+    /// <inheritdoc cref="CanConsume(EntityUid,EntityUid)"/>
+    /// <param name="user">The entity that is consuming</param>
+    /// <param name="ingested">The entity that is being consumed</param>
+    public bool CanConsume(EntityUid user, EntityUid ingested)
+    {
+        return CanConsume(user, user, ingested, out _, out _);
+    }
+
+    /// <summary>
+    ///     Checks if we can feed an edible solution from an entity to a target.
+    /// </summary>
+    /// <param name="user">The one doing the feeding</param>
+    /// <param name="target">The one being fed.</param>
+    /// <param name="ingested">The food item being eaten.</param>
+    /// <returns>Returns true if the user can feed the target with the ingested entity</returns>
+    public bool CanConsume(EntityUid user, EntityUid target, EntityUid ingested)
+    {
+        return CanConsume(user, target, ingested, out _, out _);
+    }
+
+    /// <inheritdoc cref="CanConsume(EntityUid,EntityUid,EntityUid)"/>
+    /// <param name="user">The one doing the feeding</param>
+    /// <param name="target">The one being fed.</param>
+    /// <param name="ingested">The food item being eaten.</param>
+    /// <param name="solution">The solution we will be consuming from.</param>
+    /// <param name="time">The time it takes us to eat this entity if any.</param>
+    /// <returns>Returns true if the user can feed the target with the ingested entity and also returns a solution</returns>
+    public bool CanConsume(EntityUid user,
+        EntityUid target,
+        EntityUid ingested,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solution,
+        out TimeSpan? time)
+    {
+        solution = null;
+        time = null;
+
+        if (!HasMouthAvailable(user, target))
+            return false;
+
+        // If we don't have the tools to eat we can't eat.
+        return CanAccessSolution(ingested, user, out solution, out time);
+    }
+
+    #endregion
+
+    #region EdibleComponent
+
+    public void SpawnTrash(Entity<EdibleComponent> entity, EntityUid user)
+    {
+        if (entity.Comp.Trash.Count == 0)
+            return;
+
+        var position = _transform.GetMapCoordinates(entity);
+        var trashes = entity.Comp.Trash;
+        var tryPickup = _hands.IsHolding(user, entity, out _);
+
+        foreach (var trash in trashes)
+        {
+            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
+
+            // If the user is holding the item
+            if (tryPickup)
+            {
+                // Put the trash in the user's hand
+                _hands.TryPickupAnyHand(user, spawnedTrash);
+            }
+        }
+    }
+
+    public FixedPoint2 EdibleVolume(Entity<EdibleComponent> entity)
+    {
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+            return FixedPoint2.Zero;
+
+        return solution.Volume;
+    }
+
+    public bool IsEmpty(Entity<EdibleComponent> entity)
+    {
+        return EdibleVolume(entity) == FixedPoint2.Zero;
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable nutrition from an entity, checks first if we can metabolize it.
+    /// If we can't then it's not worth any nutrition.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <param name="consumer">The entity doing the consuming</param>
+    /// <returns>The amount of nutrition the consumable is worth</returns>
+    public float TotalNutrition(Entity<EdibleComponent?> entity, EntityUid consumer)
+    {
+        if (!CanIngest(consumer, entity))
+            return 0f;
+
+        return TotalNutrition(entity);
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable nutrition from an entity, assumes we can eat and metabolize it.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <returns>The amount of nutrition the consumable is worth</returns>
+    public float TotalNutrition(Entity<EdibleComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return 0f;
+
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+            return 0f;
+
+        var total = 0f;
+        foreach (var quantity in solution.Contents)
+        {
+            var reagent = _proto.Index<ReagentPrototype>(quantity.Reagent.Prototype);
+            if (reagent.Metabolisms == null)
+                continue;
+
+            foreach (var entry in reagent.Metabolisms.Values)
+            {
+                foreach (var effect in entry.Effects)
+                {
+                    // ignores any effect conditions, just cares about how much it can hydrate
+                    if (effect is SatiateHunger hunger)
+                    {
+                        total += hunger.NutritionFactor * quantity.Quantity.Float();
+                    }
+                }
+            }
+        }
+
+        return total;
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable hydration from an entity, checks first if we can metabolize it.
+    /// If we can't then it's not worth any hydration.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <param name="consumer">The entity doing the consuming</param>
+    /// <returns>The amount of hydration the consumable is worth</returns>
+    public float TotalHydration(Entity<EdibleComponent?> entity, EntityUid consumer)
+    {
+        if (!CanIngest(consumer, entity))
+            return 0f;
+
+        return TotalNutrition(entity);
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable hydration from an entity, assumes we can eat and metabolize it.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <returns>The amount of hydration the consumable is worth</returns>
+    public float TotalHydration(Entity<EdibleComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return 0f;
+
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+            return 0f;
+
+        var total = 0f;
+        foreach (var quantity in solution.Contents)
+        {
+            var reagent = _proto.Index<ReagentPrototype>(quantity.Reagent.Prototype);
+            if (reagent.Metabolisms == null)
+                continue;
+
+            foreach (var entry in reagent.Metabolisms.Values)
+            {
+                foreach (var effect in entry.Effects)
+                {
+                    // ignores any effect conditions, just cares about how much it can hydrate
+                    if (effect is SatiateThirst thirst)
+                    {
+                        total += thirst.HydrationFactor * quantity.Quantity.Float();
+                    }
+                }
+            }
+        }
+
+        return total;
+    }
+
+    #endregion
+
+    #region Solutions
+
+    /// <summary>
+    /// Checks if the item is currently edible.
+    /// </summary>
+    /// <param name="ingested">Entity being ingested</param>
+    /// <param name="user">The entity trying to make the ingestion happening, not necessarily the one eating</param>
+    /// <param name="solution">Solution we're returning</param>
+    /// <param name="time">The time it takes us to eat this entity</param>
+    public bool CanAccessSolution(Entity<SolutionContainerManagerComponent?> ingested,
+        EntityUid user,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solution,
+        out TimeSpan? time)
+    {
+        solution = null;
+        time = null;
+
+        if (!Resolve(ingested, ref ingested.Comp))
+        {
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-is-empty", ("entity", ingested)), ingested, user);
+            return false;
+        }
+
+        var ev = new EdibleEvent(user);
+        RaiseLocalEvent(ingested, ref ev);
+
+        solution = ev.Solution;
+        time = ev.Time;
+
+        return !ev.Cancelled && solution != null;
+    }
+
+    /// <summary>
+    /// Estimate the number of bites this food has left, based on how much food solution there is and how much of it to eat per bite.
+    /// </summary>
+    public int GetUsesRemaining(EntityUid uid, string solutionName, FixedPoint2 splitVol)
+    {
+        if (!_solutionContainer.TryGetSolution(uid, solutionName, out _, out var solution) || solution.Volume == 0)
+            return 0;
+
+        return Math.Max(1, (int) Math.Ceiling((solution.Volume / splitVol).Float()));
+    }
+
+    #endregion
+
+    #region Edible Types
+
+    /// <summary>
+    /// Tries to get the ingestion verbs for a given user entity and ingestible entity
+    /// </summary>
+    /// <param name="user">The one getting the verbs who would be doing the eating.</param>
+    /// <param name="ingested">Entity being ingested.</param>
+    /// <param name="type">Edible prototype.</param>
+    /// <param name="verb">Verb we're returning.</param>
+    /// <returns>Returns true if we generated a verb.</returns>
+    public bool TryGetIngestionVerb(EntityUid user, EntityUid ingested, [ForbidLiteral] ProtoId<EdiblePrototype> type, [NotNullWhen(true)] out AlternativeVerb? verb)
+    {
+        verb = null;
+
+        // We want to see if we can ingest this item, but we don't actually want to ingest it.
+        if (!CanIngest(user, ingested))
+            return false;
+
+        var proto = _proto.Index(type);
+
+        verb = new()
+        {
+            Act = () =>
+            {
+                TryIngest(user, user, ingested);
+            },
+            Icon = proto.VerbIcon,
+            Text = Loc.GetString(proto.VerbName),
+            Priority = 2
+        };
+
+        return true;
+    }
+
+    /// <summary>
+    /// Returns the most accurate edible prototype for an entity if one exists.
+    /// </summary>
+    /// <param name="entity">entity who's edible prototype we want</param>
+    /// <returns>The best matching prototype if one exists.</returns>
+    public ProtoId<EdiblePrototype>? GetEdibleType(Entity<EdibleComponent?> entity)
+    {
+        if (Resolve(entity, ref entity.Comp, false))
+            return entity.Comp.Edible;
+
+        var ev = new GetEdibleTypeEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        return ev.Type;
+    }
+
+    public string GetEdibleNoun(Entity<EdibleComponent?> entity)
+    {
+        if (Resolve(entity, ref entity.Comp, false))
+            return GetProtoVerb(entity.Comp.Edible);
+
+        var ev = new GetEdibleTypeEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        if (ev.Type == null)
+            return Loc.GetString("edible-noun-edible");
+
+        return GetProtoNoun(ev.Type.Value);
+    }
+
+    public string GetProtoNoun([ForbidLiteral] ProtoId<EdiblePrototype> proto)
+    {
+        var prototype = _proto.Index(proto);
+
+        return GetProtoNoun(prototype);
+    }
+
+    public string GetProtoNoun(EdiblePrototype proto)
+    {
+        return Loc.GetString(proto.Noun);
+    }
+
+    public string GetEdibleVerb(Entity<EdibleComponent?> entity)
+    {
+        if (Resolve(entity, ref entity.Comp, false))
+            return GetProtoVerb(entity.Comp.Edible);
+
+        var ev = new GetEdibleTypeEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        if (ev.Type == null)
+            return Loc.GetString("edible-verb-edible");
+
+        return GetProtoVerb(ev.Type.Value);
+    }
+
+    public string GetProtoVerb([ForbidLiteral] ProtoId<EdiblePrototype> proto)
+    {
+        var prototype = _proto.Index(proto);
+
+        return GetProtoVerb(prototype);
+    }
+
+    public string GetProtoVerb(EdiblePrototype proto)
+    {
+        return Loc.GetString(proto.Verb);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs
new file mode 100644
index 0000000000..3e7c9da122
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs
@@ -0,0 +1,163 @@
+using System.Linq;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Storage;
+using Content.Shared.Weapons.Ranged.Systems;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public sealed partial class IngestionSystem
+{
+    [Dependency] private readonly OpenableSystem _openable = default!;
+
+    public void InitializeBlockers()
+    {
+        SubscribeLocalEvent<UnremoveableComponent, IngestibleEvent>(OnUnremovableIngestion);
+        SubscribeLocalEvent<IngestionBlockerComponent, ItemMaskToggledEvent>(OnBlockerMaskToggled);
+        SubscribeLocalEvent<IngestionBlockerComponent, IngestionAttemptEvent>(OnIngestionBlockerAttempt);
+        SubscribeLocalEvent<IngestionBlockerComponent, InventoryRelayedEvent<IngestionAttemptEvent>>(OnIngestionBlockerAttempt);
+
+        // Edible Event
+        SubscribeLocalEvent<EdibleComponent, EdibleEvent>(OnEdible);
+        SubscribeLocalEvent<StorageComponent, EdibleEvent>(OnStorageEdible);
+        SubscribeLocalEvent<ItemSlotsComponent, EdibleEvent>(OnItemSlotsEdible);
+        SubscribeLocalEvent<OpenableComponent, EdibleEvent>(OnOpenableEdible);
+
+        // Digestion Events
+        SubscribeLocalEvent<EdibleComponent, IsDigestibleEvent>(OnEdibleIsDigestible);
+        SubscribeLocalEvent<DrainableSolutionComponent, IsDigestibleEvent>(OnDrainableIsDigestible);
+        SubscribeLocalEvent<PuddleComponent, IsDigestibleEvent>(OnPuddleIsDigestible);
+
+        SubscribeLocalEvent<PillComponent, BeforeIngestedEvent>(OnPillBeforeEaten);
+    }
+
+    private void OnUnremovableIngestion(Entity<UnremoveableComponent> entity, ref IngestibleEvent args)
+    {
+        // If we can't remove it we probably shouldn't be able to eat it.
+        // TODO: Separate glue and Unremovable component.
+        args.Cancelled = true;
+    }
+
+    private void OnBlockerMaskToggled(Entity<IngestionBlockerComponent> ent, ref ItemMaskToggledEvent args)
+    {
+        ent.Comp.Enabled = !args.Mask.Comp.IsToggled;
+    }
+
+    private void OnIngestionBlockerAttempt(Entity<IngestionBlockerComponent> entity, ref IngestionAttemptEvent args)
+    {
+        if (!args.Cancelled && entity.Comp.Enabled)
+            args.Cancelled = true;
+    }
+
+    /// <summary>
+    ///     Block ingestion attempts based on the equipped mask or head-wear
+    /// </summary>
+    private void OnIngestionBlockerAttempt(Entity<IngestionBlockerComponent> entity, ref InventoryRelayedEvent<IngestionAttemptEvent> args)
+    {
+        if (args.Args.Cancelled || !entity.Comp.Enabled)
+            return;
+
+        args.Args.Cancelled = true;
+        args.Args.Blocker = entity;
+    }
+
+    private void OnEdible(Entity<EdibleComponent> entity, ref EdibleEvent args)
+    {
+        if (args.Cancelled || args.Solution != null)
+            return;
+
+        if (entity.Comp.UtensilRequired && !HasRequiredUtensils(args.User, entity.Comp.Utensil))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        // Check this last
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out args.Solution) || IsEmpty(entity) && !entity.Comp.DestroyOnEmpty)
+        {
+            args.Cancelled = true;
+
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-is-empty", ("entity", entity)), entity, args.User);
+            return;
+        }
+
+        // Time is additive because I said so.
+        args.Time += entity.Comp.Delay;
+    }
+
+    private void OnStorageEdible(Entity<StorageComponent> ent, ref EdibleEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!ent.Comp.Container.ContainedEntities.Any())
+            return;
+
+        args.Cancelled = true;
+
+        _popup.PopupClient(Loc.GetString("edible-has-used-storage", ("food", ent), ("verb", GetEdibleVerb(ent.Owner))), args.User, args.User);
+    }
+
+    private void OnItemSlotsEdible(Entity<ItemSlotsComponent> ent, ref EdibleEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!ent.Comp.Slots.Any(slot => slot.Value.HasItem))
+            return;
+
+        args.Cancelled = true;
+
+        _popup.PopupClient(Loc.GetString("edible-has-used-storage", ("food", ent), ("verb", GetEdibleVerb(ent.Owner))), args.User, args.User);
+    }
+
+    private void OnOpenableEdible(Entity<OpenableComponent> ent, ref EdibleEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (_openable.IsClosed(ent, args.User, ent.Comp, predicted: true))
+            args.Cancelled = true;
+    }
+
+    private void OnEdibleIsDigestible(Entity<EdibleComponent> ent, ref IsDigestibleEvent args)
+    {
+        if (ent.Comp.RequireDead && _mobState.IsAlive(ent))
+            return;
+
+        args.AddDigestible(ent.Comp.RequiresSpecialDigestion);
+    }
+
+    /// <remarks>
+    /// Both of these assume that having this component means there's nothing stopping you from slurping up
+    /// pure reagent juice with absolutely nothing to stop you.
+    /// </remarks>
+    private void OnDrainableIsDigestible(Entity<DrainableSolutionComponent> ent, ref IsDigestibleEvent args)
+    {
+        args.UniversalDigestion();
+    }
+
+    private void OnPuddleIsDigestible(Entity<PuddleComponent> ent, ref IsDigestibleEvent args)
+    {
+        args.UniversalDigestion();
+    }
+
+    /// <remarks>
+    /// I mean you have to eat the *whole* pill no?
+    /// </remarks>
+    private void OnPillBeforeEaten(Entity<PillComponent> ent, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled || args.Solution is not { } sol)
+            return;
+
+        if (args.TryNewMinimum(sol.Volume))
+            return;
+
+        args.Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
new file mode 100644
index 0000000000..670fdc8dfb
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
@@ -0,0 +1,157 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tools.EntitySystems;
+using Robust.Shared.Audio;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public sealed partial class IngestionSystem
+{
+    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private EntityQuery<UtensilComponent> _utensilsQuery;
+
+    public void InitializeUtensils()
+    {
+        SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ToolOpenableSystem) });
+
+        SubscribeLocalEvent<EdibleComponent, GetUtensilsEvent>(OnGetEdibleUtensils);
+
+        _utensilsQuery = GetEntityQuery<UtensilComponent>();
+    }
+
+    /// <summary>
+    /// Clicked with utensil
+    /// </summary>
+    private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
+    {
+        if (ev.Handled || ev.Target == null || !ev.CanReach)
+            return;
+
+        ev.Handled = TryUseUtensil(ev.User, ev.Target.Value, entity);
+    }
+
+    public bool TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
+    {
+        var ev = new GetUtensilsEvent();
+        RaiseLocalEvent(target, ref ev);
+
+        //Prevents food usage with a wrong utensil
+        if ((ev.Types & utensil.Comp.Types) == 0)
+        {
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-wrong-utensil", ("verb", GetEdibleVerb(target)),("food", target), ("utensil", utensil.Owner)), user, user);
+            return true;
+        }
+
+        if (!_interactionSystem.InRangeUnobstructed(user, target, popup: true))
+            return true;
+
+        return TryIngest(user, user, target);
+    }
+
+    /// <summary>
+    /// Attempt to break the utensil after interaction.
+    /// </summary>
+    /// <param name="entity">Utensil.</param>
+    /// <param name="userUid">User of the utensil.</param>
+    public void TryBreak(Entity<UtensilComponent?> entity, EntityUid userUid)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        // TODO: Once we have predicted randomness delete this for something sane...
+        var seed = SharedRandomExtensions.HashCodeCombine(new() {(int)_timing.CurTick.Value, GetNetEntity(entity).Id, GetNetEntity(userUid).Id });
+        var rand = new System.Random(seed);
+
+        if (!rand.Prob(entity.Comp.BreakChance))
+            return;
+
+        _audio.PlayPredicted(entity.Comp.BreakSound, userUid, userUid, AudioParams.Default.WithVolume(-2f));
+        // Not prediced because no random predicted
+        PredictedDel(entity.Owner);
+    }
+
+    /// <summary>
+    /// Checks if we have the utensils required to eat a certain food item.
+    /// </summary>
+    /// <param name="entity">Entity that is trying to eat.</param>
+    /// <param name="food">The types of utensils we need.</param>
+    /// <param name="utensils">The utensils needed to eat the food item.</param>
+    /// <returns>True if we are able to eat the item.</returns>
+    public bool TryGetUtensils(Entity<HandsComponent?> entity, EntityUid food, out List<EntityUid> utensils)
+    {
+        var ev = new GetUtensilsEvent();
+        RaiseLocalEvent(food, ref ev);
+
+        return TryGetUtensils(entity, ev.Types, ev.RequiredTypes, out utensils);
+    }
+
+    public bool TryGetUtensils(Entity<HandsComponent?> entity, UtensilType types, UtensilType requiredTypes, out List<EntityUid> utensils)
+    {
+        utensils = new List<EntityUid>();
+
+        var required = requiredTypes != UtensilType.None;
+
+        // Why are we even here? Just to suffer?
+        if (types == UtensilType.None)
+            return true;
+
+        // If you don't have hands you can eat anything I guess.
+        if (!Resolve(entity, ref entity.Comp, false)) // You aren't allowed to eat with your hands in this hellish dystopia.
+            return true;
+
+        var usedTypes = UtensilType.None;
+
+        foreach (var item in _hands.EnumerateHeld(entity))
+        {
+            // Is utensil?
+            if (!_utensilsQuery.TryComp(item, out var utensil))
+                continue;
+
+            // Do we have a new and unused utensil type?
+            if ((utensil.Types & types) == 0 || (usedTypes & utensil.Types) == utensil.Types)
+                continue;
+
+            // Add to used list
+            usedTypes |= utensil.Types;
+            utensils.Add(item);
+        }
+
+        // If "required" field is set, try to block eating without proper utensils used
+        if (!required || (usedTypes & requiredTypes) == requiredTypes)
+            return true;
+
+        _popup.PopupClient(Loc.GetString("ingestion-you-need-to-hold-utensil", ("utensil", requiredTypes ^ usedTypes)), entity, entity);
+        return false;
+
+    }
+
+    /// <summary>
+    /// Checks if you have the required utensils based on a list of types.
+    /// Note it is assumed if you're calling this method that you need utensils.
+    /// </summary>
+    /// <param name="entity">The entity doing the action who has the utensils.</param>
+    /// <param name="types">The types of utensils we need.</param>
+    /// <returns>Returns true if we have the utensils we need.</returns>
+    public bool HasRequiredUtensils(EntityUid entity, UtensilType types)
+    {
+        return TryGetUtensils(entity, types, types, out _);
+    }
+
+    private void OnGetEdibleUtensils(Entity<EdibleComponent> entity, ref GetUtensilsEvent args)
+    {
+        if (entity.Comp.Utensil == UtensilType.None)
+            return;
+
+        if (entity.Comp.UtensilRequired)
+            args.AddRequiredTypes(entity.Comp.Utensil);
+        else
+            args.Types |= entity.Comp.Utensil;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
new file mode 100644
index 0000000000..470747fa3f
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
@@ -0,0 +1,534 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Organ;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.Destructible;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Tools.EntitySystems;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+/// <remarks>
+/// I was warned about puddle system, I knew the risks with body system, but food and drink system?
+/// Food and Drink system was a sleeping titan, and I walked directly into it's gaping maw.
+/// Between copy-pasted code, strange reliance on systems, being a pillar of chemistry for some reason,
+/// nothing could've prepared me for the horror that I had to endure. I saw the signs, comments of those who
+/// turned back, code that was made to be "just good enough" the fact that I got soaped by soap.yml, but I
+/// ignored them and pressed on.
+/// Let this remark be a reminder to those who come after, that I was here, and that I vanquished a great beast.
+/// Let young little contributors rest easy at night not knowing the horrible system that once lived beneath the
+/// bedrock of the codebase they now commit to.
+/// </remarks>
+/// <summary>
+/// This handles the ingestion of solutions and entities.
+/// </summary>
+public sealed partial class IngestionSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    // Body Component Dependencies
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly ReactiveSystem _reaction = default!;
+    [Dependency] private readonly StomachSystem _stomach = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EdibleComponent, ComponentInit>(OnEdibleInit);
+
+        // Interactions
+        SubscribeLocalEvent<EdibleComponent, UseInHandEvent>(OnUseEdibleInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
+        SubscribeLocalEvent<EdibleComponent, AfterInteractEvent>(OnEdibleInteract, after: new[] { typeof(ToolOpenableSystem) });
+
+        // Generic Eating Handlers
+        SubscribeLocalEvent<EdibleComponent, BeforeIngestedEvent>(OnBeforeIngested);
+        SubscribeLocalEvent<EdibleComponent, IngestedEvent>(OnEdibleIngested);
+        SubscribeLocalEvent<EdibleComponent, FullyEatenEvent>(OnFullyEaten);
+
+        // Body Component eating handler
+        SubscribeLocalEvent<BodyComponent, AttemptIngestEvent>(OnTryIngest);
+        SubscribeLocalEvent<BodyComponent, EatingDoAfterEvent>(OnEatingDoAfter);
+
+        // Verbs
+        SubscribeLocalEvent<EdibleComponent, GetVerbsEvent<AlternativeVerb>>(AddEdibleVerbs);
+        SubscribeLocalEvent<EdibleComponent, SolutionContainerChangedEvent>(OnSolutionContainerChanged);
+
+        // Misc
+        SubscribeLocalEvent<EdibleComponent, AttemptShakeEvent>(OnAttemptShake);
+        SubscribeLocalEvent<EdibleComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
+
+        InitializeBlockers();
+        InitializeUtensils();
+    }
+
+    /// <summary>
+    /// Eat or drink an item
+    /// </summary>
+    private void OnUseEdibleInHand(Entity<EdibleComponent> entity, ref UseInHandEvent ev)
+    {
+        if (ev.Handled)
+            return;
+
+        ev.Handled = TryIngest(ev.User, entity);
+    }
+
+    /// <summary>
+    /// Feed someone else
+    /// </summary>
+    private void OnEdibleInteract(Entity<EdibleComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || args.Target == null || !args.CanReach)
+            return;
+
+        args.Handled = TryIngest(args.User, args.Target.Value, entity);
+    }
+
+    /// <summary>Raises events to see if it's possible to ingest </summary>
+    /// <param name="user">The entity who is trying to make this happen.</param>
+    /// <param name="target">The entity who is being made to ingest something.</param>
+    /// <param name="ingested">The entity that is trying to be ingested.</param>
+    /// <param name="ingest">Bool that determines whethere this is a Try or a Can effectively.
+    /// When set to true, it tries to ingest, when false it checks if we can.</param>
+    /// <returns>Returns true if we can ingest the item.</returns>
+    private bool AttemptIngest(EntityUid user, EntityUid target, EntityUid ingested, bool ingest)
+    {
+        var eatEv = new IngestibleEvent();
+        RaiseLocalEvent(ingested, ref eatEv);
+
+        if (eatEv.Cancelled)
+            return false;
+
+        var ingestionEv = new AttemptIngestEvent(user, ingested, ingest);
+        RaiseLocalEvent(target, ref ingestionEv);
+
+        return ingestionEv.Handled;
+    }
+
+    private void OnEdibleInit(Entity<EdibleComponent> entity, ref ComponentInit args)
+    {
+        // TODO: When Food and Drink component are kill make sure to nuke both TryComps and just have it update appearance...
+        // Beakers, Soap and other items have drainable, and we should be able to eat that solution...
+        // If I could make drainable properly support sound effects and such I'd just have it use TryIngest itself
+        // Does this exist just to make tests fail? That way you have the proper yaml???
+        if (TryComp<DrainableSolutionComponent>(entity, out var existingDrainable))
+            entity.Comp.Solution = existingDrainable.Solution;
+
+        UpdateAppearance(entity);
+
+        if (TryComp(entity, out RefillableSolutionComponent? refillComp))
+            refillComp.Solution = entity.Comp.Solution;
+    }
+
+    #region Appearance System
+
+    public void UpdateAppearance(Entity<EdibleComponent, AppearanceComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp2, false))
+            return;
+
+        var drainAvailable = EdibleVolume(entity);
+        _appearance.SetData(entity, FoodVisuals.Visual, drainAvailable.Float(), entity.Comp2);
+    }
+
+    private void OnSolutionContainerChanged(Entity<EdibleComponent> entity, ref SolutionContainerChangedEvent args)
+    {
+        UpdateAppearance(entity);
+    }
+
+    #endregion
+
+    #region BodySystem
+
+    // TODO: The IsDigestibleBy bools should be API but they're too specific to the BodySystem to be API. Requires BodySystem rework.
+    /// <summary>
+    /// Generic method which takes a list of stomachs, and checks if a given food item passes any stomach's whitelist
+    /// in a given list of stomachs.
+    /// </summary>
+    /// <param name="food">Entity being eaten</param>
+    /// <param name="stomachs">Stomachs available to digest</param>
+    public bool IsDigestibleBy(EntityUid food, List<Entity<StomachComponent, OrganComponent>> stomachs)
+    {
+        var ev = new IsDigestibleEvent();
+        RaiseLocalEvent(food, ref ev);
+
+        if (!ev.Digestible)
+            return false;
+
+        if (ev.Universal)
+            return true;
+
+        if (ev.SpecialDigestion)
+        {
+            foreach (var ent in stomachs)
+            {
+                // We need one stomach that can digest our special food.
+                if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
+                    return true;
+            }
+        }
+        else
+        {
+            foreach (var ent in stomachs)
+            {
+                // We need one stomach that can digest normal food.
+                if (ent.Comp1.SpecialDigestible == null
+                    || !ent.Comp1.IsSpecialDigestibleExclusive
+                    || _whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
+                    return true;
+            }
+        }
+
+        // If we didn't find a stomach that can digest our food then it doesn't exist.
+        return false;
+    }
+
+    /// <summary>
+    /// Generic method which takes a single stomach into account, and checks if a given food item passes a stomach whitelist.
+    /// </summary>
+    /// <param name="food">Entity being eaten</param>
+    /// <param name="stomach">Stomachs that is attempting to digest.</param>
+    public bool IsDigestibleBy(EntityUid food, Entity<StomachComponent, OrganComponent> stomach)
+    {
+        var ev = new IsDigestibleEvent();
+        RaiseLocalEvent(food, ref ev);
+
+        if (!ev.Digestible)
+            return false;
+
+        if (ev.Universal)
+            return true;
+
+        if (ev.SpecialDigestion)
+            return _whitelistSystem.IsWhitelistPass(stomach.Comp1.SpecialDigestible, food);
+
+        if (stomach.Comp1.SpecialDigestible == null || !stomach.Comp1.IsSpecialDigestibleExclusive || _whitelistSystem.IsWhitelistPass(stomach.Comp1.SpecialDigestible, food))
+            return true;
+
+        return false;
+    }
+
+    private void OnTryIngest(Entity<BodyComponent> entity, ref AttemptIngestEvent args)
+    {
+        var food = args.Ingested;
+        var forceFed = args.User != entity.Owner;
+
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(entity!, out var stomachs))
+            return;
+
+        // Can we digest the specific item we're trying to eat?
+        if (!IsDigestibleBy(args.Ingested, stomachs))
+        {
+            if (!args.Ingest)
+                return;
+
+            if (forceFed)
+                _popup.PopupClient(Loc.GetString("ingestion-cant-digest-other", ("target", entity), ("entity", food)), entity, args.User);
+            else
+                _popup.PopupClient(Loc.GetString("ingestion-cant-digest", ("entity", food)), entity, entity);
+
+            return;
+        }
+
+        // Exit early if we're just trying to get verbs
+        if (!args.Ingest)
+        {
+            args.Handled = true;
+            return;
+        }
+
+        // Check if despite being able to digest the item something is blocking us from eating.
+        if (!CanConsume(args.User, entity, args.Ingested, out var solution, out var time))
+            return;
+
+        if (!_doAfter.TryStartDoAfter(GetEdibleDoAfterArgs(args.User, entity, food, time ?? TimeSpan.Zero)))
+            return;
+
+        args.Handled = true;
+        var foodSolution = solution.Value.Comp.Solution;
+
+        if (forceFed)
+        {
+            var userName = Identity.Entity(args.User, EntityManager);
+            _popup.PopupEntity(Loc.GetString("edible-force-feed", ("user", userName), ("verb", GetEdibleVerb(food))), args.User, entity);
+
+            // logging
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(args.User):user} is forcing {ToPrettyString(entity):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
+        }
+        else
+        {
+            // log voluntary eating
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(entity):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
+        }
+    }
+
+    private void OnEatingDoAfter(Entity<BodyComponent> entity, ref EatingDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || entity.Comp.Deleted || args.Target == null)
+            return;
+
+        var food = args.Target.Value;
+
+        var blockerEv = new IngestibleEvent();
+        RaiseLocalEvent(food, ref blockerEv);
+
+        if (blockerEv.Cancelled)
+            return;
+
+        if (!CanConsume(args.User, entity, food, out var solution, out _))
+            return;
+
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(entity!, out var stomachs))
+            return;
+
+        var forceFed = args.User != entity.Owner;
+
+        var highestAvailable = FixedPoint2.Zero;
+        Entity<StomachComponent>? stomachToUse = null;
+        foreach (var ent in stomachs)
+        {
+            var owner = ent.Owner;
+            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
+                continue;
+
+            if (stomachSol.AvailableVolume <= highestAvailable)
+                continue;
+
+            if (!IsDigestibleBy(food, ent))
+                continue;
+
+            stomachToUse = ent;
+            highestAvailable = stomachSol.AvailableVolume;
+        }
+
+        // All stomachs are full or we have no stomachs
+        if (stomachToUse == null)
+        {
+            // Very long
+            _popup.PopupClient(Loc.GetString("ingestion-you-cannot-ingest-any-more", ("verb", GetEdibleVerb(food))), entity, entity);
+            if (!forceFed)
+                return;
+
+            _popup.PopupClient(Loc.GetString("ingestion-other-cannot-ingest-any-more", ("target", entity), ("verb", GetEdibleVerb(food))),  args.Target.Value, args.User);
+            return;
+        }
+
+        var beforeEv = new BeforeIngestedEvent(FixedPoint2.Zero, highestAvailable, solution.Value.Comp.Solution);
+        RaiseLocalEvent(food, ref beforeEv);
+        RaiseLocalEvent(entity, ref beforeEv);
+
+        if (beforeEv.Cancelled || beforeEv.Min > beforeEv.Max)
+        {
+            // Very long x2
+            _popup.PopupClient(Loc.GetString("ingestion-you-cannot-ingest-any-more", ("verb", GetEdibleVerb(food))), entity, entity);
+            if (!forceFed)
+                return;
+
+            _popup.PopupClient(Loc.GetString("ingestion-other-cannot-ingest-any-more", ("target", entity), ("verb", GetEdibleVerb(food))),  args.Target.Value, args.User);
+            return;
+        }
+
+        var transfer = FixedPoint2.Clamp(beforeEv.Transfer, beforeEv.Min, beforeEv.Max);
+
+        var split = _solutionContainer.SplitSolution(solution.Value, transfer);
+
+        var ingestEv = new IngestingEvent(food, split, forceFed);
+        RaiseLocalEvent(entity, ref ingestEv);
+
+        _reaction.DoEntityReaction(entity, split, ReactionMethod.Ingestion);
+
+        // Everything is good to go item has been successfuly eaten
+        var afterEv = new IngestedEvent(args.User, entity, split, forceFed);
+        RaiseLocalEvent(food, ref afterEv);
+
+        if (afterEv.Refresh)
+            _solutionContainer.TryAddSolution(solution.Value, split);
+
+        _stomach.TryTransferSolution(stomachToUse.Value.Owner, split, stomachToUse);
+
+        if (!afterEv.Destroy)
+        {
+            args.Repeat = afterEv.Repeat;
+            return;
+        }
+
+        var ev = new DestructionAttemptEvent();
+        RaiseLocalEvent(food, ev);
+        if (ev.Cancelled)
+            return;
+
+        // Tell the food that it's time to die.
+        var finishedEv = new FullyEatenEvent(args.User);
+        RaiseLocalEvent(food, ref finishedEv);
+
+        var eventArgs = new DestructionEventArgs();
+        RaiseLocalEvent(food, eventArgs);
+
+        PredictedDel(food);
+
+        // Don't try to repeat if its being deleted
+        args.Repeat = false;
+    }
+
+    /// <summary>
+    /// Gets the DoAfterArgs for the specific event
+    /// </summary>
+    /// <param name="user">Entity that is doing the action.</param>
+    /// <param name="target">Entity that is eating.</param>
+    /// <param name="food">Food entity we're trying to eat.</param>
+    /// <param name="delay">The time delay for our DoAfter</param>
+    /// <returns>Returns true if it was able to successfully start the DoAfter</returns>
+    private DoAfterArgs GetEdibleDoAfterArgs(EntityUid user, EntityUid target, EntityUid food, TimeSpan delay = default)
+    {
+        var forceFeed = user != target;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, new EatingDoAfterEvent(), target, food)
+        {
+            BreakOnHandChange = false,
+            BreakOnMove = forceFeed,
+            BreakOnDamage = true,
+            MovementThreshold = 0.01f,
+            DistanceThreshold = MaxFeedDistance,
+            // do-after will stop if item is dropped when trying to feed someone else
+            // or if the item started out in the user's own hands
+            NeedHand = forceFeed || _hands.IsHolding(user, food),
+        };
+
+        return doAfterArgs;
+    }
+
+    #endregion
+
+    private void OnBeforeIngested(Entity<EdibleComponent> food, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled || args.Solution is not { } solution)
+            return;
+
+        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
+        args.Transfer = food.Comp.TransferAmount ?? solution.Volume;
+    }
+
+    private void OnEdibleIngested(Entity<EdibleComponent> entity, ref IngestedEvent args)
+    {
+        // This is a lot but there wasn't really a way to separate this from the EdibleComponent otherwise I would've moved it.
+
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        var edible = _proto.Index(entity.Comp.Edible);
+
+        _audio.PlayPredicted(edible.UseSound, args.Target, args.User);
+
+        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
+
+        if (args.ForceFed)
+        {
+            var targetName = Identity.Entity(args.Target, EntityManager);
+            var userName = Identity.Entity(args.User, EntityManager);
+            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", edible.Verb), ("flavors", flavors)), entity, entity);
+
+            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", edible.Verb)), args.User, args.User);
+
+            // log successful forced feeding
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity):food}");
+        }
+        else
+        {
+            _popup.PopupPredicted(Loc.GetString(edible.Message, ("food", entity.Owner), ("flavors", flavors)),
+                Loc.GetString(edible.OtherMessage),
+                args.User,
+                args.User);
+
+            // log successful voluntary eating
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity):food}");
+        }
+
+        // BREAK OUR UTENSILS
+        if (TryGetUtensils(args.User, entity, out var utensils))
+        {
+            foreach (var utensil in utensils)
+            {
+                TryBreak(utensil, args.User);
+            }
+        }
+
+        // This also prevents us from repeating if it's empty
+        if (!IsEmpty(entity))
+        {
+            // Leave some of the consumer's DNA on the consumed item...
+            var ev = new TransferDnaEvent
+            {
+                Donor = args.Target,
+                Recipient = entity,
+                CanDnaBeCleaned = false,
+            };
+            RaiseLocalEvent(args.Target, ref ev);
+
+            args.Repeat = !args.ForceFed;
+            return;
+        }
+
+        args.Destroy = entity.Comp.DestroyOnEmpty;
+    }
+
+    private void OnFullyEaten(Entity<EdibleComponent> entity, ref FullyEatenEvent args)
+    {
+        SpawnTrash(entity, args.User);
+    }
+
+    private void OnBeforeFullySliced(Entity<EdibleComponent> entity, ref BeforeFullySlicedEvent args)
+    {
+        SpawnTrash(entity, args.User);
+    }
+
+    private void AddEdibleVerbs(Entity<EdibleComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        var user = args.User;
+
+        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
+            return;
+
+        if (!TryGetIngestionVerb(user, entity, entity.Comp.Edible, out var verb))
+            return;
+
+        args.Verbs.Add(verb);
+    }
+
+    private void OnAttemptShake(Entity<EdibleComponent> entity, ref AttemptShakeEvent args)
+    {
+        if (IsEmpty(entity))
+            args.Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
index 2f276fa93d..04d3c20a3f 100644
--- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -104,7 +104,7 @@ public sealed partial class OpenableSystem : EntitySystem
                 Text = Loc.GetString(comp.CloseVerbText),
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
                 Act = () => TryClose(args.Target, comp, args.User),
-                // this verb is lower priority than drink verb (2) so it doesn't conflict
+                Priority = 3
             };
         }
         else
@@ -113,7 +113,8 @@ public sealed partial class OpenableSystem : EntitySystem
             {
                 Text = Loc.GetString(comp.OpenVerbText),
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/open.svg.192dpi.png")),
-                Act = () => TryOpen(args.Target, comp, args.User)
+                Act = () => TryOpen(args.Target, comp, args.User),
+                Priority = 3
             };
         }
         args.Verbs.Add(verb);
@@ -122,10 +123,7 @@ public sealed partial class OpenableSystem : EntitySystem
     private void OnTransferAttempt(Entity<OpenableComponent> ent, ref SolutionTransferAttemptEvent args)
     {
         if (!ent.Comp.Opened)
-        {
-            // message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
-            args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", ent.Owner)));
-        }
+            args.Cancel(Loc.GetString(ent.Comp.ClosedPopup, ("owner", ent.Owner)));
     }
 
     private void OnAttemptShake(Entity<OpenableComponent> entity, ref AttemptShakeEvent args)
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
index 5543f6a3ad..fd2b70deae 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
@@ -41,7 +41,7 @@ namespace Content.Shared.Nutrition.EntitySystems
 
             creamPied.CreamPied = value;
 
-            if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            if (TryComp(uid, out AppearanceComponent? appearance))
             {
                 _appearance.SetData(uid, CreamPiedVisuals.Creamed, value, appearance);
             }
@@ -64,13 +64,13 @@ namespace Content.Shared.Nutrition.EntitySystems
 
         private void OnCreamPiedHitBy(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args)
         {
-            if (!EntityManager.EntityExists(args.Thrown) || !EntityManager.TryGetComponent(args.Thrown, out CreamPieComponent? creamPie)) return;
+            if (!Exists(args.Thrown) || !TryComp(args.Thrown, out CreamPieComponent? creamPie)) return;
 
             SetCreamPied(uid, creamPied, true);
 
             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/Nutrition/EntitySystems/SharedDrinkSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
index a4b8e13b2f..fe804dd2e6 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
@@ -1,34 +1,28 @@
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
-using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Forensics;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
-using Content.Shared.Mobs.Systems;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Utility;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
+[Obsolete("Migration to Content.Shared.Nutrition.EntitySystems.IngestionSystem is required")]
 public abstract partial class SharedDrinkSystem : EntitySystem
 {
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
-    [Dependency] private readonly FoodSystem _food = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
@@ -36,9 +30,21 @@ public abstract partial class SharedDrinkSystem : EntitySystem
     {
         base.Initialize();
 
+        SubscribeLocalEvent<DrinkComponent, UseInHandEvent>(OnUseDrinkInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
+        SubscribeLocalEvent<DrinkComponent, AfterInteractEvent>(OnUseDrink);
+
         SubscribeLocalEvent<DrinkComponent, AttemptShakeEvent>(OnAttemptShake);
-        SubscribeLocalEvent<DrinkComponent, ExaminedEvent>(OnExamined);
+
         SubscribeLocalEvent<DrinkComponent, GetVerbsEvent<AlternativeVerb>>(AddDrinkVerb);
+
+        SubscribeLocalEvent<DrinkComponent, BeforeIngestedEvent>(OnBeforeDrinkEaten);
+        SubscribeLocalEvent<DrinkComponent, IngestedEvent>(OnDrinkEaten);
+
+        SubscribeLocalEvent<DrinkComponent, EdibleEvent>(OnDrink);
+
+        SubscribeLocalEvent<DrinkComponent, IsDigestibleEvent>(OnIsDigestible);
+
+        SubscribeLocalEvent<DrinkComponent, GetEdibleTypeEvent>(OnGetEdibleType);
     }
 
     protected void OnAttemptShake(Entity<DrinkComponent> entity, ref AttemptShakeEvent args)
@@ -47,70 +53,6 @@ public abstract partial class SharedDrinkSystem : EntitySystem
             args.Cancelled = true;
     }
 
-    protected void OnExamined(Entity<DrinkComponent> entity, ref ExaminedEvent args)
-    {
-        TryComp<OpenableComponent>(entity, out var openable);
-        if (_openable.IsClosed(entity.Owner, null, openable, true) || !args.IsInDetailsRange || !entity.Comp.Examinable)
-            return;
-
-        var empty = IsEmpty(entity, entity.Comp);
-        if (empty)
-        {
-            args.PushMarkup(Loc.GetString("drink-component-on-examine-is-empty"));
-            return;
-        }
-
-        if (HasComp<ExaminableSolutionComponent>(entity))
-        {
-            //provide exact measurement for beakers
-            args.PushText(Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(entity, entity.Comp))));
-        }
-        else
-        {
-            //general approximation
-            var remainingString = (int) _solutionContainer.PercentFull(entity) switch
-            {
-                100 => "drink-component-on-examine-is-full",
-                > 66 => "drink-component-on-examine-is-mostly-full",
-                > 33 => HalfEmptyOrHalfFull(args),
-                _ => "drink-component-on-examine-is-mostly-empty",
-            };
-            args.PushMarkup(Loc.GetString(remainingString));
-        }
-    }
-
-    private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<AlternativeVerb> ev)
-    {
-        if (entity.Owner == ev.User ||
-            !ev.CanInteract ||
-            !ev.CanAccess ||
-            !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
-            return;
-
-        // Make sure the solution exists
-        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solution))
-            return;
-
-        // no drinking from living drinks, have to kill them first.
-        if (_mobState.IsAlive(entity))
-            return;
-
-        var user = ev.User;
-        AlternativeVerb verb = new()
-        {
-            Act = () =>
-            {
-                TryDrink(user, user, entity.Comp, entity);
-            },
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/drink.svg.192dpi.png")),
-            Text = Loc.GetString("drink-system-verb-drink"),
-            Priority = 2
-        };
-
-        ev.Verbs.Add(verb);
-    }
-
     protected FixedPoint2 DrinkVolume(EntityUid uid, DrinkComponent? component = null)
     {
         if (!Resolve(uid, ref component))
@@ -130,85 +72,126 @@ public abstract partial class SharedDrinkSystem : EntitySystem
         return DrinkVolume(uid, component) <= 0;
     }
 
-    // some see half empty, and others see half full
-    private string HalfEmptyOrHalfFull(ExaminedEvent args)
+    /// <summary>
+    /// Eat or drink an item
+    /// </summary>
+    private void OnUseDrinkInHand(Entity<DrinkComponent> entity, ref UseInHandEvent ev)
     {
-        string remainingString = "drink-component-on-examine-is-half-full";
+        if (ev.Handled)
+            return;
 
-        if (TryComp(args.Examiner, out MetaDataComponent? examiner) && examiner.EntityName.Length > 0
-            && string.Compare(examiner.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0)
-            remainingString = "drink-component-on-examine-is-half-empty";
-
-        return remainingString;
+        ev.Handled = _ingestion.TryIngest(ev.User, ev.User, entity);
     }
 
     /// <summary>
-    /// Tries to feed the drink item to the target entity
+    /// Feed someone else
     /// </summary>
-    protected bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item)
+    private void OnUseDrink(Entity<DrinkComponent> entity, ref AfterInteractEvent args)
     {
-        if (!HasComp<BodyComponent>(target))
-            return false;
+        if (args.Handled || args.Target == null || !args.CanReach)
+            return;
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(target, out var stomachs))
-            return false;
+        args.Handled = _ingestion.TryIngest(args.User, args.Target.Value, entity);
+    }
 
-        if (_openable.IsClosed(item, user, predicted: true))
-            return true;
+    private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        var user = args.User;
 
-        if (!_solutionContainer.TryGetSolution(item, drink.Solution, out _, out var drinkSolution) || drinkSolution.Volume <= 0)
+        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
+            return;
+
+        if (!_ingestion.TryGetIngestionVerb(user, entity, IngestionSystem.Drink, out var verb))
+            return;
+
+        args.Verbs.Add(verb);
+    }
+
+    private void OnBeforeDrinkEaten(Entity<DrinkComponent> food, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
+        args.Transfer = food.Comp.TransferAmount;
+    }
+
+    private void OnDrinkEaten(Entity<DrinkComponent> entity, ref IngestedEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        _audio.PlayPredicted(entity.Comp.UseSound, args.Target, args.User, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f));
+
+        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
+
+        if (args.ForceFed)
         {
-            if (drink.IgnoreEmpty)
-                return false;
+            var targetName = Identity.Entity(args.Target, EntityManager);
+            var userName = Identity.Entity(args.User, EntityManager);
 
-            _popup.PopupClient(Loc.GetString("drink-component-try-use-drink-is-empty", ("entity", item)), item, user);
-            return true;
-        }
+            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Drink)), ("flavors", flavors)), entity, entity);
 
-        if (_food.IsMouthBlocked(target, user))
-            return true;
+            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Drink))), args.User, args.User);
 
-        if (!_interaction.InRangeUnobstructed(user, item, popup: true))
-            return true;
-
-        var forceDrink = user != target;
-
-        if (forceDrink)
-        {
-            var userName = Identity.Entity(user, EntityManager);
-
-            _popup.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)), user, target);
-
-            // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.High, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to drink {ToPrettyString(item):drink} {SharedSolutionContainerSystem.ToPrettyString(drinkSolution)}");
+            // log successful forced drinking
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to drink {ToPrettyString(entity.Owner):drink}");
         }
         else
         {
-            // log voluntary drinking
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is drinking {ToPrettyString(item):drink} {SharedSolutionContainerSystem.ToPrettyString(drinkSolution)}");
+            _popup.PopupPredicted(Loc.GetString("edible-slurp", ("flavors", flavors)),
+                Loc.GetString("edible-slurp-other"),
+                args.User,
+                args.User);
+
+            // log successful voluntary drinking
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}");
         }
 
-        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(user, drinkSolution);
+        if (_ingestion.GetUsesRemaining(entity, entity.Comp.Solution, args.Split.Volume) <= 0)
+            return;
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager,
-            user,
-            forceDrink ? drink.ForceFeedDelay : drink.Delay,
-            new ConsumeDoAfterEvent(drink.Solution, flavors),
-            eventTarget: item,
-            target: target,
-            used: item)
+        // Leave some of the consumer's DNA on the consumed item...
+        var ev = new TransferDnaEvent
         {
-            BreakOnHandChange = false,
-            BreakOnMove = forceDrink,
-            BreakOnDamage = true,
-            MovementThreshold = 0.01f,
-            DistanceThreshold = 1.0f,
-            // do-after will stop if item is dropped when trying to feed someone else
-            // or if the item started out in the user's own hands
-            NeedHand = forceDrink || _hands.IsHolding(user, item),
+            Donor = args.Target,
+            Recipient = entity,
+            CanDnaBeCleaned = false,
         };
+        RaiseLocalEvent(args.Target, ref ev);
 
-        _doAfter.TryStartDoAfter(doAfterEventArgs);
-        return true;
+        args.Repeat = !args.ForceFed;
+    }
+
+    private void OnDrink(Entity<DrinkComponent> drink, ref EdibleEvent args)
+    {
+        if (args.Cancelled || args.Solution != null)
+            return;
+
+        if (!_solutionContainer.TryGetSolution(drink.Owner, drink.Comp.Solution, out args.Solution) || IsEmpty(drink))
+        {
+            args.Cancelled = true;
+
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-is-empty", ("entity", drink)), drink, args.User);
+            return;
+        }
+
+        args.Time += TimeSpan.FromSeconds(drink.Comp.Delay);
+    }
+
+    private void OnIsDigestible(Entity<DrinkComponent> ent, ref IsDigestibleEvent args)
+    {
+        // Anyone can drink from puddles on the floor!
+        args.UniversalDigestion();
+    }
+
+    private void OnGetEdibleType(Entity<DrinkComponent> ent, ref GetEdibleTypeEvent args)
+    {
+        if (args.Type != null)
+            return;
+
+        args.SetPrototype(IngestionSystem.Drink);
     }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 2a906b420a..2ec5fe9047 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -32,14 +32,9 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string ThirstIconThirstyId = "ThirstIconThirsty";
-
-    [ValidatePrototypeId<SatiationIconPrototype>]
-    private const string ThirstIconParchedId = "ThirstIconParched";
+    private static readonly ProtoId<SatiationIconPrototype> ThirstIconOverhydratedId = "ThirstIconOverhydrated";
+    private static readonly ProtoId<SatiationIconPrototype> ThirstIconThirstyId = "ThirstIconThirsty";
+    private static readonly ProtoId<SatiationIconPrototype> ThirstIconParchedId = "ThirstIconParched";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
index 431302593d..e69de29bb2 100644
--- a/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
@@ -1,73 +0,0 @@
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Interaction;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Tools.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-public sealed class UtensilSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly FoodSystem _foodSystem = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem), typeof(ToolOpenableSystem) });
-    }
-
-    /// <summary>
-    /// Clicked with utensil
-    /// </summary>
-    private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
-    {
-        if (ev.Handled || ev.Target == null || !ev.CanReach)
-            return;
-
-        var result = TryUseUtensil(ev.User, ev.Target.Value, entity);
-        ev.Handled = result.Handled;
-    }
-
-    public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
-    {
-        if (!EntityManager.TryGetComponent(target, out FoodComponent? food))
-            return (false, false);
-
-        //Prevents food usage with a wrong utensil
-        if ((food.Utensil & utensil.Comp.Types) == 0)
-        {
-            _popupSystem.PopupClient(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", utensil.Owner)), user, user);
-            return (false, true);
-        }
-
-        if (!_interactionSystem.InRangeUnobstructed(user, target, popup: true))
-            return (false, true);
-
-        return _foodSystem.TryFeed(user, user, target, food);
-    }
-
-    /// <summary>
-    /// Attempt to break the utensil after interaction.
-    /// </summary>
-    /// <param name="uid">Utensil.</param>
-    /// <param name="userUid">User of the utensil.</param>
-    public void TryBreak(EntityUid uid, EntityUid userUid, UtensilComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (_robustRandom.Prob(component.BreakChance))
-        {
-            _audio.PlayPredicted(component.BreakSound, userUid, userUid, AudioParams.Default.WithVolume(-2f));
-            EntityManager.DeleteEntity(uid);
-        }
-    }
-}
diff --git a/Content.Shared/Nutrition/IngestionEvents.cs b/Content.Shared/Nutrition/IngestionEvents.cs
index 685b08b1bd..27988c898d 100644
--- a/Content.Shared/Nutrition/IngestionEvents.cs
+++ b/Content.Shared/Nutrition/IngestionEvents.cs
@@ -1,9 +1,52 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
 namespace Content.Shared.Nutrition;
 
 /// <summary>
-///     Raised directed at the consumer when attempting to ingest something.
+/// Raised on an entity that is trying to be ingested to see if it has universal blockers preventing it from being
+/// ingested.
 /// </summary>
-public sealed class IngestionAttemptEvent : CancellableEntityEventArgs
+[ByRefEvent]
+public record struct IngestibleEvent(bool Cancelled = false);
+
+/// <summary>
+/// Raised on an entity with the <see cref="EdibleComponent"/> to check if anything is stopping
+/// another entity from consuming the delicious reagents stored inside.
+/// </summary>
+/// <param name="User">The entity trying to feed us to an entity.</param>
+[ByRefEvent]
+public record struct EdibleEvent(EntityUid User)
+{
+    public Entity<SolutionComponent>? Solution = null;
+
+    public TimeSpan Time = TimeSpan.Zero;
+
+    public bool Cancelled;
+}
+
+/// <summary>
+/// Raised when an entity is trying to ingest an entity to see if it has any component that can ingest it.
+/// </summary>
+/// <param name="Handled">Did a system successfully ingest this item?</param>
+/// <param name="User">The entity that is trying to feed and therefore raising the event</param>
+/// <param name="Ingested">What are we trying to ingest?</param>
+/// <param name="Ingest">Should we actually try and ingest? Or are we just testing if it's even possible </param>
+[ByRefEvent]
+public record struct AttemptIngestEvent(EntityUid User, EntityUid Ingested, bool Ingest, bool Handled = false);
+
+/// <summary>
+///     Raised on an entity that is consuming another entity to see if there is anything attached to the entity
+///     that is preventing it from doing the consumption.
+/// </summary>
+[ByRefEvent]
+public record struct IngestionAttemptEvent(SlotFlags TargetSlots, bool Cancelled = false) : IInventoryRelayEvent
 {
     /// <summary>
     ///     The equipment that is blocking consumption. Should only be non-null if the event was canceled.
@@ -12,22 +55,113 @@ public sealed class IngestionAttemptEvent : CancellableEntityEventArgs
 }
 
 /// <summary>
-/// Raised directed at the food after finishing eating a food before it's deleted.
-/// Cancel this if you want to do something special before a food is deleted.
+///     Raised on an entity that is trying to be digested, aka turned from an entity into reagents.
+///     Returns its digestive properties or how difficult it is to convert to reagents.
 /// </summary>
-public sealed class BeforeFullyEatenEvent : CancellableEntityEventArgs
+/// <remarks>This method is currently needed for backwards compatibility with food and drink component.
+///          It also might be needed in the event items like trash and plushies have their edible component removed.
+///          There's no way to know whether this event will be made obsolete or not after Food and Drink Components
+///          are removed until after a proper body and digestion rework. Oh well!
+/// </remarks>
+[ByRefEvent]
+public record struct IsDigestibleEvent()
 {
-    /// <summary>
-    /// The person that ate the food.
-    /// </summary>
-    public EntityUid User;
+    public bool Digestible = false;
+
+    public bool SpecialDigestion = false;
+
+    // If this is true, SpecialDigestion will be ignored
+    public bool Universal = false;
+
+    // If it requires special digestion then it has to be digestible...
+    public void AddDigestible(bool special)
+    {
+        SpecialDigestion = special;
+        Digestible = true;
+    }
+
+    // This should only be used for if you're trying to drink pure reagents from a puddle or cup or something...
+    public void UniversalDigestion()
+    {
+        Universal = true;
+        Digestible = true;
+    }
+}
+
+/// <summary>
+/// Do After Event for trying to put food solution into stomach entity.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class EatingDoAfterEvent : SimpleDoAfterEvent;
+
+/// <summary>
+/// We use this to determine if an entity should abort giving up its reagents at the last minute,
+/// as well as specifying how much of its reagents it should give up including minimums and maximums.
+/// If minimum exceeds the  maximum, the event will abort.
+/// </summary>
+/// <param name="Min">The minimum amount we can transfer.</param>
+/// <param name="Max">The maximum amount we can transfer.</param>
+/// <param name="Solution">The solution we are transferring.</param>
+[ByRefEvent]
+public record struct BeforeIngestedEvent(FixedPoint2 Min, FixedPoint2 Max, Solution? Solution)
+{
+    // How much we would like to transfer, gets clamped by Min and Max.
+    public FixedPoint2 Transfer;
+
+    // Whether this event, and therefore eat attempt, should be cancelled.
+    public bool Cancelled;
+
+    public bool TryNewMinimum(FixedPoint2 newMin)
+    {
+        if (newMin > Max)
+            return false;
+
+        Min = newMin;
+        return true;
+    }
+
+    public bool TryNewMaximum(FixedPoint2 newMax)
+    {
+        if (newMax < Min)
+            return false;
+
+        Min = newMax;
+        return true;
+    }
+}
+
+[ByRefEvent]
+public record struct IngestingEvent(EntityUid Food, Solution Split, bool ForceFed);
+
+/// <summary>
+/// Raised on an entity when it is being made to be eaten.
+/// </summary>
+/// <param name="User">Who is doing the action?</param>
+/// <param name="Target">Who is doing the eating?</param>
+/// <param name="Split">The solution we're currently eating.</param>
+/// <param name="ForceFed">Whether we're being fed by someone else, checkec enough I might as well pass it.</param>
+[ByRefEvent]
+public record struct IngestedEvent(EntityUid User, EntityUid Target, Solution Split, bool ForceFed)
+{
+    // Should we refill the solution now that we've eaten it?
+    // This bool basically only exists because of stackable system.
+    public bool Refresh;
+
+    // Should we destroy the ingested entity?
+    public bool Destroy;
+
+    // Has this eaten event been handled? Used to prevent duplicate flavor popups and sound effects.
+    public bool Handled;
+
+    // Should we try eating again?
+    public bool Repeat;
 }
 
 /// <summary>
 /// Raised directed at the food after finishing eating it and before it's deleted.
 /// </summary>
 [ByRefEvent]
-public readonly record struct AfterFullyEatenEvent(EntityUid User)
+public readonly record struct FullyEatenEvent(EntityUid User)
 {
     /// <summary>
     /// The entity that ate the food.
@@ -35,6 +169,38 @@ public readonly record struct AfterFullyEatenEvent(EntityUid User)
     public readonly EntityUid User = User;
 }
 
+/// <summary>
+/// Returns a list of Utensils that can be used to consume the entity, as well as a list of required types.
+/// </summary>
+[ByRefEvent]
+public record struct GetUtensilsEvent()
+{
+    public UtensilType Types = UtensilType.None;
+
+    public UtensilType RequiredTypes = UtensilType.None;
+
+    // Forces you to add to both lists if a utensil is required.
+    public void AddRequiredTypes(UtensilType type)
+    {
+        RequiredTypes |= type;
+        Types |= type;
+    }
+}
+
+/// <summary>
+/// Tries to get the best fitting edible type for an entity.
+/// </summary>
+[ByRefEvent]
+public record struct GetEdibleTypeEvent
+{
+    public ProtoId<EdiblePrototype>? Type { get; private set; }
+
+    public void SetPrototype([ForbidLiteral] ProtoId<EdiblePrototype> proto)
+    {
+        Type = proto;
+    }
+}
+
 /// <summary>
 /// Raised directed at the food being sliced before it's deleted.
 /// Cancel this if you want to do something special before a food is deleted.
diff --git a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
new file mode 100644
index 0000000000..2cfe900167
--- /dev/null
+++ b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
@@ -0,0 +1,60 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Nutrition.Prototypes;
+
+/// <summary>
+/// This stores unique data for an item that is edible, such as verbs, verb icons, verb names, sounds, ect.
+/// </summary>
+[Prototype]
+public sealed partial class EdiblePrototype : IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    /// The sound we make when eaten.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier UseSound = new SoundCollectionSpecifier("eating");
+
+    /// <summary>
+    /// The localization identifier for the user's ingestion message.
+    /// </summary>
+    [DataField]
+    public LocId Message;
+
+    /// <summary>
+    /// The localization identifier for an observer's or "others'" ingestion message.
+    /// </summary>
+    [DataField]
+    public LocId OtherMessage;
+
+    /// <summary>
+    /// Localization verb used when consuming this item.
+    /// </summary>
+    [DataField]
+    public LocId Verb;
+
+    /// <summary>
+    /// Localization noun used when consuming this item.
+    /// </summary>
+    [DataField]
+    public LocId Noun;
+
+    /// <summary>
+    /// What type of food are we, currently used for determining verbs and some checks.
+    /// </summary>
+    [DataField]
+    public LocId VerbName;
+
+    /// <summary>
+    /// What type of food are we, currently used for determining verbs and some checks.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? VerbIcon;
+
+
+}
diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs
index 40f525af91..f848d0544e 100644
--- a/Content.Shared/Paper/PaperSystem.cs
+++ b/Content.Shared/Paper/PaperSystem.cs
@@ -217,7 +217,7 @@ public sealed class PaperSystem : EntitySystem
     {
         if (!_paperQuery.TryComp(ent, out var paperComp))
         {
-            Log.Warning($"{EntityManager.ToPrettyString(ent)} has a {nameof(RandomPaperContentComponent)} but no {nameof(PaperComponent)}!");
+            Log.Warning($"{ToPrettyString(ent)} has a {nameof(RandomPaperContentComponent)} but no {nameof(PaperComponent)}!");
             RemCompDeferred(ent, ent.Comp);
             return;
         }
diff --git a/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs b/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs
index 5e31e513a9..f95848e42b 100644
--- a/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs
@@ -1,8 +1,8 @@
 using Content.Shared.Decals;
 using Content.Shared.Maps;
 using Robust.Shared.Noise;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Parallax.Biomes.Layers;
 
@@ -10,8 +10,8 @@ namespace Content.Shared.Parallax.Biomes.Layers;
 public sealed partial class BiomeDecalLayer : IBiomeWorldLayer
 {
     /// <inheritdoc/>
-    [DataField("allowedTiles", customTypeSerializer:typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> AllowedTiles { get; private set; } = new();
+    [DataField]
+    public List<ProtoId<ContentTileDefinition>> AllowedTiles { get; private set; } = new();
 
     /// <summary>
     /// Divide each tile up by this amount.
@@ -29,6 +29,6 @@ public sealed partial class BiomeDecalLayer : IBiomeWorldLayer
     /// <inheritdoc/>
     [DataField("invert")] public bool Invert { get; private set; } = false;
 
-    [DataField("decals", required: true, customTypeSerializer:typeof(PrototypeIdListSerializer<DecalPrototype>))]
-    public List<string> Decals = new();
+    [DataField(required: true)]
+    public List<ProtoId<DecalPrototype>> Decals = new();
 }
diff --git a/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs b/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs
index 21ffdd96e5..c09980aaad 100644
--- a/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs
@@ -2,7 +2,6 @@ using Content.Shared.Maps;
 using Robust.Shared.Noise;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Parallax.Biomes.Layers;
 
@@ -10,8 +9,8 @@ namespace Content.Shared.Parallax.Biomes.Layers;
 public sealed partial class BiomeEntityLayer : IBiomeWorldLayer
 {
     /// <inheritdoc/>
-    [DataField("allowedTiles", customTypeSerializer:typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> AllowedTiles { get; private set; } = new();
+    [DataField]
+    public List<ProtoId<ContentTileDefinition>> AllowedTiles { get; private set; } = new();
 
     [DataField("noise")] public FastNoiseLite Noise { get; private set; } = new(0);
 
@@ -22,6 +21,6 @@ public sealed partial class BiomeEntityLayer : IBiomeWorldLayer
     /// <inheritdoc/>
     [DataField("invert")] public bool Invert { get; private set; } = false;
 
-    [DataField("entities", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> Entities = new();
+    [DataField(required: true)]
+    public List<EntProtoId> Entities = new();
 }
diff --git a/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs b/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs
index e04db913b7..92779b6f8e 100644
--- a/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Maps;
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Parallax.Biomes.Layers;
 
 /// <summary>
@@ -8,5 +11,5 @@ public partial interface IBiomeWorldLayer : IBiomeLayer
     /// <summary>
     /// What tiles we're allowed to spawn on, real or biome.
     /// </summary>
-    List<string> AllowedTiles { get; }
+    List<ProtoId<ContentTileDefinition>> AllowedTiles { get; }
 }
diff --git a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
index b064e91198..d07da4b24e 100644
--- a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
+++ b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Explosion.Components;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Triggers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
@@ -10,7 +11,7 @@ namespace Content.Shared.Payload.Components;
 /// <remarks>
 ///     This component performs two functions. Firstly, it will add or remove other components to some entity when this
 ///     item is installed inside of it. This is intended for use with constructible grenades. For example, this allows
-///     you to add things like <see cref="OnUseTimerTriggerComponent"/>, or <see cref="TriggerOnProximityComponent"/>.
+///     you to add things like <see cref="TimerTriggerComponent"/>, or <see cref="TriggerOnProximityComponent"/>.
 ///     This is required because otherwise you would have to forward arbitrary interaction directed at the casing
 ///     through to the trigger, which would be quite complicated. Also proximity triggers don't really work inside of
 ///     containers.
@@ -29,7 +30,7 @@ public sealed partial class PayloadTriggerComponent : Component
     /// <summary>
     ///     List of components to add or remove from an entity when this trigger is (un)installed.
     /// </summary>
-    [DataField("components", serverOnly:true, readOnly: true)]
+    [DataField(serverOnly: true, readOnly: true)]
     public ComponentRegistry? Components = null;
 
     /// <summary>
@@ -41,6 +42,6 @@ public sealed partial class PayloadTriggerComponent : Component
     ///     when removing the component, to ensure that removal of this trigger only removes the components that it was
     ///     responsible for adding.
     /// </remarks>
-    [DataField("grantedComponents", serverOnly: true)]
+    [DataField(serverOnly: true)]
     public HashSet<Type> GrantedComponents = new();
 }
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index db065d22b1..1f19184b50 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -78,6 +78,8 @@ public enum CollisionGroup
     WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     HalfWallLayer = MidImpassable | LowImpassable,
+    FlimsyLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | InteractImpassable,
+
     // Allows people to interact past and target players inside of this
     SpecialWallLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
 
diff --git a/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs b/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs
index cd6744c87d..8b678e0300 100644
--- a/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs
+++ b/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs
@@ -8,10 +8,7 @@ namespace Content.Shared.Pinpointer;
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedNavMapSystem))]
-public sealed partial class ConfigurableNavMapBeaconComponent : Component
-{
-
-}
+public sealed partial class ConfigurableNavMapBeaconComponent : Component;
 
 [Serializable, NetSerializable]
 public sealed class NavMapBeaconConfigureBuiMessage : BoundUserInterfaceMessage
@@ -31,11 +28,11 @@ public sealed class NavMapBeaconConfigureBuiMessage : BoundUserInterfaceMessage
 [Serializable, NetSerializable]
 public enum NavMapBeaconUiKey : byte
 {
-    Key
+    Key,
 }
 
 [Serializable, NetSerializable]
 public enum NavMapBeaconVisuals : byte
 {
-    Enabled
+    Enabled,
 }
diff --git a/Content.Shared/Pinpointer/NavMapBeaconComponent.cs b/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
index 0a86bdd9d2..4bb6384fb9 100644
--- a/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
+++ b/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
@@ -12,8 +12,7 @@ public sealed partial class NavMapBeaconComponent : Component
     /// <summary>
     /// Defaults to entity name if nothing found.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string? Text;
 
     /// <summary>
@@ -23,14 +22,12 @@ public sealed partial class NavMapBeaconComponent : Component
     [DataField]
     public LocId? DefaultText;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public Color Color = Color.Orange;
 
     /// <summary>
     /// Only enabled beacons can be seen on a station map.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool Enabled = true;
 }
diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
index 37d60dec28..5d64803273 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Content.Shared.Examine;
 using Content.Shared.Tag;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
@@ -34,6 +35,8 @@ public abstract class SharedNavMapSystem : EntitySystem
 
         // Data handling events
         SubscribeLocalEvent<NavMapComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, ExaminedEvent>(OnConfigurableExamined);
+
         _doorQuery = GetEntityQuery<NavMapDoorComponent>();
     }
 
@@ -164,6 +167,17 @@ public abstract class SharedNavMapSystem : EntitySystem
         args.State = new NavMapDeltaState(chunks, component.Beacons, component.RegionProperties, new(component.Chunks.Keys));
     }
 
+    private void OnConfigurableExamined(Entity<ConfigurableNavMapBeaconComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange || !TryComp<NavMapBeaconComponent>(ent, out var navMap))
+            return;
+
+        args.PushMarkup(Loc.GetString("nav-beacon-examine-text",
+            ("enabled", navMap.Enabled),
+            ("color", navMap.Color.ToHexNoAlpha()),
+            ("label", navMap.Text ?? string.Empty)));
+    }
+
     #endregion
 
     #region: System messages
diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index c332064ea3..251043a60d 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -3,11 +3,13 @@ using Content.Shared.Hands.EntitySystems;
 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 sealed class PlaceableSurfaceSystem : EntitySystem
         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 @@ public sealed class PlaceableSurfaceSystem : EntitySystem
     {
         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/Players/PlayTimeTracking/PlayTimeTrackingShared.cs b/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
index ccaf9c17dd..d02a22171a 100644
--- a/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
+++ b/Content.Shared/Players/PlayTimeTracking/PlayTimeTrackingShared.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Players.PlayTimeTracking;
 
@@ -7,12 +8,10 @@ public static class PlayTimeTrackingShared
     /// <summary>
     /// The prototype ID of the play time tracker that represents overall playtime, i.e. not tied to any one role.
     /// </summary>
-    [ValidatePrototypeId<PlayTimeTrackerPrototype>]
-    public const string TrackerOverall = "Overall";
+    public static readonly ProtoId<PlayTimeTrackerPrototype> TrackerOverall = "Overall";
 
     /// <summary>
     /// The prototype ID of the play time tracker that represents admin time, when a player is in game as admin.
     /// </summary>
-    [ValidatePrototypeId<PlayTimeTrackerPrototype>]
-    public const string TrackerAdmin = "Admin";
+    public static readonly ProtoId<PlayTimeTrackerPrototype> TrackerAdmin = "Admin";
 }
diff --git a/Content.Shared/Polymorph/PolymorphPrototype.cs b/Content.Shared/Polymorph/PolymorphPrototype.cs
index 1937b3281e..910302fe54 100644
--- a/Content.Shared/Polymorph/PolymorphPrototype.cs
+++ b/Content.Shared/Polymorph/PolymorphPrototype.cs
@@ -112,11 +112,21 @@ public sealed partial record PolymorphConfiguration
     public bool RevertOnEat;
 
     /// <summary>
-    /// Whether or not an already polymorphed entity is able to be polymorphed again
+    /// If true, attempts to polymorph this polymorph will fail, unless
+    /// <see cref="IgnoreAllowRepeatedMorphs"/> is true on the /new/ morph.
     /// </summary>
     [DataField(serverOnly: true)]
     public bool AllowRepeatedMorphs;
 
+    /// <summary>
+    /// If true, this morph will succeed even when used on an entity
+    /// that is already polymorphed with a configuration that has
+    /// <see cref="AllowRepeatedMorphs"/> set to false. Helpful for
+    /// smite polymorphs which should always succeed.
+    /// </summary>
+    [DataField(serverOnly: true)]
+    public bool IgnoreAllowRepeatedMorphs;
+
     /// <summary>
     /// The amount of time that should pass after this polymorph has ended, before a new one
     /// can occur.
diff --git a/Content.Shared/Power/SharedPower.cs b/Content.Shared/Power/SharedPower.cs
index da88198825..d45fb96cac 100644
--- a/Content.Shared/Power/SharedPower.cs
+++ b/Content.Shared/Power/SharedPower.cs
@@ -1,3 +1,4 @@
+using Content.Shared.NodeContainer.NodeGroups;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power
@@ -31,4 +32,12 @@ namespace Content.Shared.Power
         MediumVoltage,
         Apc,
     }
+
+    [Serializable, NetSerializable]
+    public enum Voltage
+    {
+        High = NodeGroupID.HVPower,
+        Medium = NodeGroupID.MVPower,
+        Apc = NodeGroupID.Apc,
+    }
 }
diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
index 7af44420a7..cecf23d041 100644
--- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs
+++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
@@ -18,13 +18,13 @@ public sealed partial class PowerCellDrawComponent : Component
     /// <summary>
     /// Whether there is any charge available to draw.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("canDraw"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool CanDraw;
 
     /// <summary>
     /// Whether there is sufficient charge to use.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("canUse"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool CanUse;
 
     #endregion
@@ -37,17 +37,20 @@ public sealed partial class PowerCellDrawComponent : Component
     public bool Enabled = true;
 
     /// <summary>
-    /// How much the entity draws while the UI is open.
+    /// How much the entity draws while the UI is open (in Watts).
     /// Set to 0 if you just wish to check for power upon opening the UI.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("drawRate")]
+    [DataField]
     public float DrawRate = 1f;
 
     /// <summary>
-    /// How much power is used whenever the entity is "used".
+    /// How much power is used whenever the entity is "used" (in Joules).
     /// This is used to ensure the UI won't open again without a minimum use power.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("useRate")]
+    /// <remarks>
+    /// This is not a rate how the datafield name implies, but a one-time cost.
+    /// </remarks>
+    [DataField]
     public float UseRate;
 
     /// <summary>
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 2e128eb996..4849bf4936 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -213,8 +213,10 @@ namespace Content.Shared.Preferences
         /// </summary>
         /// <param name="species">The species to use in this default profile. The default species is <see cref="SharedHumanoidAppearanceSystem.DefaultSpecies"/>.</param>
         /// <returns>Humanoid character profile with default settings.</returns>
-        public static HumanoidCharacterProfile DefaultWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies)
+        public static HumanoidCharacterProfile DefaultWithSpecies(string? species = null)
         {
+            species ??= SharedHumanoidAppearanceSystem.DefaultSpecies;
+
             return new()
             {
                 Species = species,
@@ -238,8 +240,10 @@ namespace Content.Shared.Preferences
             return RandomWithSpecies(species);
         }
 
-        public static HumanoidCharacterProfile RandomWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies)
+        public static HumanoidCharacterProfile RandomWithSpecies(string? species = null)
         {
+            species ??= SharedHumanoidAppearanceSystem.DefaultSpecies;
+
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
@@ -767,10 +771,17 @@ namespace Content.Shared.Preferences
             var namingSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<NamingSystem>();
             return namingSystem.GetName(species, gender);
         }
+        public bool Equals(HumanoidCharacterProfile? other)
+        {
+            if (other is null)
+                return false;
+
+            return ReferenceEquals(this, other) || MemberwiseEquals(other);
+        }
 
         public override bool Equals(object? obj)
         {
-            return ReferenceEquals(this, obj) || obj is HumanoidCharacterProfile other && Equals(other);
+            return obj is HumanoidCharacterProfile other && Equals(other);
         }
 
         public override int GetHashCode()
diff --git a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
index 972b3042cc..6f9f5a587f 100644
--- a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
@@ -13,6 +13,11 @@ public sealed partial class LoadoutPrototype : IPrototype, IEquipmentLoadout
     [IdDataField]
     public string ID { get; private set; } = string.Empty;
 
+    /// <summary>
+    /// A text identifier used to group loadouts.
+    /// </summary>
+    [DataField]
+    public string? GroupBy;
     /*
      * You can either use an existing StartingGearPrototype or specify it inline to avoid bloating yaml.
      */
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 238daf6bf7..cb8450a500 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -5,7 +5,7 @@ using Content.Shared.Construction;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
-using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
@@ -35,6 +35,7 @@ public sealed class RCDSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedChargesSystem _sharedCharges = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
@@ -175,7 +176,7 @@ public sealed class RCDSystem : EntitySystem
                 else
                 {
                     var deconstructedTile = _mapSystem.GetTileRef(gridUid.Value, mapGrid, location);
-                    var protoName = !deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
+                    var protoName = !_turf.IsSpace(deconstructedTile) ? _deconstructTileProto : _deconstructLatticeProto;
 
                     if (_protoManager.TryIndex(protoName, out var deconProto))
                     {
@@ -205,7 +206,7 @@ public sealed class RCDSystem : EntitySystem
 
         // Try to start the do after
         var effect = Spawn(effectPrototype, location);
-        var ev = new RCDDoAfterEvent(GetNetCoordinates(location), component.ConstructionDirection, component.ProtoId, cost, EntityManager.GetNetEntity(effect));
+        var ev = new RCDDoAfterEvent(GetNetCoordinates(location), component.ConstructionDirection, component.ProtoId, cost, GetNetEntity(effect));
 
         var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, ev, uid, target: args.Target, used: uid)
         {
@@ -260,7 +261,7 @@ public sealed class RCDSystem : EntitySystem
         {
             // Delete the effect entity if the do-after was cancelled (server-side only)
             if (_net.IsServer)
-                QueueDel(EntityManager.GetEntity(args.Effect));
+                QueueDel(GetEntity(args.Effect));
             return;
         }
 
@@ -296,11 +297,10 @@ public sealed class RCDSystem : EntitySystem
         var uid = GetEntity(ev.NetEntity);
 
         // Determine if player that send the message is carrying the specified RCD in their active hand
-        if (session.SenderSession.AttachedEntity == null)
+        if (session.SenderSession.AttachedEntity is not { } player)
             return;
 
-        if (!TryComp<HandsComponent>(session.SenderSession.AttachedEntity, out var hands) ||
-            uid != hands.ActiveHand?.HeldEntity)
+        if (_hands.GetActiveItem(player) != uid)
             return;
 
         if (!TryComp<RCDComponent>(uid, out var rcd))
@@ -383,7 +383,7 @@ public sealed class RCDSystem : EntitySystem
         }
 
         // Check rule: Must place on subfloor
-        if (prototype.ConstructionRules.Contains(RcdConstructionRule.MustBuildOnSubfloor) && !tile.Tile.GetContentTileDefinition().IsSubFloor)
+        if (prototype.ConstructionRules.Contains(RcdConstructionRule.MustBuildOnSubfloor) && !_turf.GetContentTileDefinition(tile).IsSubFloor)
         {
             if (popMsgs)
                 _popup.PopupClient(Loc.GetString("rcd-component-must-build-on-subfloor-message"), uid, user);
@@ -404,7 +404,7 @@ public sealed class RCDSystem : EntitySystem
             }
 
             // Check rule: Tiles can't be identical
-            if (tile.Tile.GetContentTileDefinition().ID == prototype.Prototype)
+            if (_turf.GetContentTileDefinition(tile).ID == prototype.Prototype)
             {
                 if (popMsgs)
                     _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-identical-tile"), uid, user);
@@ -487,7 +487,7 @@ public sealed class RCDSystem : EntitySystem
             }
 
             // The tile cannot be destroyed
-            var tileDef = (ContentTileDefinition) _tileDefMan[tile.Tile.TypeId];
+            var tileDef = _turf.GetContentTileDefinition(tile);
 
             if (tileDef.Indestructible)
             {
@@ -559,7 +559,7 @@ public sealed class RCDSystem : EntitySystem
                 if (target == null)
                 {
                     // Deconstruct tile (either converts the tile to lattice, or removes lattice)
-                    var tileDef = (tile.Tile.GetContentTileDefinition().ID != "Lattice") ? new Tile(_tileDefMan["Lattice"].TileId) : Tile.Empty;
+                    var tileDef = (_turf.GetContentTileDefinition(tile).ID != "Lattice") ? new Tile(_tileDefMan["Lattice"].TileId) : Tile.Empty;
                     _mapSystem.SetTile(gridUid, mapGrid, position, tileDef);
                     _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {gridUid} tile: {position} open to space");
                 }
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index 42d92a9065..87e839b56f 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -184,5 +184,25 @@ namespace Content.Shared.Random.Helpers
             // Shouldn't happen
             throw new InvalidOperationException($"Invalid weighted pick for {prototype.ID}!");
         }
+
+        /// <summary>
+        /// A very simple, deterministic djb2 hash function for generating a combined seed for the random number generator.
+        /// We can't use HashCode.Combine because that is initialized with a random value, creating different results on the server and client.
+        /// </summary>
+        /// <example>
+        /// Combine the current game tick with a NetEntity Id in order to not get the same random result if this is called multiple times in the same tick.
+        /// <code>
+        /// var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        /// </code>
+        /// </example>
+        public static int HashCodeCombine(List<int> values)
+        {
+            int hash = 5381;
+            foreach (var value in values)
+            {
+                hash = (hash << 5) + hash + value;
+            }
+            return hash;
+        }
     }
 }
diff --git a/Content.Shared/Random/RandomFillSolution.cs b/Content.Shared/Random/RandomFillSolution.cs
index e3b9b7c862..00453102f3 100644
--- a/Content.Shared/Random/RandomFillSolution.cs
+++ b/Content.Shared/Random/RandomFillSolution.cs
@@ -1,8 +1,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Random;
 
@@ -28,6 +27,6 @@ public sealed partial class RandomFillSolution
     /// <summary>
     ///     Listed reagents that the weight and quantity apply to.
     /// </summary>
-    [DataField("reagents", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
-    public List<string> Reagents = new();
+    [DataField(required: true)]
+    public List<ProtoId<ReagentPrototype>> Reagents = new();
 }
diff --git a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
index b157596e3b..64977596c2 100644
--- a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
+++ b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
@@ -8,6 +8,13 @@ public sealed partial class DoorRemoteComponent : Component
     [AutoNetworkedField]
     [DataField]
     public OperatingMode Mode = OperatingMode.OpenClose;
+
+    /// <summary>
+    /// Does the remote allow the user to manipulate doors that they have access to, even if the remote itself does not?
+    /// </summary>
+    [AutoNetworkedField]
+    [DataField]
+    public bool IncludeUserAccess = false;
 }
 
 public enum OperatingMode : byte
diff --git a/Content.Shared/Repairable/RepairableComponent.cs b/Content.Shared/Repairable/RepairableComponent.cs
new file mode 100644
index 0000000000..bc1ccfb7bf
--- /dev/null
+++ b/Content.Shared/Repairable/RepairableComponent.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Damage;
+using Content.Shared.Tools;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Repairable;
+
+/// <summary>
+/// Use this component to mark a device as repairable.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RepairableComponent : Component
+{
+    /// <summary>
+    ///     All the damage to change information is stored in this <see cref="DamageSpecifier"/>.
+    /// </summary>
+    /// <remarks>
+    ///     If this data-field is specified, it will change damage by this amount instead of setting all damage to 0.
+    ///     in order to heal/repair the damage values have to be negative.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier? Damage;
+
+    /// <summary>
+    /// Cost of fuel used to repair this device.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int FuelCost = 5;
+
+    /// <summary>
+    /// Tool quality necessary to repair this device.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
+
+    /// <summary>
+    /// The base tool use delay (seconds). This will be modified by the tool's quality
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int DoAfterDelay = 1;
+
+    /// <summary>
+    /// A multiplier that will be applied to the above if an entity is repairing themselves.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SelfRepairPenalty = 3f;
+
+    /// <summary>
+    /// Whether an entity is allowed to repair itself.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AllowSelfRepair = true;
+}
diff --git a/Content.Shared/Repairable/RepairableSystem.cs b/Content.Shared/Repairable/RepairableSystem.cs
new file mode 100644
index 0000000000..7a0f01b9b6
--- /dev/null
+++ b/Content.Shared/Repairable/RepairableSystem.cs
@@ -0,0 +1,87 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Tools.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Repairable;
+
+public sealed partial class RepairableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<RepairableComponent, InteractUsingEvent>(Repair);
+        SubscribeLocalEvent<RepairableComponent, RepairFinishedEvent>(OnRepairFinished);
+    }
+
+    private void OnRepairFinished(Entity<RepairableComponent> ent,  ref RepairFinishedEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp(ent.Owner, out DamageableComponent? damageable) || damageable.TotalDamage == 0)
+            return;
+
+        if (ent.Comp.Damage != null)
+        {
+            var damageChanged = _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.Damage, true, false, origin: args.User);
+            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged?.GetTotal()}");
+        }
+
+        else
+        {
+            // Repair all damage
+            _damageableSystem.SetAllDamage(ent.Owner, damageable, 0);
+            _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} back to full health");
+        }
+
+        var str = Loc.GetString("comp-repairable-repair", ("target", ent.Owner), ("tool", args.Used!));
+        _popup.PopupClient(str, ent.Owner, args.User);
+
+        var ev = new RepairedEvent(ent, args.User);
+        RaiseLocalEvent(ent.Owner, ref ev);
+    }
+
+    private void Repair(Entity<RepairableComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // Only try repair the target if it is damaged
+        if (!TryComp<DamageableComponent>(ent.Owner, out var damageable) || damageable.TotalDamage == 0)
+            return;
+
+        float delay = ent.Comp.DoAfterDelay;
+
+        // Add a penalty to how long it takes if the user is repairing itself
+        if (args.User == args.Target)
+        {
+            if (!ent.Comp.AllowSelfRepair)
+                return;
+
+            delay *= ent.Comp.SelfRepairPenalty;
+        }
+
+        // Run the repairing doafter
+        args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, ent.Comp.QualityNeeded, new RepairFinishedEvent(), ent.Comp.FuelCost);
+    }
+}
+
+/// <summary>
+/// Event raised on an entity when its successfully repaired.
+/// </summary>
+/// <param name="Ent"></param>
+/// <param name="User"></param>
+[ByRefEvent]
+public readonly record struct RepairedEvent(Entity<RepairableComponent> Ent, EntityUid User);
+
+[Serializable, NetSerializable]
+public sealed partial class RepairFinishedEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Repairable/SharedRepairableSystem.cs b/Content.Shared/Repairable/SharedRepairableSystem.cs
deleted file mode 100644
index 2b0cb670e6..0000000000
--- a/Content.Shared/Repairable/SharedRepairableSystem.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Repairable;
-
-public abstract partial class SharedRepairableSystem : EntitySystem
-{
-    [Serializable, NetSerializable]
-    protected sealed partial class RepairFinishedEvent : SimpleDoAfterEvent
-    {
-    }
-}
-
diff --git a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
index a69e4ee9dd..f00338aac7 100644
--- a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
@@ -2,8 +2,8 @@ using Content.Shared.Lathe;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.Research.Systems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Research.Components;
 
@@ -25,15 +25,15 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// Which research disciplines are able to be unlocked
     /// </summary>
     [AutoNetworkedField]
-    [DataField("supportedDisciplines", customTypeSerializer: typeof(PrototypeIdListSerializer<TechDisciplinePrototype>))]
-    public List<string> SupportedDisciplines = new();
+    [DataField]
+    public List<ProtoId<TechDisciplinePrototype>> SupportedDisciplines = new();
 
     /// <summary>
     /// The ids of all the technologies which have been unlocked.
     /// </summary>
     [AutoNetworkedField]
-    [DataField("unlockedTechnologies", customTypeSerializer: typeof(PrototypeIdListSerializer<TechnologyPrototype>))]
-    public List<string> UnlockedTechnologies = new();
+    [DataField]
+    public List<ProtoId<TechnologyPrototype>> UnlockedTechnologies = new();
 
     /// <summary>
     /// The ids of all the lathe recipes which have been unlocked.
@@ -41,8 +41,8 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// </summary>
     /// todo: if you unlock all the recipes in a tech, it doesn't count as unlocking the tech. sadge
     [AutoNetworkedField]
-    [DataField("unlockedRecipes", customTypeSerializer: typeof(PrototypeIdListSerializer<LatheRecipePrototype>))]
-    public List<string> UnlockedRecipes = new();
+    [DataField]
+    public List<ProtoId<LatheRecipePrototype>> UnlockedRecipes = new();
 }
 
 /// <summary>
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index 7d26971b11..957526d802 100644
--- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -3,13 +3,12 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Lathe.Prototypes;
 using Content.Shared.Materials;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Research.Prototypes
 {
-    [NetSerializable, Serializable, Prototype]
+    [Prototype]
     public sealed partial class LatheRecipePrototype : IPrototype, IInheritingPrototype
     {
         [ViewVariables]
diff --git a/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs b/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs
index b99b653cf0..1820541746 100644
--- a/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs
+++ b/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs
@@ -1,6 +1,9 @@
 using Content.Shared.Actions;
+using Content.Shared.Cuffs;
+using Content.Shared.Hands;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction.Components;
+using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -26,6 +29,7 @@ public sealed class RetractableItemActionSystem : EntitySystem
         SubscribeLocalEvent<RetractableItemActionComponent, OnRetractableItemActionEvent>(OnRetractableItemAction);
 
         SubscribeLocalEvent<ActionRetractableItemComponent, ComponentShutdown>(OnActionSummonedShutdown);
+        Subs.SubscribeWithRelay<ActionRetractableItemComponent, HeldRelayedEvent<TargetHandcuffedEvent>>(OnItemHandcuffed, inventory: false);
     }
 
     private void OnActionInit(Entity<RetractableItemActionComponent> ent, ref MapInitEvent args)
@@ -37,7 +41,7 @@ public sealed class RetractableItemActionSystem : EntitySystem
 
     private void OnRetractableItemAction(Entity<RetractableItemActionComponent> ent, ref OnRetractableItemActionEvent args)
     {
-        if (_hands.GetActiveHand(args.Performer) is not { } userHand)
+        if (_hands.GetActiveHand(args.Performer) is not { } activeHand)
             return;
 
         if (_actions.GetAction(ent.Owner) is not { } action)
@@ -50,7 +54,9 @@ public sealed class RetractableItemActionSystem : EntitySystem
             return;
 
         // Don't allow to summon an item if holding an unremoveable item unless that item is summoned by the action.
-        if (userHand.HeldEntity != null && !_hands.IsHolding(args.Performer, ent.Comp.ActionItemUid) && !_hands.CanDropHeld(args.Performer, userHand, false))
+        if (_hands.GetActiveItem(ent.Owner) != null
+            && !_hands.IsHolding(args.Performer, ent.Comp.ActionItemUid)
+            && !_hands.CanDropHeld(args.Performer, activeHand, false))
         {
             _popups.PopupClient(Loc.GetString("retractable-item-hand-cannot-drop"), args.Performer, args.Performer);
             return;
@@ -58,16 +64,11 @@ public sealed class RetractableItemActionSystem : EntitySystem
 
         if (_hands.IsHolding(args.Performer, ent.Comp.ActionItemUid))
         {
-            RemComp<UnremoveableComponent>(ent.Comp.ActionItemUid.Value);
-            var container = _containers.GetContainer(ent, RetractableItemActionComponent.ContainerId);
-            _containers.Insert(ent.Comp.ActionItemUid.Value, container);
-            _audio.PlayPredicted(ent.Comp.RetractSounds, action.Comp.AttachedEntity.Value, action.Comp.AttachedEntity.Value);
+            RetractRetractableItem(args.Performer, ent.Comp.ActionItemUid.Value, ent.Owner);
         }
         else
         {
-            _hands.TryForcePickup(args.Performer, ent.Comp.ActionItemUid.Value, userHand, checkActionBlocker: false);
-            _audio.PlayPredicted(ent.Comp.SummonSounds, action.Comp.AttachedEntity.Value, action.Comp.AttachedEntity.Value);
-            EnsureComp<UnremoveableComponent>(ent.Comp.ActionItemUid.Value);
+            SummonRetractableItem(args.Performer, ent.Comp.ActionItemUid.Value, activeHand, ent.Owner);
         }
 
         args.Handled = true;
@@ -85,6 +86,20 @@ public sealed class RetractableItemActionSystem : EntitySystem
         PopulateActionItem(action.Owner);
     }
 
+    private void OnItemHandcuffed(Entity<ActionRetractableItemComponent> ent, ref HeldRelayedEvent<TargetHandcuffedEvent> args)
+    {
+        if (_actions.GetAction(ent.Comp.SummoningAction) is not { } action)
+            return;
+
+        if (action.Comp.AttachedEntity == null)
+            return;
+
+        if (_hands.GetActiveHand(action.Comp.AttachedEntity.Value) is not { })
+            return;
+
+        RetractRetractableItem(action.Comp.AttachedEntity.Value, ent, action.Owner);
+    }
+
     private void PopulateActionItem(Entity<RetractableItemActionComponent?> ent)
     {
         if (!Resolve(ent.Owner, ref ent.Comp, false) || TerminatingOrDeleted(ent))
@@ -102,4 +117,25 @@ public sealed class RetractableItemActionSystem : EntitySystem
 
         Dirty(ent);
     }
+
+    private void RetractRetractableItem(EntityUid holder, EntityUid item, Entity<RetractableItemActionComponent?> action)
+    {
+        if (!Resolve(action, ref action.Comp, false))
+            return;
+
+        RemComp<UnremoveableComponent>(item);
+        var container = _containers.GetContainer(action, RetractableItemActionComponent.ContainerId);
+        _containers.Insert(item, container);
+        _audio.PlayPredicted(action.Comp.RetractSounds, holder, holder);
+    }
+
+    private void SummonRetractableItem(EntityUid holder, EntityUid item, string hand, Entity<RetractableItemActionComponent?> action)
+    {
+        if (!Resolve(action, ref action.Comp, false))
+            return;
+
+        _hands.TryForcePickup(holder, item, hand, checkActionBlocker: false);
+        _audio.PlayPredicted(action.Comp.SummonSounds, holder, holder);
+        EnsureComp<UnremoveableComponent>(item);
+    }
 }
diff --git a/Content.Shared/Revenant/SharedRevenant.cs b/Content.Shared/Revenant/SharedRevenant.cs
index 796e39edbc..e70eafdcd7 100644
--- a/Content.Shared/Revenant/SharedRevenant.cs
+++ b/Content.Shared/Revenant/SharedRevenant.cs
@@ -79,11 +79,3 @@ public enum RevenantVisuals : byte
     Stunned,
     Harvesting,
 }
-
-[NetSerializable, Serializable]
-public enum RevenantVisualLayers : byte
-{
-    Digit1,
-    Digit2,
-    Digit3
-}
diff --git a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
index bbf91193cc..36a31d88a4 100644
--- a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
+++ b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
@@ -42,7 +42,7 @@ public abstract class SharedRevolutionarySystem : EntitySystem
             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/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs
index ba12a972e5..b77041faf7 100644
--- a/Content.Shared/Roles/AntagPrototype.cs
+++ b/Content.Shared/Roles/AntagPrototype.cs
@@ -9,7 +9,6 @@ namespace Content.Shared.Roles;
 ///     Describes information for a single antag.
 /// </summary>
 [Prototype]
-[Serializable, NetSerializable]
 public sealed partial class AntagPrototype : IPrototype
 {
     [ViewVariables]
diff --git a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
index a1723dbc7e..222aec9bf7 100644
--- a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
+++ b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Roles.RoleCodeword;
@@ -16,8 +15,6 @@ public sealed partial class RoleCodewordComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public Dictionary<string, CodewordsData> RoleCodewords = new();
-
-    public override bool SessionSpecific => true;
 }
 
 [DataDefinition, Serializable, NetSerializable]
diff --git a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
index 9f860715fb..345cfd4e21 100644
--- a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
+++ b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
@@ -1,49 +1,11 @@
-using Content.Shared.Mind;
-using Robust.Shared.GameStates;
-using Robust.Shared.Player;
-
 namespace Content.Shared.Roles.RoleCodeword;
 
 public abstract class SharedRoleCodewordSystem : EntitySystem
 {
-    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RoleCodewordComponent, ComponentGetStateAttemptEvent>(OnCodewordCompGetStateAttempt);
-    }
-
-    /// <summary>
-    /// Determines if a codeword component should be sent to the client.
-    /// </summary>
-    private void OnCodewordCompGetStateAttempt(EntityUid uid, RoleCodewordComponent comp, ref ComponentGetStateAttemptEvent args)
-    {
-        args.Cancelled = !CanGetState(args.Player, comp);
-    }
-
-    /// <summary>
-    /// The criteria that determine whether a codeword component should be sent to a client.
-    /// Sends the component if its owner is the player mind.
-    /// </summary>
-    /// <param name="player"> The Player the component will be sent to.</param>
-    /// <param name="comp"> The component being checked against</param>
-    /// <returns></returns>
-    private bool CanGetState(ICommonSession? player, RoleCodewordComponent comp)
-    {
-        if (!_mindSystem.TryGetMind(player, out EntityUid mindId, out var _))
-            return false;
-
-        if (!TryComp(mindId, out RoleCodewordComponent? playerComp) && comp != playerComp)
-            return false;
-
-        return true;
-    }
-
-    public void SetRoleCodewords(RoleCodewordComponent comp, string key, List<string> codewords, Color color)
+    public void SetRoleCodewords(Entity<RoleCodewordComponent> ent, string key, List<string> codewords, Color color)
     {
         var data = new CodewordsData(color, codewords);
-        comp.RoleCodewords[key] = data;
+        ent.Comp.RoleCodewords[key] = data;
+        Dirty(ent);
     }
 }
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index 3438d76852..b21973248f 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Roles.Jobs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
@@ -19,13 +20,14 @@ namespace Content.Shared.Roles;
 
 public abstract class SharedRoleSystem : EntitySystem
 {
-    [Dependency] private   readonly IConfigurationManager _cfg = default!;
-    [Dependency] private   readonly IEntityManager _entityManager = default!;
-    [Dependency] private   readonly IPrototypeManager _prototypes = default!;
-    [Dependency] private   readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] protected readonly ISharedPlayerManager Player = default!;
-    [Dependency] private   readonly SharedAudioSystem _audio = default!;
-    [Dependency] private   readonly SharedMindSystem _minds = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly SharedMindSystem _minds = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
     private JobRequirementOverridePrototype? _requirementOverride;
 
@@ -504,6 +506,20 @@ public abstract class SharedRoleSystem : EntitySystem
         return found;
     }
 
+    /// <summary>
+    /// Returns true if a mind has a role that matches a whitelist.
+    /// </summary>
+    public bool MindHasRole(Entity<MindComponent> mind, EntityWhitelist whitelist)
+    {
+        foreach (var roleEnt in mind.Comp.MindRoles)
+        {
+            if (_whitelist.IsWhitelistPass(whitelist, roleEnt))
+                return true;
+        }
+
+        return false;
+    }
+
     /// <summary>
     /// Finds the first mind role of a specific type on a mind entity.
     /// </summary>
diff --git a/Content.Shared/Rootable/SharedRootableSystem.cs b/Content.Shared/Rootable/SharedRootableSystem.cs
index 9a6697cf97..9165c3c111 100644
--- a/Content.Shared/Rootable/SharedRootableSystem.cs
+++ b/Content.Shared/Rootable/SharedRootableSystem.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Damage.Components;
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Alert;
+using Content.Shared.Cloning.Events;
 using Content.Shared.Coordinates;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Gravity;
@@ -9,6 +9,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Slippery;
 using Content.Shared.Toggleable;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -50,6 +51,20 @@ public abstract class SharedRootableSystem : EntitySystem
         SubscribeLocalEvent<RootableComponent, IsWeightlessEvent>(OnIsWeightless);
         SubscribeLocalEvent<RootableComponent, SlipAttemptEvent>(OnSlipAttempt);
         SubscribeLocalEvent<RootableComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+        SubscribeLocalEvent<RootableComponent, CloningEvent>(OnCloning);
+    }
+
+    private void OnCloning(Entity<RootableComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        var cloneComp = EnsureComp<RootableComponent>(args.CloneUid);
+        cloneComp.TransferRate = ent.Comp.TransferRate;
+        cloneComp.TransferFrequency = ent.Comp.TransferFrequency;
+        cloneComp.SpeedModifier = ent.Comp.SpeedModifier;
+        cloneComp.RootSound = ent.Comp.RootSound;
+        Dirty(args.CloneUid, cloneComp);
     }
 
     private void OnRootableMapInit(Entity<RootableComponent> entity, ref MapInitEvent args)
@@ -68,6 +83,7 @@ public abstract class SharedRootableSystem : EntitySystem
 
         var actions = new Entity<ActionsComponent?>(entity, comp);
         _actions.RemoveAction(actions, entity.Comp.ActionEntity);
+        _alerts.ClearAlert(entity, entity.Comp.RootedAlert);
     }
 
     private void OnRootableToggle(Entity<RootableComponent> entity, ref ToggleActionEvent args)
@@ -127,7 +143,7 @@ public abstract class SharedRootableSystem : EntitySystem
         if (!ent.Comp.Rooted)
             return;
 
-        if (args.SlipCausingEntity != null && HasComp<DamageUserOnTriggerComponent>(args.SlipCausingEntity))
+        if (args.SlipCausingEntity != null && HasComp<DamageOnTriggerComponent>(args.SlipCausingEntity))
             return;
 
         args.NoSlip = true;
diff --git a/Content.Shared/Rotatable/FlippableComponent.cs b/Content.Shared/Rotatable/FlippableComponent.cs
new file mode 100644
index 0000000000..fdc8c15c8a
--- /dev/null
+++ b/Content.Shared/Rotatable/FlippableComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Allows an entity to be flipped (mirrored) by using a verb.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlippableComponent : Component
+{
+    /// <summary>
+    /// Entity to replace this entity with when the current one is 'flipped'.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId MirrorEntity = default!;
+}
diff --git a/Content.Shared/Rotatable/RotatableComponent.cs b/Content.Shared/Rotatable/RotatableComponent.cs
index b008c28160..336c484d8c 100644
--- a/Content.Shared/Rotatable/RotatableComponent.cs
+++ b/Content.Shared/Rotatable/RotatableComponent.cs
@@ -1,27 +1,28 @@
-namespace Content.Shared.Rotatable
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Allows an entity to be rotated by using a verb.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RotatableComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class RotatableComponent : Component
-    {
-        /// <summary>
-        ///     If true, this entity can be rotated even while anchored.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("rotateWhileAnchored")]
-        public bool RotateWhileAnchored { get; private set; }
+    /// <summary>
+    /// If true, this entity can be rotated even while anchored.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RotateWhileAnchored;
 
-        /// <summary>
-        ///     If true, will rotate entity in players direction when pulled
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("rotateWhilePulling")]
-        public bool RotateWhilePulling { get; private set; } = true;
+    /// <summary>
+    /// If true, will rotate entity in players direction when pulled
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RotateWhilePulling = true;
 
-        /// <summary>
-        ///     The angular value to change when using the rotate verbs.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("increment")]
-        public Angle Increment { get; private set; } = Angle.FromDegrees(90);
-    }
+    /// <summary>
+    /// The angular value to change when using the rotate verbs.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle Increment = Angle.FromDegrees(90);
 }
diff --git a/Content.Shared/Rotatable/RotatableSystem.cs b/Content.Shared/Rotatable/RotatableSystem.cs
new file mode 100644
index 0000000000..94d9206247
--- /dev/null
+++ b/Content.Shared/Rotatable/RotatableSystem.cs
@@ -0,0 +1,213 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Input;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Handles verbs for the <see cref="RotatableComponent"/> and <see cref="FlippableComponent"/> components.
+/// </summary>
+public sealed class RotatableSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FlippableComponent, GetVerbsEvent<Verb>>(AddFlipVerb);
+        SubscribeLocalEvent<RotatableComponent, GetVerbsEvent<Verb>>(AddRotateVerbs);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.RotateObjectClockwise, new PointerInputCmdHandler(HandleRotateObjectClockwise))
+            .Bind(ContentKeyFunctions.RotateObjectCounterclockwise, new PointerInputCmdHandler(HandleRotateObjectCounterclockwise))
+            .Bind(ContentKeyFunctions.FlipObject, new PointerInputCmdHandler(HandleFlipObject))
+            .Register<RotatableSystem>();
+    }
+
+    private void AddFlipVerb(EntityUid uid, FlippableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !args.CanComplexInteract)
+            return;
+
+        // Check if the object is anchored.
+        if (TryComp<PhysicsComponent>(uid, out var physics) && physics.BodyType == BodyType.Static)
+            return;
+
+        Verb verb = new()
+        {
+            Act = () => Flip(uid, component),
+            Text = Loc.GetString("flippable-verb-get-data-text"),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/flip.svg.192dpi.png")),
+            Priority = -3, // show flip last
+            DoContactInteraction = true
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !args.CanComplexInteract
+            || Transform(uid).NoLocalRotation) // Good ol prototype inheritance, eh?
+            return;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!component.RotateWhileAnchored &&
+            TryComp<PhysicsComponent>(uid, out var physics) &&
+            physics.BodyType == BodyType.Static)
+            return;
+
+        Verb resetRotation = new()
+        {
+            DoContactInteraction = true,
+            Act = () => ResetRotation(uid),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-reset-verb-get-data-text"),
+            Priority = -2, // show CCW, then CW, then reset
+            CloseMenu = false,
+        };
+        args.Verbs.Add(resetRotation);
+
+        // rotate clockwise
+        Verb rotateCW = new()
+        {
+            Act = () => Rotate(uid, -component.Increment),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-verb-get-data-text"),
+            Priority = -1,
+            CloseMenu = false, // allow for easy double rotations.
+        };
+        args.Verbs.Add(rotateCW);
+
+        // rotate counter-clockwise
+        Verb rotateCCW = new()
+        {
+            Act = () => Rotate(uid, component.Increment),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-counter-verb-get-data-text"),
+            Priority = 0,
+            CloseMenu = false, // allow for easy double rotations.
+        };
+        args.Verbs.Add(rotateCCW);
+    }
+
+    /// <summary>
+    /// Replace a flippable entity with it's flipped / mirror-symmetric entity.
+    /// </summary>
+    public void Flip(EntityUid uid, FlippableComponent component)
+    {
+        var oldTransform = Comp<TransformComponent>(uid);
+        var entity = PredictedSpawnAtPosition(component.MirrorEntity, oldTransform.Coordinates);
+        var newTransform = Comp<TransformComponent>(entity);
+        _transform.SetLocalRotation(entity, oldTransform.LocalRotation);
+        _transform.Unanchor(entity, newTransform);
+        PredictedDel(uid);
+    }
+
+    private bool HandleRotateObjectClockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!rotatableComp.RotateWhileAnchored && TryComp<PhysicsComponent>(entity, out var physics) &&
+            physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
+            return false;
+        }
+
+        Rotate(entity, -rotatableComp.Increment);
+        return false;
+    }
+
+    private bool HandleRotateObjectCounterclockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!rotatableComp.RotateWhileAnchored && TryComp<PhysicsComponent>(entity, out var physics) &&
+            physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
+            return false;
+        }
+
+        Rotate(entity, rotatableComp.Increment);
+        return false;
+    }
+
+    private bool HandleFlipObject(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<FlippableComponent>(entity, out var flippableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored.
+        if (TryComp<PhysicsComponent>(entity, out var physics) && physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("flippable-component-try-flip-is-stuck"), entity, player);
+            return false;
+        }
+
+        Flip(entity, flippableComp);
+        return false;
+    }
+
+    private void Rotate(Entity<TransformComponent?> ent, Angle angle)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        _transform.SetLocalRotation(ent.Owner, ent.Comp.LocalRotation + angle);
+    }
+
+    private void ResetRotation(Entity<TransformComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        _transform.SetLocalRotation(ent.Owner, Angle.Zero);
+    }
+}
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
index 47ac8afe72..6bfb3fdfd6 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
@@ -1,35 +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
 {
-    [ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// Whether or not the entity is SSD.
+    /// </summary>
     [AutoNetworkedField]
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
     public bool IsSSD = true;
 
-    [ViewVariables(VVAccess.ReadWrite)]
+    /// <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, AutoPausedField, Access(typeof(SSDIndicatorSystem))]
+    [AutoNetworkedField, AutoPausedField]
+    [Access(typeof(SSDIndicatorSystem))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan FallAsleepTime = TimeSpan.Zero;
 
     /// <summary>
-    ///     Required to don't remove forced sleep from other sources
+    /// The next time this component will be updated.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public bool ForcedSleepAdded = false;
+    [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 dfba833bcf..14d71d90d9 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
@@ -1,7 +1,8 @@
-using Content.Shared.Bed.Sleep;
 using Content.Shared.CCVar;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.SSDIndicator;
@@ -11,8 +12,11 @@ namespace Content.Shared.SSDIndicator;
 /// </summary>
 public sealed class SSDIndicatorSystem : EntitySystem
 {
+    public static readonly EntProtoId StatusEffectSSDSleeping = "StatusEffectSSDSleeping";
+
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     private bool _icSsdSleep;
     private float _icSsdSleepTime;
@@ -35,12 +39,9 @@ public sealed class SSDIndicatorSystem : EntitySystem
         if (_icSsdSleep)
         {
             component.FallAsleepTime = TimeSpan.Zero;
-            if (component.ForcedSleepAdded) // Remove component only if it has been added by this system
-            {
-                EntityManager.RemoveComponent<ForcedSleepingComponent>(uid);
-                component.ForcedSleepAdded = false;
-            }
+            _statusEffects.TryRemoveStatusEffect(uid, StatusEffectSSDSleeping);
         }
+
         Dirty(uid, component);
     }
 
@@ -53,18 +54,19 @@ public sealed class SSDIndicatorSystem : EntitySystem
         {
             component.FallAsleepTime = _timing.CurTime + TimeSpan.FromSeconds(_icSsdSleepTime);
         }
+
         Dirty(uid, component);
     }
 
     // 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)
@@ -74,19 +76,21 @@ public sealed class SSDIndicatorSystem : EntitySystem
         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) &&
-                !HasComp<ForcedSleepingComponent>(uid)) // Don't add the component if the entity has it from another sources
-            {
-                EnsureComp<ForcedSleepingComponent>(uid);
-                ssd.ForcedSleepAdded = true;
-            }
+            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/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
index f379df9a4c..d0c4916265 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
@@ -1,3 +1,5 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
 public interface IBiomeSpecificMod : ISalvageMod
@@ -5,5 +7,5 @@ public interface IBiomeSpecificMod : ISalvageMod
     /// <summary>
     /// Whitelist for biomes. If null then any biome is allowed.
     /// </summary>
-    List<string>? Biomes { get; }
+    List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; }
 }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
index fda08281b0..b1a72a3110 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Atmos;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -24,8 +23,8 @@ public sealed partial class SalvageAirMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Set to true if this planet will have no atmosphere.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
index c8fc22c2af..69c0e3af88 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
@@ -1,7 +1,5 @@
 using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -17,8 +15,8 @@ public sealed partial class SalvageDungeonModPrototype : IPrototype, IBiomeSpeci
     public float Cost { get; private set; } = 0f;
 
     /// <inheridoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// The config to use for spawning the dungeon.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
index 8acfd8b7c4..9556899353 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -15,8 +14,8 @@ public sealed partial class SalvageLightMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     [DataField("color", required: true)] public Color? Color;
 }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
index 8871c14572..d48ea7bd3a 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -15,8 +14,8 @@ public sealed partial class SalvageTemperatureMod : IPrototype, IBiomeSpecificMo
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Temperature in the planets air mix.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
index 1f3b13daee..8bf0614b46 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Weather;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -17,8 +16,8 @@ public sealed partial class SalvageWeatherMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeModPrototype>))]
-    public List<string>? Biomes { get; private set; } = null;
+    [DataField]
+    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Weather prototype to use on the planet.
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index b4b383d800..0b091d3a61 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -33,7 +33,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    [ValidatePrototypeId<EntityPrototype>] public const string EffectProto = "FultonEffect";
+    public static readonly EntProtoId EffectProto = "FultonEffect";
     protected static readonly Vector2 EffectOffset = Vector2.Zero;
 
     public override void Initialize()
diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs
index 12d0a26449..6e596449b4 100644
--- a/Content.Shared/Salvage/SharedSalvageSystem.cs
+++ b/Content.Shared/Salvage/SharedSalvageSystem.cs
@@ -23,8 +23,7 @@ public abstract partial class SharedSalvageSystem : EntitySystem
     /// <summary>
     /// Main loot table for salvage expeditions.
     /// </summary>
-    [ValidatePrototypeId<SalvageLootPrototype>]
-    public const string ExpeditionsLootProto = "SalvageLoot";
+    public static readonly ProtoId<SalvageLootPrototype> ExpeditionsLootProto = "SalvageLoot";
 
     public string GetFTLName(LocalizedDatasetPrototype dataset, int seed)
     {
diff --git a/Content.Shared/Sericulture/SericultureComponent.cs b/Content.Shared/Sericulture/SericultureComponent.cs
index e0cc2b7d91..a07e96a34c 100644
--- a/Content.Shared/Sericulture/SericultureComponent.cs
+++ b/Content.Shared/Sericulture/SericultureComponent.cs
@@ -31,10 +31,10 @@ public sealed partial class SericultureComponent : Component
     /// <summary>
     /// The entity needed to actually preform sericulture. This will be granted (and removed) upon the entity's creation.
     /// </summary>
-    [DataField(required: true)]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
-    public EntProtoId Action;
+    public EntProtoId Action = "ActionSericulture";
 
     [AutoNetworkedField]
     [DataField("actionEntity")]
diff --git a/Content.Shared/Sericulture/SericultureSystem.cs b/Content.Shared/Sericulture/SericultureSystem.cs
index 8c10d0f3d0..e6086e67c2 100644
--- a/Content.Shared/Sericulture/SericultureSystem.cs
+++ b/Content.Shared/Sericulture/SericultureSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Actions;
+using Content.Shared.Cloning.Events;
 using Content.Shared.DoAfter;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Serialization;
@@ -32,6 +33,21 @@ public abstract partial class SharedSericultureSystem : EntitySystem
         SubscribeLocalEvent<SericultureComponent, ComponentShutdown>(OnCompRemove);
         SubscribeLocalEvent<SericultureComponent, SericultureActionEvent>(OnSericultureStart);
         SubscribeLocalEvent<SericultureComponent, SericultureDoAfterEvent>(OnSericultureDoAfter);
+        SubscribeLocalEvent<SericultureComponent, CloningEvent>(OnClone);
+    }
+
+    private void OnClone(Entity<SericultureComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        var comp = EnsureComp<SericultureComponent>(args.CloneUid);
+        comp.PopupText = ent.Comp.PopupText;
+        comp.ProductionLength = ent.Comp.ProductionLength;
+        comp.HungerCost = ent.Comp.HungerCost;
+        comp.EntityProduced = ent.Comp.EntityProduced;
+        comp.MinHungerThreshold = ent.Comp.MinHungerThreshold;
+        Dirty(args.CloneUid, comp);
     }
 
     /// <summary>
diff --git a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
index 00560d8202..5855054b38 100644
--- a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
+++ b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
@@ -17,7 +17,6 @@ namespace Content.Shared.Silicons.Borgs;
 [Prototype]
 public sealed partial class BorgTypePrototype : IPrototype
 {
-    [ValidatePrototypeId<SoundCollectionPrototype>]
     private static readonly ProtoId<SoundCollectionPrototype> DefaultFootsteps = new("FootstepBorg");
 
     [IdDataField]
diff --git a/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs b/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs
index 75835d0cf0..e86edb3476 100644
--- a/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/ItemBorgModuleComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Silicons.Borgs.Components;
 
@@ -14,8 +13,8 @@ public sealed partial class ItemBorgModuleComponent : Component
     /// <summary>
     /// The items that are provided.
     /// </summary>
-    [DataField("items", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>), required: true)]
-    public List<string> Items = new();
+    [DataField(required: true)]
+    public List<EntProtoId> Items = new();
 
     /// <summary>
     /// The entities from <see cref="Items"/> that were spawned.
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
index 55287e4d23..914470e3c9 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -21,8 +21,7 @@ public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
     [Dependency] protected readonly IPrototypeManager Prototypes = default!;
     [Dependency] private readonly InteractionPopupSystem _interactionPopup = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string ActionId = "ActionSelectBorgType";
+    public static readonly EntProtoId ActionId = "ActionSelectBorgType";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
index e7433de604..056431c133 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.Laws.Components;
@@ -57,7 +57,7 @@ public abstract partial class SharedSiliconLawSystem : EntitySystem
         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/Laws/SiliconLawPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
index 434f80e16e..d2bdf7d02b 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
@@ -78,7 +78,6 @@ public partial class SiliconLaw : IComparable<SiliconLaw>, IEquatable<SiliconLaw
 /// This is a prototype for a law governing the behavior of silicons.
 /// </summary>
 [Prototype]
-[Serializable, NetSerializable]
 public sealed partial class SiliconLawPrototype : SiliconLaw, IPrototype
 {
     /// <inheritdoc/>
diff --git a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
index 49c618ef8c..9f33521d8f 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
@@ -1,7 +1,5 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Silicons.Laws;
 
@@ -61,7 +59,7 @@ public sealed partial class SiliconLawset
 /// This is a prototype for a <see cref="SiliconLawPrototype"/> list.
 /// Cannot be used directly since it is a list of prototype ids rather than List<Siliconlaw>.
 /// </summary>
-[Prototype, Serializable, NetSerializable]
+[Prototype]
 public sealed partial class SiliconLawsetPrototype : IPrototype
 {
     /// <inheritdoc/>
@@ -71,8 +69,8 @@ public sealed partial class SiliconLawsetPrototype : IPrototype
     /// <summary>
     /// List of law prototype ids in this lawset.
     /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<SiliconLawPrototype>))]
-    public List<string> Laws = new();
+    [DataField(required: true)]
+    public List<ProtoId<SiliconLawPrototype>> Laws = new();
 
     /// <summary>
     /// What entity the lawset considers as a figure of authority.
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 2fafcedf9f..c23bb02e6f 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Managers;
+using Content.Shared.Chat.Prototypes;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Doors.Systems;
@@ -17,7 +18,6 @@ using Content.Shared.Power;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.StationAi;
 using Content.Shared.Verbs;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -27,8 +27,8 @@ using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
-using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.Utility;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Silicons.StationAi;
 
@@ -69,8 +69,8 @@ public abstract partial class SharedStationAiSystem : EntitySystem
     private EntityQuery<BroadphaseComponent> _broadphaseQuery;
     private EntityQuery<MapGridComponent> _gridQuery;
 
-    [ValidatePrototypeId<EntityPrototype>]
     private static readonly EntProtoId DefaultAi = "StationAiBrain";
+    private readonly ProtoId<ChatNotificationPrototype> _downloadChatNotificationPrototype = "IntellicardDownload";
 
     private const float MaxVisionMultiplier = 5f;
 
@@ -122,6 +122,8 @@ public abstract partial class SharedStationAiSystem : EntitySystem
                 Category = VerbCategory.Debug,
                 Act = () =>
                 {
+                    if (_net.IsClient)
+                        return;
                     var brain = SpawnInContainerOrDrop(DefaultAi, ent.Owner, StationAiCoreComponent.Container);
                     _mind.ControlMob(user, brain);
                 },
@@ -294,10 +296,10 @@ public abstract partial class SharedStationAiSystem : EntitySystem
             return;
         }
 
-        if (TryGetHeld((args.Target.Value, targetHolder), out var held) && _timing.CurTime > intelliComp.NextWarningAllowed)
+        if (TryGetHeld((args.Target.Value, targetHolder), out var held))
         {
-            intelliComp.NextWarningAllowed = _timing.CurTime + intelliComp.WarningDelay;
-            AnnounceIntellicardUsage(held, intelliComp.WarningSound);
+            var ev = new ChatNotificationEvent(_downloadChatNotificationPrototype, args.Used, args.User);
+            RaiseLocalEvent(held, ref ev);
         }
 
         var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cardHasAi ? intelliComp.UploadTime : intelliComp.DownloadTime, new IntellicardDoAfterEvent(), args.Target, ent.Owner)
@@ -458,6 +460,9 @@ public abstract partial class SharedStationAiSystem : EntitySystem
         }
 
         _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)
@@ -532,8 +537,6 @@ public abstract partial class SharedStationAiSystem : EntitySystem
         _appearance.SetData(entity.Owner, StationAiVisualState.Key, state);
     }
 
-    public virtual void AnnounceIntellicardUsage(EntityUid uid, SoundSpecifier? cue = null) { }
-
     public virtual bool SetVisionEnabled(Entity<StationAiVisionComponent> entity, bool enabled, bool announce = false)
     {
         if (entity.Comp.Enabled == enabled)
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index c2e7af717b..d181757968 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -3,13 +3,10 @@ using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Shared.Singularity.Components;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitterComponent : Component
 {
     public CancellationTokenSource? TimerCancel;
@@ -28,77 +25,77 @@ public sealed partial class EmitterComponent : Component
     /// <summary>
     /// The entity that is spawned when the emitter fires.
     /// </summary>
-    [DataField("boltType", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string BoltType = "EmitterBolt";
+    [DataField, AutoNetworkedField]
+    public EntProtoId BoltType = "EmitterBolt";
 
-    [DataField("selectableTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> SelectableTypes = new();
+    [DataField]
+    public List<EntProtoId> SelectableTypes = new();
 
     /// <summary>
     /// The current amount of power being used.
     /// </summary>
-    [DataField("powerUseActive")]
+    [DataField]
     public int PowerUseActive = 600;
 
     /// <summary>
     /// The amount of shots that are fired in a single "burst"
     /// </summary>
-    [DataField("fireBurstSize")]
+    [DataField]
     public int FireBurstSize = 3;
 
     /// <summary>
     /// The time between each shot during a burst.
     /// </summary>
-    [DataField("fireInterval")]
+    [DataField]
     public TimeSpan FireInterval = TimeSpan.FromSeconds(2);
 
     /// <summary>
     /// The current minimum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMin")]
+    [DataField]
     public TimeSpan FireBurstDelayMin = TimeSpan.FromSeconds(4);
 
     /// <summary>
     /// The current maximum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMax")]
+    [DataField]
     public TimeSpan FireBurstDelayMax = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// The visual state that is set when the emitter is turned on
     /// </summary>
-    [DataField("onState")]
+    [DataField]
     public string? OnState = "beam";
 
     /// <summary>
     /// The visual state that is set when the emitter doesn't have enough power.
     /// </summary>
-    [DataField("underpoweredState")]
+    [DataField]
     public string? UnderpoweredState = "underpowered";
 
     /// <summary>
     /// Signal port that turns on the emitter.
     /// </summary>
-    [DataField("onPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string OnPort = "On";
+    [DataField]
+    public ProtoId<SinkPortPrototype> OnPort = "On";
 
     /// <summary>
     /// Signal port that turns off the emitter.
     /// </summary>
-    [DataField("offPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string OffPort = "Off";
+    [DataField]
+    public ProtoId<SinkPortPrototype> OffPort = "Off";
 
     /// <summary>
     /// Signal port that toggles the emitter on or off.
     /// </summary>
-    [DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string TogglePort = "Toggle";
+    [DataField]
+    public ProtoId<SinkPortPrototype> TogglePort = "Toggle";
 
     /// <summary>
     /// Map of signal ports to entity prototype IDs of the entity that will be fired.
     /// </summary>
-    [DataField("setTypePorts", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<string, SinkPortPrototype>))]
-    public Dictionary<string, string> SetTypePorts = new();
+    [DataField]
+    public Dictionary<ProtoId<SinkPortPrototype>, EntProtoId> SetTypePorts = new();
 }
 
 [NetSerializable, Serializable]
diff --git a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
index bba6629988..9ef7dcfbdb 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
@@ -1,6 +1,66 @@
-namespace Content.Shared.Singularity.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Lock;
+using Content.Shared.Popups;
+using Content.Shared.Singularity.Components;
+using Content.Shared.Verbs;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Singularity.EntitySystems;
 
 public abstract class SharedEmitterSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
+    }
+
+    private void OnGetVerb(Entity<EmitterComponent> ent, ref GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract || args.Hands == null)
+            return;
+
+        if (TryComp<LockComponent>(ent.Owner, out var lockComp) && lockComp.Locked)
+            return;
+
+        if (ent.Comp.SelectableTypes.Count < 2)
+            return;
+
+        foreach (var type in ent.Comp.SelectableTypes)
+        {
+            var proto = _prototype.Index(type);
+
+            var v = new Verb
+            {
+                Priority = 1,
+                Category = VerbCategory.SelectType,
+                Text = proto.Name,
+                Disabled = type == ent.Comp.BoltType,
+                Impact = LogImpact.Medium,
+                DoContactInteraction = true,
+                Act = () =>
+                {
+                    ent.Comp.BoltType = type;
+                    Dirty(ent);
+                    _popup.PopupClient(Loc.GetString("emitter-component-type-set", ("type", proto.Name)), ent.Owner);
+                },
+            };
+            args.Verbs.Add(v);
+        }
+    }
+
+    private void OnExamined(Entity<EmitterComponent> ent, ref ExaminedEvent args)
+    {
+        if (ent.Comp.SelectableTypes.Count < 2)
+            return;
+
+        var proto = _prototype.Index(ent.Comp.BoltType);
+        args.PushMarkup(Loc.GetString("emitter-component-current-type", ("type", proto.Name)));
+    }
 }
diff --git a/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs
index c2b52c5af3..a791a70668 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs
@@ -172,7 +172,7 @@ public abstract class SharedEventHorizonSystem : EntitySystem
             _physics.SetHard(uid, collider, true, fixtures);
         }
 
-        EntityManager.Dirty(uid, fixtures);
+        Dirty(uid, fixtures);
     }
 
     #endregion Getters/Setters
diff --git a/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs b/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs
index acac1dfd84..b7bf071457 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs
@@ -45,10 +45,6 @@ public abstract class SharedSingularitySystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<SingularityComponent, ComponentStartup>(OnSingularityStartup);
-        SubscribeLocalEvent<AppearanceComponent, SingularityLevelChangedEvent>(UpdateAppearance);
-        SubscribeLocalEvent<RadiationSourceComponent, SingularityLevelChangedEvent>(UpdateRadiation);
-        SubscribeLocalEvent<PhysicsComponent, SingularityLevelChangedEvent>(UpdateBody);
-        SubscribeLocalEvent<EventHorizonComponent, SingularityLevelChangedEvent>(UpdateEventHorizon);
         SubscribeLocalEvent<SingularityDistortionComponent, SingularityLevelChangedEvent>(UpdateDistortion);
         SubscribeLocalEvent<SingularityDistortionComponent, EntGotInsertedIntoContainerMessage>(UpdateDistortion);
         SubscribeLocalEvent<SingularityDistortionComponent, EntGotRemovedFromContainerMessage>(UpdateDistortion);
@@ -121,9 +117,32 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// <param name="singularity">The state of the singularity which's level has changed.</param>
     public void UpdateSingularityLevel(EntityUid uid, byte oldValue, SingularityComponent? singularity = null)
     {
-        if(!Resolve(uid, ref singularity))
+        if (!Resolve(uid, ref singularity))
             return;
 
+        if (TryComp<EventHorizonComponent>(uid, out var eventHorizon))
+        {
+            _horizons.SetRadius(uid, EventHorizonRadius(singularity), false, eventHorizon);
+            _horizons.SetCanBreachContainment(uid, CanBreachContainment(singularity), false, eventHorizon);
+            _horizons.UpdateEventHorizonFixture(uid, eventHorizon: eventHorizon);
+        }
+
+        if (TryComp<PhysicsComponent>(uid, out var body))
+        {
+            if (singularity.Level <= 1 && oldValue > 1) // Apparently keeps singularities from getting stuck in the corners of containment fields.
+                _physics.SetLinearVelocity(uid, Vector2.Zero, body: body); // No idea how stopping the singularities movement keeps it from getting stuck though.
+        }
+
+        if (TryComp<AppearanceComponent>(uid, out var appearance))
+        {
+            _visualizer.SetData(uid, SingularityAppearanceKeys.Singularity, singularity.Level, appearance);
+        }
+
+        if (TryComp<RadiationSourceComponent>(uid, out var radiationSource))
+        {
+            UpdateRadiation(uid, singularity, radiationSource);
+        }
+
         RaiseLocalEvent(uid, new SingularityLevelChangedEvent(singularity.Level, oldValue, singularity));
         if (singularity.Level <= 0)
             QueueDel(uid);
@@ -274,21 +293,6 @@ public abstract class SharedSingularitySystem : EntitySystem
         UpdateSingularityLevel(uid, comp);
     }
 
-    // TODO: Figure out which systems should have control of which coupling.
-    /// <summary>
-    /// Syncs the radius of an event horizon associated with a singularity that just changed levels.
-    /// </summary>
-    /// <param name="uid">The entity that the event horizon and singularity are attached to.</param>
-    /// <param name="comp">The event horizon associated with the singularity.</param>
-    /// <param name="args">The event arguments.</param>
-    private void UpdateEventHorizon(EntityUid uid, EventHorizonComponent comp, SingularityLevelChangedEvent args)
-    {
-        var singulo = args.Singularity;
-        _horizons.SetRadius(uid, EventHorizonRadius(singulo), false, comp);
-        _horizons.SetCanBreachContainment(uid, CanBreachContainment(singulo), false, comp);
-        _horizons.UpdateEventHorizonFixture(uid, eventHorizon: comp);
-    }
-
     /// <summary>
     /// Updates the distortion shader associated with a singularity when the singuarity changes levels.
     /// </summary>
@@ -346,40 +350,6 @@ public abstract class SharedSingularitySystem : EntitySystem
         comp.Intensity = absIntensity > 1 ? comp.Intensity * MathF.Pow(absIntensity, factor) : comp.Intensity;
     }
 
-    /// <summary>
-    /// Updates the state of the physics body associated with a singularity when the singualrity changes levels.
-    /// </summary>
-    /// <param name="uid">The entity that the physics body and singularity are attached to.</param>
-    /// <param name="comp">The physics body associated with the singularity.</param>
-    /// <param name="args">The event arguments.</param>
-    private void UpdateBody(EntityUid uid, PhysicsComponent comp, SingularityLevelChangedEvent args)
-    {
-        if (args.NewValue <= 1 && args.OldValue > 1) // Apparently keeps singularities from getting stuck in the corners of containment fields.
-            _physics.SetLinearVelocity(uid, Vector2.Zero, body: comp); // No idea how stopping the singularities movement keeps it from getting stuck though.
-    }
-
-    /// <summary>
-    /// Updates the appearance of a singularity when the singularities level changes.
-    /// </summary>
-    /// <param name="uid">The entity that the singularity is attached to.</param>
-    /// <param name="comp">The appearance associated with the singularity.</param>
-    /// <param name="args">The event arguments.</param>
-    private void UpdateAppearance(EntityUid uid, AppearanceComponent comp, SingularityLevelChangedEvent args)
-    {
-        _visualizer.SetData(uid, SingularityAppearanceKeys.Singularity, args.NewValue, comp);
-    }
-
-    /// <summary>
-    /// Updates the amount of radiation a singularity emits when the singularities level changes.
-    /// </summary>
-    /// <param name="uid">The entity that the singularity is attached to.</param>
-    /// <param name="comp">The radiation source associated with the singularity.</param>
-    /// <param name="args">The event arguments.</param>
-    private void UpdateRadiation(EntityUid uid, RadiationSourceComponent comp, SingularityLevelChangedEvent args)
-    {
-        UpdateRadiation(uid, args.Singularity, comp);
-    }
-
 #endregion EventHandlers
 
 }
diff --git a/Content.Shared/Slippery/SlidingComponent.cs b/Content.Shared/Slippery/SlidingComponent.cs
index e48c0f2e9e..200d9570ab 100644
--- a/Content.Shared/Slippery/SlidingComponent.cs
+++ b/Content.Shared/Slippery/SlidingComponent.cs
@@ -8,15 +8,15 @@ namespace Content.Shared.Slippery;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class SlidingComponent : Component
 {
-    /// <summary>
-    ///     A list of SuperSlippery entities the entity with this component is colliding with.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public HashSet<EntityUid> CollidingEntities = new ();
-
     /// <summary>
     ///     The friction modifier that will be applied to any friction calculations.
     /// </summary>
     [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 dde9bb6ab0..e0084c11ab 100644
--- a/Content.Shared/Slippery/SlidingSystem.cs
+++ b/Content.Shared/Slippery/SlidingSystem.cs
@@ -1,19 +1,53 @@
-using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Standing;
-using Content.Shared.Stunnable;
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
+using Robust.Shared.Physics.Systems;
 
 namespace Content.Shared.Slippery;
 
 public sealed class SlidingSystem : EntitySystem
 {
+    [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);
         SubscribeLocalEvent<SlidingComponent, StartCollideEvent>(OnStartCollide);
         SubscribeLocalEvent<SlidingComponent, EndCollideEvent>(OnEndCollide);
+        SubscribeLocalEvent<SlidingComponent, RefreshFrictionModifiersEvent>(OnRefreshFrictionModifiers);
+        SubscribeLocalEvent<SlidingComponent, ThrowerImpulseEvent>(OnThrowerImpulse);
+        SubscribeLocalEvent<SlidingComponent, ShooterImpulseEvent>(ShooterImpulseEvent);
+    }
+
+    /// <summary>
+    ///     When the component is first added, calculate the friction modifier we need.
+    ///     Don't do this more than once to avoid mispredicts.
+    /// </summary>
+    private void OnComponentInit(Entity<SlidingComponent> entity, ref ComponentInit args)
+    {
+        if (CalculateSlidingModifier(entity))
+            _speedModifierSystem.RefreshFrictionModifiers(entity);
+    }
+
+    /// <summary>
+    ///     When the component is removed, refresh friction modifiers and set ours to 1 to avoid causing issues.
+    /// </summary>
+    private void OnComponentShutdown(Entity<SlidingComponent> entity, ref ComponentShutdown args)
+    {
+        entity.Comp.FrictionModifier = 1;
+        _speedModifierSystem.RefreshFrictionModifiers(entity);
     }
 
     /// <summary>
@@ -25,28 +59,81 @@ public sealed class SlidingSystem : EntitySystem
     }
 
     /// <summary>
-    ///     Sets friction to 0 if colliding with a SuperSlippery Entity.
+    ///     Updates friction when we collide with a slippery entity
     /// </summary>
-    private void OnStartCollide(EntityUid uid, SlidingComponent component, ref StartCollideEvent args)
+    private void OnStartCollide(Entity<SlidingComponent> entity, ref StartCollideEvent args)
     {
-        if (!TryComp<SlipperyComponent>(args.OtherEntity, out var slippery) || !slippery.SlipData.SuperSlippery)
+        if (!_slipperyQuery.TryComp(args.OtherEntity, out var slippery) || !slippery.AffectsSliding)
             return;
 
-        component.CollidingEntities.Add(args.OtherEntity);
-        Dirty(uid, component);
+        CalculateSlidingModifier(entity);
+        _speedModifierSystem.RefreshFrictionModifiers(entity);
     }
 
     /// <summary>
-    ///     Set friction to normal when ending collision with a SuperSlippery entity.
+    ///     Update friction when we stop colliding with a slippery entity
     /// </summary>
-    private void OnEndCollide(EntityUid uid, SlidingComponent component, ref EndCollideEvent args)
+    private void OnEndCollide(Entity<SlidingComponent> entity, ref EndCollideEvent args)
     {
-        if (!component.CollidingEntities.Remove(args.OtherEntity))
+        if (!_slipperyQuery.TryComp(args.OtherEntity, out var slippery) || !slippery.AffectsSliding)
             return;
 
-        if (component.CollidingEntities.Count == 0)
-            RemComp<SlidingComponent>(uid);
+        if (!CalculateSlidingModifier(entity, args.OtherEntity))
+        {
+            RemComp<SlidingComponent>(entity);
+            return;
+        }
 
-        Dirty(uid, component);
+        _speedModifierSystem.RefreshFrictionModifiers(entity);
+    }
+
+    /// <summary>
+    ///     Gets contacting slippery entities and averages their friction modifiers.
+    /// </summary>
+    private bool CalculateSlidingModifier(Entity<SlidingComponent, PhysicsComponent?> entity, EntityUid? ignore = null)
+    {
+        if (!Resolve(entity, ref entity.Comp2, false))
+            return false;
+
+        var friction = 0.0f;
+        var count = 0;
+        entity.Comp1.Contacting.Clear();
+
+        _physics.GetContactingEntities((entity, entity.Comp2), entity.Comp1.Contacting);
+
+        foreach (var ent in entity.Comp1.Contacting)
+        {
+            if (ent == ignore || !_slipperyQuery.TryComp(ent, out var slippery) || !slippery.AffectsSliding)
+                continue;
+
+            friction += slippery.SlipData.SlipFriction;
+
+            count++;
+        }
+
+        if (count > 0)
+        {
+            entity.Comp1.FrictionModifier = friction / count;
+            Dirty(entity.Owner, entity.Comp1);
+            return true;
+        }
+
+        return false;
+    }
+
+    private void OnRefreshFrictionModifiers(Entity<SlidingComponent> entity, ref RefreshFrictionModifiersEvent args)
+    {
+        args.ModifyFriction(entity.Comp.FrictionModifier);
+        args.ModifyAcceleration(entity.Comp.FrictionModifier);
+    }
+
+    private void OnThrowerImpulse(Entity<SlidingComponent> entity, ref ThrowerImpulseEvent args)
+    {
+        args.Push = true;
+    }
+
+    private void ShooterImpulseEvent(Entity<SlidingComponent> entity, ref ShooterImpulseEvent args)
+    {
+        args.Push = true;
     }
 }
diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs
index f6b6dd0b35..7b6cd90800 100644
--- a/Content.Shared/Slippery/SlipperyComponent.cs
+++ b/Content.Shared/Slippery/SlipperyComponent.cs
@@ -21,6 +21,25 @@ namespace Content.Shared.Slippery
         [Access(Other = AccessPermissions.ReadWriteExecute)]
         public SoundSpecifier SlipSound = new SoundPathSpecifier("/Audio/Effects/slip.ogg");
 
+        /// <summary>
+        /// Should this component's friction factor into sliding friction?
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool AffectsSliding;
+
+        /// <summary>
+        /// How long should this component apply the FrictionStatusComponent?
+        /// Note: This does stack with SlidingComponent since they are two separate Components
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public TimeSpan FrictionStatusTime = TimeSpan.FromSeconds(0.5f);
+
+        /// <summary>
+        /// How much stamina damage should this component do on slip?
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public float StaminaDamage = 25f;
+
         /// <summary>
         /// Loads the data needed to determine how slippery something is.
         /// </summary>
@@ -34,10 +53,22 @@ namespace Content.Shared.Slippery
     public sealed partial class SlipperyEffectEntry
     {
         /// <summary>
-        /// How many seconds the mob will be paralyzed for.
+        /// How many seconds the mob will be stunned for.
         /// </summary>
         [DataField]
-        public TimeSpan ParalyzeTime = TimeSpan.FromSeconds(1.5);
+        public TimeSpan StunTime = TimeSpan.FromSeconds(0.5);
+
+        /// <summary>
+        /// How many seconds the mob will be knocked down for.
+        /// </summary>
+        [DataField]
+        public TimeSpan KnockdownTime = TimeSpan.FromSeconds(1.5);
+
+        /// <summary>
+        /// Should the slipped entity try to stand up when Knockdown ends?
+        /// </summary>
+        [DataField]
+        public bool AutoStand = true;
 
         /// <summary>
         /// The entity's speed will be multiplied by this to slip it forwards.
@@ -63,6 +94,6 @@ namespace Content.Shared.Slippery
         /// This is used to store the friction modifier that is used on a sliding entity.
         /// </summary>
         [DataField]
-        public float SlipFriction;
+        public float SlipFriction = 0.5f;
     }
 }
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index fdfc871ceb..60fedf0236 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -1,15 +1,14 @@
 using Content.Shared._Sunrise.Mood;
 using Content.Shared._Sunrise.SunriseCCVars;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 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;
@@ -29,9 +28,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 _statusEffects = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+    [Dependency] private readonly SharedStaminaSystem _stamina = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SpeedModifierContactsSystem _speedModifier = default!;
@@ -45,10 +46,18 @@ public sealed class SlipperySystem : EntitySystem
     private const string EmoteFallOnNeckProto = "FallOnNeck";
     // Sunrise-End
 
+    private EntityQuery<KnockedDownComponent> _knockedDownQuery;
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private EntityQuery<SlidingComponent> _slidingQuery;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        _knockedDownQuery = GetEntityQuery<KnockedDownComponent>();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        _slidingQuery = GetEntityQuery<SlidingComponent>();
+
         SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
         SubscribeLocalEvent<SlipperyComponent, StepTriggeredOffEvent>(HandleStepTrigger);
         SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
@@ -111,12 +120,13 @@ public sealed class SlipperySystem : EntitySystem
     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)
     {
-        if (HasComp<KnockedDownComponent>(other) && !component.SlipData.SuperSlippery)
+        var knockedDown = _knockedDownQuery.HasComp(other);
+        if (knockedDown && !component.SlipData.SuperSlippery)
             return;
 
         var attemptEv = new SlipAttemptEvent(uid);
@@ -135,43 +145,49 @@ public sealed class SlipperySystem : EntitySystem
         var ev = new SlipEvent(other);
         RaiseLocalEvent(uid, ref ev);
 
-        if (TryComp(other, out PhysicsComponent? physics) && !HasComp<SlidingComponent>(other))
+        if (_physicsQuery.TryComp(other, out var physics) && !_slidingQuery.HasComp(other))
         {
             _physics.SetLinearVelocity(other, physics.LinearVelocity * component.SlipData.LaunchForwardsMultiplier, body: physics);
 
-            if (component.SlipData.SuperSlippery && requiresContact)
+            if (component.AffectsSliding && requiresContact)
+                EnsureComp<SlidingComponent>(other);
+        }
+
+        // Preventing from playing the slip sound and stunning when you are already knocked down.
+        if (!knockedDown)
+        {
+            // Status effects should handle a TimeSpan of 0 properly...
+            _stun.TryUpdateStunDuration(other, component.SlipData.StunTime);
+
+            // Don't make a new status effect entity if the entity wouldn't do anything
+            if (!MathHelper.CloseTo(component.SlipData.SlipFriction, 1f))
             {
-                var sliding = EnsureComp<SlidingComponent>(other);
-                sliding.CollidingEntities.Add(uid);
-                // Why the fuck does this assertion stack overflow every once in a while
-                DebugTools.Assert(_physics.GetContactingEntities(other, physics).Contains(uid));
+                _movementMod.TryUpdateFrictionModDuration(
+                    other,
+                    component.FrictionStatusTime,
+                    component.SlipData.SlipFriction
+                );
             }
-        }
 
-        var playSound = !_statusEffects.HasStatusEffect(other, "KnockedDown");
+            _stamina.TakeStaminaDamage(other, component.StaminaDamage); // Note that this can StamCrit
 
-        _stun.TryParalyze(other, component.SlipData.ParalyzeTime, true);
+            // Sunrise-Start
+            var evSlipped = new SlippedEvent(other);
+            RaiseLocalEvent(other, ref evSlipped);
+            RaiseLocalEvent(other, new MoodEffectEvent("MobSlipped"));
 
-        RaiseLocalEvent(other, new MoodEffectEvent("MobSlipped"));
+            if (_random.Prob(_deadChance) && _net.IsServer)
+            {
+                RaiseLocalEvent(other, new PlayEmoteMessage(EmoteFallOnNeckProto));
+            }
+            // Sunrise-End
 
-        // Sunrise-Start
-        var evSlipped = new SlippedEvent(other);
-        RaiseLocalEvent(other, ref evSlipped);
-
-        if (_random.Prob(_deadChance) && _net.IsServer)
-        {
-            RaiseLocalEvent(other, new PlayEmoteMessage(EmoteFallOnNeckProto));
-        }
-        // Sunrise-End
-
-        // Preventing from playing the slip sound when you are already knocked down.
-        if (playSound)
-        {
             _audio.PlayPredicted(component.SlipSound, other, other);
         }
 
-        _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 0000000000..db132c586d
--- /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 0000000000..1341f6cd03
--- /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 7011f72ef0..576374c586 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 d6aa42177e..0cf51a4ee3 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 4cdea05220..ce01ecb87c 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 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 64ed5e60dc..52a352a816 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 d0b16fcec8..f196d1ca18 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 d3fceb85dd..2154ec89fc 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 dcf73b7ac2..b9f8708c6f 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 20d39b3460..b9d66ba269 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 f8c0d1181b..76e9f08076 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 65848cb5e5..69f3757b22 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 ec7a277e92..a0a51f3234 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 58d541e363..0e758ba0f1 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -31,13 +31,13 @@ public abstract class SharedEmitSoundSystem : EntitySystem
 {
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly INetManager _netMan = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
     [Dependency] private   readonly SharedAmbientSoundSystem _ambient = default!;
     [Dependency] private   readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     public override void Initialize()
     {
@@ -55,47 +55,6 @@ public abstract class SharedEmitSoundSystem : EntitySystem
         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)
@@ -135,7 +94,7 @@ public abstract class SharedEmitSoundSystem : EntitySystem
         var tile = _map.GetTileRef(xform.GridUid.Value, grid, xform.Coordinates);
 
         // Handle maps being grids (we'll still emit the sound).
-        if (xform.GridUid != xform.MapUid && tile.IsSpace(_tileDefMan))
+        if (xform.GridUid != xform.MapUid && _turf.IsSpace(tile))
             return;
 
         // hand throwing not predicted sadly
diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs
index d2ceecf28e..943432522d 100644
--- a/Content.Shared/Species/Systems/ReformSystem.cs
+++ b/Content.Shared/Species/Systems/ReformSystem.cs
@@ -63,7 +63,7 @@ public sealed partial class ReformSystem : EntitySystem
     {
         // 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/Speech/AccentEvent.cs b/Content.Shared/Speech/AccentEvent.cs
new file mode 100644
index 0000000000..9b90709959
--- /dev/null
+++ b/Content.Shared/Speech/AccentEvent.cs
@@ -0,0 +1,21 @@
+namespace Content.Shared.Speech;
+
+public sealed class AccentGetEvent : EntityEventArgs
+{
+    /// <summary>
+    ///     The entity to apply the accent to.
+    /// </summary>
+    public EntityUid Entity { get; }
+
+    /// <summary>
+    ///     The message to apply the accent transformation to.
+    ///     Modify this to apply the accent.
+    /// </summary>
+    public string Message { get; set; }
+
+    public AccentGetEvent(EntityUid entity, string message)
+    {
+        Entity = entity;
+        Message = message;
+    }
+}
diff --git a/Content.Shared/Speech/Components/ActiveListenerComponent.cs b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
new file mode 100644
index 0000000000..fde108a817
--- /dev/null
+++ b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chat;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// This component is used to relay speech events to other systems.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveListenerComponent : Component
+{
+    /// <summary>
+    /// The range in which to listen to speech.
+    /// </summary>
+    [DataField]
+    public float Range = SharedChatSystem.VoiceRange;
+}
diff --git a/Content.Shared/Speech/Components/VocalComponent.cs b/Content.Shared/Speech/Components/VocalComponent.cs
index a520da4354..3a32a54bb3 100644
--- a/Content.Shared/Speech/Components/VocalComponent.cs
+++ b/Content.Shared/Speech/Components/VocalComponent.cs
@@ -19,9 +19,9 @@ public sealed partial class VocalComponent : Component
     ///     Emote sounds prototype id for each sex (not gender).
     ///     Entities without <see cref="HumanoidComponent"/> considered to be <see cref="Sex.Unsexed"/>.
     /// </summary>
-    [DataField("sounds", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<Sex, EmoteSoundsPrototype>))]
+    [DataField]
     [AutoNetworkedField]
-    public Dictionary<Sex, string>? Sounds;
+    public Dictionary<Sex, ProtoId<EmoteSoundsPrototype>>? Sounds;
 
     [DataField("screamId", customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
     [AutoNetworkedField]
@@ -49,5 +49,5 @@ public sealed partial class VocalComponent : Component
     /// </summary>
     [ViewVariables]
     [AutoNetworkedField]
-    public EmoteSoundsPrototype? EmoteSounds = null;
+    public ProtoId<EmoteSoundsPrototype>? EmoteSounds = null;
 }
diff --git a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
index 1a5a4daeec..05358a04bb 100644
--- a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
@@ -1,11 +1,11 @@
 using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Speech.EntitySystems;
 
 public abstract class SharedStutteringSystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public const string StutterKey = "Stutter";
+    public static readonly ProtoId<StatusEffectPrototype> StutterKey = "Stutter";
 
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
 
diff --git a/Content.Server/Speech/ListenEvent.cs b/Content.Shared/Speech/ListenEvent.cs
similarity index 93%
rename from Content.Server/Speech/ListenEvent.cs
rename to Content.Shared/Speech/ListenEvent.cs
index b67aa92f65..8854bd99f4 100644
--- a/Content.Server/Speech/ListenEvent.cs
+++ b/Content.Shared/Speech/ListenEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Speech;
+namespace Content.Shared.Speech;
 
 public sealed class ListenEvent : EntityEventArgs
 {
diff --git a/Content.Shared/Speech/SpeechComponent.cs b/Content.Shared/Speech/SpeechComponent.cs
index 8c12fc918a..fddb41753e 100644
--- a/Content.Shared/Speech/SpeechComponent.cs
+++ b/Content.Shared/Speech/SpeechComponent.cs
@@ -16,29 +16,26 @@ namespace Content.Shared.Speech
         [Access(typeof(SpeechSystem), Friend = AccessPermissions.ReadWrite, Other = AccessPermissions.Read)]
         public bool Enabled = true;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
+        [DataField, AutoNetworkedField]
         public ProtoId<SpeechSoundsPrototype>? SpeechSounds;
 
         /// <summary>
         ///     What speech verb prototype should be used by default for displaying this entity's messages?
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
+        [DataField, AutoNetworkedField]
         public ProtoId<SpeechVerbPrototype> SpeechVerb = "Default";
 
         /// <summary>
         ///     What emotes allowed to use event if emote <see cref="EmotePrototype.Available"/> is false
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
+        [DataField, AutoNetworkedField]
         public List<ProtoId<EmotePrototype>> AllowedEmotes = new();
 
         /// <summary>
         ///     A mapping from chat suffixes loc strings to speech verb prototypes that should be conditionally used.
         ///     For things like '?' changing to 'asks' or '!!' making text bold and changing to 'yells'. Can be overridden if necessary.
         /// </summary>
-        [DataField]
+        [DataField, AutoNetworkedField]
         public Dictionary<string, ProtoId<SpeechVerbPrototype>> SuffixSpeechVerbs = new()
         {
             { "chat-speech-verb-suffix-exclamation-strong", "DefaultExclamationStrong" },
@@ -51,7 +48,6 @@ namespace Content.Shared.Speech
         [DataField]
         public AudioParams AudioParams = AudioParams.Default.WithVolume(-2f).WithRolloffFactor(4.5f);
 
-        [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public float SoundCooldownTime { get; set; } = 0.5f;
 
diff --git a/Content.Shared/Spider/SharedSpiderSystem.cs b/Content.Shared/Spider/SharedSpiderSystem.cs
index 33473303aa..47b0dff763 100644
--- a/Content.Shared/Spider/SharedSpiderSystem.cs
+++ b/Content.Shared/Spider/SharedSpiderSystem.cs
@@ -1,31 +1,20 @@
 using Content.Shared.Actions;
-using Robust.Shared.Network;
-using Robust.Shared.Random;
 
 namespace Content.Shared.Spider;
 
 public abstract class SharedSpiderSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _action = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<SpiderComponent, MapInitEvent>(OnInit);
-        SubscribeLocalEvent<SpiderWebObjectComponent, ComponentStartup>(OnWebStartup);
     }
 
     private void OnInit(EntityUid uid, SpiderComponent component, MapInitEvent args)
     {
         _action.AddAction(uid, ref component.Action, component.WebAction, uid);
     }
-
-    private void OnWebStartup(EntityUid uid, SpiderWebObjectComponent component, ComponentStartup args)
-    {
-        // TODO dont use this. use some general random appearance system
-        _appearance.SetData(uid, SpiderWebVisuals.Variant, _robustRandom.Next(1, 3));
-    }
 }
diff --git a/Content.Shared/Spider/SpiderComponent.cs b/Content.Shared/Spider/SpiderComponent.cs
index 42213adcb1..3a1612fed0 100644
--- a/Content.Shared/Spider/SpiderComponent.cs
+++ b/Content.Shared/Spider/SpiderComponent.cs
@@ -18,6 +18,24 @@ public sealed partial class SpiderComponent : Component
     public string WebAction = "ActionSpiderWeb";
 
     [DataField] public EntityUid? Action;
+
+    /// <summary>
+    /// Whether the spider will spawn webs when not controlled by a player.
+    /// </summary>
+    [DataField]
+    public bool SpawnsWebsAsNonPlayer = true;
+
+    /// <summary>
+    /// The cooldown in seconds between web spawns when not controlled by a player.
+    /// </summary>
+    [DataField]
+    public TimeSpan WebSpawnCooldown = TimeSpan.FromSeconds(45f);
+
+    /// <summary>
+    /// The next time the spider can spawn a web when not controlled by a player.
+    /// </summary>
+    [DataField]
+    public TimeSpan? NextWebSpawn;
 }
 
 public sealed partial class SpiderWebActionEvent : InstantActionEvent { }
diff --git a/Content.Shared/Spider/SpiderWebVisualsComponent.cs b/Content.Shared/Spider/SpiderWebVisualsComponent.cs
deleted file mode 100644
index 2d6fb58815..0000000000
--- a/Content.Shared/Spider/SpiderWebVisualsComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Spider;
-
-[Serializable, NetSerializable]
-public enum SpiderWebVisuals
-{
-    Variant
-}
diff --git a/Content.Shared/SprayPainter/Components/PaintableAirlockComponent.cs b/Content.Shared/SprayPainter/Components/PaintableAirlockComponent.cs
deleted file mode 100644
index fdd0aeeb7f..0000000000
--- a/Content.Shared/SprayPainter/Components/PaintableAirlockComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Roles;
-using Content.Shared.SprayPainter.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.SprayPainter.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class PaintableAirlockComponent : Component
-{
-    /// <summary>
-    /// Group of styles this airlock can be painted with, e.g. glass, standard or external.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
-    public ProtoId<AirlockGroupPrototype> Group = string.Empty;
-
-    /// <summary>
-    /// Department this airlock is painted as, or none.
-    /// Must be specified in prototypes for turf war to work.
-    /// To better catch any mistakes, you need to explicitly state a non-styled airlock has a null department.
-    /// </summary>
-    [DataField(required: true), AutoNetworkedField]
-    public ProtoId<DepartmentPrototype>? Department;
-}
diff --git a/Content.Shared/SprayPainter/Components/PaintableComponent.cs b/Content.Shared/SprayPainter/Components/PaintableComponent.cs
new file mode 100644
index 0000000000..cfcb6a6c63
--- /dev/null
+++ b/Content.Shared/SprayPainter/Components/PaintableComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.SprayPainter.Components;
+
+/// <summary>
+/// Marks objects that can be painted with the spray painter.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PaintableComponent : Component
+{
+    /// <summary>
+    /// Group of styles this airlock can be painted with, e.g. glass, standard or external.
+    /// Set to null to make an entity unpaintable.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PaintableGroupPrototype>? Group;
+}
diff --git a/Content.Shared/SprayPainter/Components/PaintedComponent.cs b/Content.Shared/SprayPainter/Components/PaintedComponent.cs
new file mode 100644
index 0000000000..83f0e6e692
--- /dev/null
+++ b/Content.Shared/SprayPainter/Components/PaintedComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.SprayPainter.Components;
+
+/// <summary>
+/// Used to mark an entity that has been repainted.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class PaintedComponent : Component
+{
+    /// <summary>
+    /// The time after which the entity is dried and does not appear as "freshly painted".
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan DryTime;
+}
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
new file mode 100644
index 0000000000..d869c96d31
--- /dev/null
+++ b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.SprayPainter.Components;
+
+/// <summary>
+/// Items with this component can be used to recharge a spray painter.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SprayPainterAmmoSystem))]
+public sealed partial class SprayPainterAmmoComponent : Component
+{
+    /// <summary>
+    /// The value by which the charge in the spray painter will be recharged.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Charges = 15;
+}
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
index 0591cb2dcb..b9a7057347 100644
--- a/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
+++ b/Content.Shared/SprayPainter/Components/SprayPainterComponent.cs
@@ -1,26 +1,43 @@
-using Content.Shared.DoAfter;
+using Content.Shared.Decals;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.SprayPainter.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+/// <summary>
+/// Denotes an object that can be used to alter the appearance of paintable objects (e.g. doors, gas canisters).
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class SprayPainterComponent : Component
 {
+    public const string DefaultPickedColor = "red";
+    public static readonly ProtoId<DecalPrototype> DefaultDecal = "Arrows";
+
+    /// <summary>
+    /// The sound to be played after painting the entities.
+    /// </summary>
     [DataField]
     public SoundSpecifier SpraySound = new SoundPathSpecifier("/Audio/Effects/spray2.ogg");
 
-    [DataField]
-    public TimeSpan AirlockSprayTime = TimeSpan.FromSeconds(3);
-
+    /// <summary>
+    /// The amount of time it takes to paint a pipe.
+    /// </summary>
     [DataField]
     public TimeSpan PipeSprayTime = TimeSpan.FromSeconds(1);
 
+    /// <summary>
+    /// The cost of spray painting a pipe, in charges.
+    /// </summary>
+    [DataField]
+    public int PipeChargeCost = 1;
+
     /// <summary>
     /// Pipe color chosen to spray with.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public string? PickedColor;
+    public string PickedColor = DefaultPickedColor;
 
     /// <summary>
     /// Pipe colors that can be selected.
@@ -29,9 +46,83 @@ public sealed partial class SprayPainterComponent : Component
     public Dictionary<string, Color> ColorPalette = new();
 
     /// <summary>
-    /// Airlock style index selected.
-    /// After prototype reload this might not be the same style but it will never be out of bounds.
+    /// Spray paintable object styles selected per object.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public int Index;
+    public Dictionary<string, string> StylesByGroup = new();
+
+    /// <summary>
+    /// The currently open tab of the painter
+    /// (Are you selecting canister color?)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int SelectedTab;
+
+    /// <summary>
+    /// Whether or not the painter should be painting or removing decals when clicked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DecalPaintMode DecalMode = DecalPaintMode.Off;
+
+    /// <summary>
+    /// The currently selected decal prototype.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<DecalPrototype> SelectedDecal = DefaultDecal;
+
+    /// <summary>
+    /// The color in which to paint the decal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color? SelectedDecalColor;
+
+    /// <summary>
+    /// The angle at which to paint the decal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int SelectedDecalAngle;
+
+    /// <summary>
+    /// The angle at which to paint the decal.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool SnapDecals = true;
+
+    /// <summary>
+    /// The cost of spray painting a decal, in charges.
+    /// </summary>
+    [DataField]
+    public int DecalChargeCost = 1;
+
+    /// <summary>
+    /// How long does the painter leave items as freshly painted?
+    /// </summary>
+    [DataField]
+    public TimeSpan FreshPaintDuration = TimeSpan.FromMinutes(15);
+
+    /// <summary>
+    /// The sound to play when swapping between decal modes.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundSwitchDecalMode = new SoundPathSpecifier("/Audio/Machines/quickbeep.ogg", AudioParams.Default.WithVolume(1.5f));
+}
+
+/// <summary>
+/// A set of operating modes for decal painting.
+/// </summary>
+[Serializable, NetSerializable]
+public enum DecalPaintMode : byte
+{
+    /// <summary>
+    /// Clicking on the floor does nothing.
+    /// </summary>
+    Off = 0,
+    /// <summary>
+    /// Clicking on the floor adds a decal at the requested spot (or snapped to the grid)
+    /// </summary>
+    Add = 1,
+    /// <summary>
+    /// Clicking on the floor removes all decals at the requested spot (or snapped to the grid)
+    /// </summary>
+    Remove = 2,
 }
diff --git a/Content.Shared/SprayPainter/Prototypes/AirlockDepartmentsPrototype.cs b/Content.Shared/SprayPainter/Prototypes/AirlockDepartmentsPrototype.cs
deleted file mode 100644
index 8f98a1a3c7..0000000000
--- a/Content.Shared/SprayPainter/Prototypes/AirlockDepartmentsPrototype.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Roles;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.SprayPainter.Prototypes;
-
-/// <summary>
-/// Maps airlock style names to department ids.
-/// </summary>
-[Prototype]
-public sealed partial class AirlockDepartmentsPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    /// Dictionary of style names to department ids.
-    /// If a style does not have a department (e.g. external) it is set to null.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<string, ProtoId<DepartmentPrototype>> Departments = new();
-}
diff --git a/Content.Shared/SprayPainter/Prototypes/AirlockGroupPrototype.cs b/Content.Shared/SprayPainter/Prototypes/AirlockGroupPrototype.cs
deleted file mode 100644
index 24c28b8b7a..0000000000
--- a/Content.Shared/SprayPainter/Prototypes/AirlockGroupPrototype.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.SprayPainter.Prototypes;
-
-[Prototype("AirlockGroup")]
-public sealed partial class AirlockGroupPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField("stylePaths")]
-    public Dictionary<string, string> StylePaths = default!;
-
-    // The priority determines, which sprite is used when showing
-    // the icon for a style in the SprayPainter UI. The highest priority
-    // gets shown.
-    [DataField("iconPriority")]
-    public int IconPriority = 0;
-}
diff --git a/Content.Shared/SprayPainter/Prototypes/PaintableGroupCategoryPrototype.cs b/Content.Shared/SprayPainter/Prototypes/PaintableGroupCategoryPrototype.cs
new file mode 100644
index 0000000000..ba6423d94a
--- /dev/null
+++ b/Content.Shared/SprayPainter/Prototypes/PaintableGroupCategoryPrototype.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.SprayPainter.Prototypes;
+
+/// <summary>
+/// A category of spray paintable items (e.g. airlocks, crates)
+/// </summary>
+[Prototype]
+public sealed partial class PaintableGroupCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Each group that makes up this category.
+    /// </summary>
+    [DataField(required: true)]
+    public List<ProtoId<PaintableGroupPrototype>> Groups = new();
+}
diff --git a/Content.Shared/SprayPainter/Prototypes/PaintableGroupPrototype.cs b/Content.Shared/SprayPainter/Prototypes/PaintableGroupPrototype.cs
new file mode 100644
index 0000000000..73944c4e6e
--- /dev/null
+++ b/Content.Shared/SprayPainter/Prototypes/PaintableGroupPrototype.cs
@@ -0,0 +1,53 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SprayPainter.Prototypes;
+
+/// <summary>
+/// Contains a map of the objects from which the spray painter will take texture to paint another from the same group.
+/// </summary>
+[Prototype]
+public sealed partial class PaintableGroupPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The time required to paint an object from a given group, in seconds.
+    /// </summary>
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <summary>
+    /// To number of charges needed to paint an object of this group.
+    /// </summary>
+    [DataField]
+    public int Cost = 1;
+
+    /// <summary>
+    /// The default style to start painting.
+    /// </summary>
+    [DataField(required: true)]
+    public string DefaultStyle = default!;
+
+    /// <summary>
+    /// Map from localization keys and entity identifiers displayed in the spray painter menu.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<string, EntProtoId> Styles = new();
+
+    /// <summary>
+    /// If multiple groups have the same key, the group with the highest IconPriority has its icon displayed.
+    /// </summary>
+    [DataField]
+    public int IconPriority;
+}
+
+[Serializable, NetSerializable]
+public enum PaintableVisuals
+{
+    /// <summary>
+    /// The prototype to base the object's visuals off.
+    /// </summary>
+    Prototype
+}
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index b5ce881124..597f3c3531 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -1,102 +1,78 @@
 using Content.Shared.Administration.Logs;
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
-using Content.Shared.Doors.Components;
+using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.SprayPainter.Components;
 using Content.Shared.SprayPainter.Prototypes;
+using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 using System.Linq;
 using PaintedComponent = Content.Shared._Sunrise.Paint.PaintedComponent;  // Sunrise-edit
 
 namespace Content.Shared.SprayPainter;
 
 /// <summary>
-/// System for painting airlocks using a spray painter.
+/// System for painting paintable objects using a spray painter.
 /// Pipes are handled serverside since AtmosPipeColorSystem is server only.
 /// </summary>
 public abstract class SharedSprayPainterSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] protected readonly IPrototypeManager Proto = default!;
-    [Dependency] private   readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
+    [Dependency] protected readonly SharedChargesSystem Charges = default!;
     [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
-    [Dependency] private   readonly SharedPopupSystem _popup = default!;
-
-    public List<AirlockStyle> Styles { get; private set; } = new();
-    public List<AirlockGroupPrototype> Groups { get; private set; } = new();
-
-    [ValidatePrototypeId<AirlockDepartmentsPrototype>]
-    private const string Departments = "Departments";
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        CacheStyles();
-
         SubscribeLocalEvent<SprayPainterComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<SprayPainterComponent, SprayPainterDoorDoAfterEvent>(OnDoorDoAfter);
-        Subs.BuiEvents<SprayPainterComponent>(SprayPainterUiKey.Key, subs =>
-        {
-            subs.Event<SprayPainterSpritePickedMessage>(OnSpritePicked);
-            subs.Event<SprayPainterColorPickedMessage>(OnColorPicked);
-        });
 
-        SubscribeLocalEvent<PaintableAirlockComponent, InteractUsingEvent>(OnAirlockInteract);
+        SubscribeLocalEvent<SprayPainterComponent, SprayPainterDoAfterEvent>(OnPainterDoAfter);
+        SubscribeLocalEvent<SprayPainterComponent, GetVerbsEvent<AlternativeVerb>>(OnPainterGetAltVerbs);
+        SubscribeLocalEvent<PaintableComponent, InteractUsingEvent>(OnPaintableInteract);
+        SubscribeLocalEvent<PaintedComponent, ExaminedEvent>(OnPainedExamined);
 
-        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+        Subs.BuiEvents<SprayPainterComponent>(SprayPainterUiKey.Key,
+            subs =>
+            {
+                subs.Event<SprayPainterSetPaintableStyleMessage>(OnSetPaintable);
+                subs.Event<SprayPainterSetPipeColorMessage>(OnSetPipeColor);
+                subs.Event<SprayPainterTabChangedMessage>(OnTabChanged);
+                subs.Event<SprayPainterSetDecalMessage>(OnSetDecal);
+                subs.Event<SprayPainterSetDecalColorMessage>(OnSetDecalColor);
+                subs.Event<SprayPainterSetDecalAngleMessage>(OnSetDecalAngle);
+                subs.Event<SprayPainterSetDecalSnapMessage>(OnSetDecalSnap);
+            });
     }
 
     private void OnMapInit(Entity<SprayPainterComponent> ent, ref MapInitEvent args)
     {
-        if (ent.Comp.ColorPalette.Count == 0)
-            return;
+        bool stylesByGroupPopulated = false;
+        foreach (var groupProto in Proto.EnumeratePrototypes<PaintableGroupPrototype>())
+        {
+            ent.Comp.StylesByGroup[groupProto.ID] = groupProto.DefaultStyle;
+            stylesByGroupPopulated = true;
+        }
+        if (stylesByGroupPopulated)
+            Dirty(ent);
 
-        SetColor(ent, ent.Comp.ColorPalette.First().Key);
+        if (ent.Comp.ColorPalette.Count > 0)
+            SetPipeColor(ent, ent.Comp.ColorPalette.First().Key);
     }
 
-    private void OnDoorDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterDoorDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        if (args.Args.Target is not {} target)
-            return;
-
-        if (!TryComp<PaintableAirlockComponent>(target, out var airlock))
-            return;
-
-        airlock.Department = args.Department;
-        Dirty(target, airlock);
-
-        Audio.PlayPredicted(ent.Comp.SpraySound, ent, args.Args.User);
-        Appearance.SetData(target, DoorVisuals.BaseRSI, args.Sprite);
-        _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Args.User):user} painted {ToPrettyString(args.Args.Target.Value):target}");
-
-        args.Handled = true;
-    }
-
-    #region UI messages
-
-    private void OnColorPicked(Entity<SprayPainterComponent> ent, ref SprayPainterColorPickedMessage args)
-    {
-        SetColor(ent, args.Key);
-    }
-
-    private void OnSpritePicked(Entity<SprayPainterComponent> ent, ref SprayPainterSpritePickedMessage args)
-    {
-        if (args.Index >= Styles.Count)
-            return;
-
-        ent.Comp.Index = args.Index;
-        Dirty(ent, ent.Comp);
-    }
-
-    private void SetColor(Entity<SprayPainterComponent> ent, string? paletteKey)
+    private void SetPipeColor(Entity<SprayPainterComponent> ent, string? paletteKey)
     {
         if (paletteKey == null || paletteKey == ent.Comp.PickedColor)
             return;
@@ -105,12 +81,98 @@ public abstract class SharedSprayPainterSystem : EntitySystem
             return;
 
         ent.Comp.PickedColor = paletteKey;
-        Dirty(ent, ent.Comp);
+        Dirty(ent);
+        UpdateUi(ent);
     }
 
-    #endregion
+    #region Interaction
 
-    private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref InteractUsingEvent args)
+    private void OnPainterDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled)
+            return;
+
+        if (args.Args.Target is not { } target)
+            return;
+
+        if (!HasComp<PaintableComponent>(target))
+            return;
+
+        Appearance.SetData(target, PaintableVisuals.Prototype, args.Prototype);
+        Audio.PlayPredicted(ent.Comp.SpraySound, ent, args.Args.User);
+        Charges.TryUseCharges(new Entity<LimitedChargesComponent?>(ent, EnsureComp<LimitedChargesComponent>(ent)), args.Cost);
+
+        var paintedComponent = EnsureComp<PaintedComponent>(target);
+        paintedComponent.DryTime = _timing.CurTime + ent.Comp.FreshPaintDuration;
+        Dirty(target, paintedComponent);
+
+        var ev = new EntityPaintedEvent(
+            User: args.User,
+            Tool: ent,
+            Prototype: args.Prototype,
+            Group: args.Group);
+        RaiseLocalEvent(target, ref ev);
+
+        AdminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(args.Args.User):user} painted {ToPrettyString(args.Args.Target.Value):target}");
+
+        args.Handled = true;
+    }
+
+    private void OnPainterGetAltVerbs(Entity<SprayPainterComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || !args.Using.HasValue)
+            return;
+
+        var user = args.User;
+
+        AlternativeVerb verb = new()
+        {
+            Text = Loc.GetString("spray-painter-verb-toggle-decals"),
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")),
+            Act = () => TogglePaintDecals(ent, user),
+            Impact = LogImpact.Low
+        };
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    /// Toggles whether clicking on the floor paints a decal or not.
+    /// </summary>
+    private void TogglePaintDecals(Entity<SprayPainterComponent> ent, EntityUid user)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        var pitch = 1.0f;
+        switch (ent.Comp.DecalMode)
+        {
+            case DecalPaintMode.Off:
+            default:
+                ent.Comp.DecalMode = DecalPaintMode.Add;
+                pitch = 1.0f;
+                break;
+            case DecalPaintMode.Add:
+                ent.Comp.DecalMode = DecalPaintMode.Remove;
+                pitch = 1.2f;
+                break;
+            case DecalPaintMode.Remove:
+                ent.Comp.DecalMode = DecalPaintMode.Off;
+                pitch = 0.8f;
+                break;
+        }
+        Dirty(ent);
+
+        // Make the machine beep.
+        Audio.PlayPredicted(ent.Comp.SoundSwitchDecalMode, ent, user, ent.Comp.SoundSwitchDecalMode.Params.WithPitchScale(pitch));
+    }
+
+    /// <summary>
+    /// Handles spray paint interactions with an object.
+    /// An object must belong to a spray paintable group to be painted, and the painter must have sufficient ammo to paint it.
+    /// </summary>
+    private void OnPaintableInteract(Entity<PaintableComponent> ent, ref InteractUsingEvent args)
     {
         if (args.Handled)
             return;
@@ -118,81 +180,141 @@ public abstract class SharedSprayPainterSystem : EntitySystem
         if (!TryComp<SprayPainterComponent>(args.Used, out var painter))
             return;
 
-        var group = Proto.Index<AirlockGroupPrototype>(ent.Comp.Group);
+        if (ent.Comp.Group is not { } group
+            || !painter.StylesByGroup.TryGetValue(group, out var selectedStyle)
+            || !Proto.TryIndex(group, out PaintableGroupPrototype? targetGroup))
+            return;
 
-        var style = Styles[painter.Index];
-        if (!group.StylePaths.TryGetValue(style.Name, out var sprite))
+        // Valid paint target.
+        args.Handled = true;
+
+        if (TryComp<LimitedChargesComponent>(args.Used, out var charges)
+            && charges.LastCharges < targetGroup.Cost)
         {
-            string msg = Loc.GetString("spray-painter-style-not-available");
+            var msg = Loc.GetString("spray-painter-interact-no-charges");
             _popup.PopupClient(msg, args.User, args.User);
             return;
         }
 
+        if (!targetGroup.Styles.TryGetValue(selectedStyle, out var proto))
+        {
+            var msg = Loc.GetString("spray-painter-style-not-available");
+            _popup.PopupClient(msg, args.User, args.User);
+            return;
+        }
         RemComp<PaintedComponent>(ent);  // Sunrise-edit
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.AirlockSprayTime, new SprayPainterDoorDoAfterEvent(sprite, style.Department), args.Used, target: ent, used: args.Used)
+        var doAfterEventArgs = new DoAfterArgs(EntityManager,
+            args.User,
+            targetGroup.Time,
+            new SprayPainterDoAfterEvent(proto, group, targetGroup.Cost),
+            args.Used,
+            target: ent,
+            used: args.Used)
         {
             BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true,
         };
-        if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out var id))
-            return;
 
-        args.Handled = true;
+        if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out _))
+            return;
 
         // Log the attempt
-        _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.User):user} is painting {ToPrettyString(ent):target} to '{style.Name}' at {Transform(ent).Coordinates:targetlocation}");
+        AdminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(args.User):user} is painting {ToPrettyString(ent):target} to '{selectedStyle}' at {Transform(ent).Coordinates:targetlocation}");
     }
 
-    #region Style caching
-
-    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    /// <summary>
+    /// Prints out if an object has been painted recently.
+    /// </summary>
+    private void OnPainedExamined(Entity<PaintedComponent> ent, ref ExaminedEvent args)
     {
-        if (!args.WasModified<AirlockGroupPrototype>() && !args.WasModified<AirlockDepartmentsPrototype>())
+        // If the paint's dried, it isn't detectable.
+        if (_timing.CurTime > ent.Comp.DryTime)
             return;
 
-        Styles.Clear();
-        Groups.Clear();
-        CacheStyles();
-
-        // style index might be invalid now so check them all
-        var max = Styles.Count - 1;
-        var query = AllEntityQuery<SprayPainterComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.Index > max)
-            {
-                comp.Index = max;
-                Dirty(uid, comp);
-            }
-        }
+        args.PushText(Loc.GetString("spray-painter-on-examined-painted-message"));
     }
 
-    protected virtual void CacheStyles()
-    {
-        // collect every style's name
-        var names = new SortedSet<string>();
-        foreach (var group in Proto.EnumeratePrototypes<AirlockGroupPrototype>())
-        {
-            Groups.Add(group);
-            foreach (var style in group.StylePaths.Keys)
-            {
-                names.Add(style);
-            }
-        }
+    #endregion Interaction
 
-        // get their department ids too for the final style list
-        var departments = Proto.Index<AirlockDepartmentsPrototype>(Departments);
-        Styles.Capacity = names.Count;
-        foreach (var name in names)
-        {
-            departments.Departments.TryGetValue(name, out var department);
-            Styles.Add(new AirlockStyle(name, department));
-        }
+    #region UI
+
+    /// <summary>
+    /// Sets the style that a particular type of paintable object (e.g. lockers) should be painted in.
+    /// </summary>
+    private void OnSetPaintable(Entity<SprayPainterComponent> ent, ref SprayPainterSetPaintableStyleMessage args)
+    {
+        if (!ent.Comp.StylesByGroup.ContainsKey(args.Group))
+            return;
+
+        ent.Comp.StylesByGroup[args.Group] = args.Style;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Changes the color to paint pipes in.
+    /// </summary>
+    private void OnSetPipeColor(Entity<SprayPainterComponent> ent, ref SprayPainterSetPipeColorMessage args)
+    {
+        SetPipeColor(ent, args.Key);
+    }
+
+    /// <summary>
+    /// Tracks the tab the spray painter was on.
+    /// </summary>
+    private void OnTabChanged(Entity<SprayPainterComponent> ent, ref SprayPainterTabChangedMessage args)
+    {
+        ent.Comp.SelectedTab = args.Index;
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Sets the decal prototype to paint.
+    /// </summary>
+    private void OnSetDecal(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalMessage args)
+    {
+        ent.Comp.SelectedDecal = args.DecalPrototype;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Sets the angle to paint decals at.
+    /// </summary>
+    private void OnSetDecalAngle(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalAngleMessage args)
+    {
+        ent.Comp.SelectedDecalAngle = args.Angle;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Enables or disables snap-to-grid when painting decals.
+    /// </summary>
+    private void OnSetDecalSnap(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalSnapMessage args)
+    {
+        ent.Comp.SnapDecals = args.Snap;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    /// <summary>
+    /// Sets the decal to paint on the ground.
+    /// </summary>
+    private void OnSetDecalColor(Entity<SprayPainterComponent> ent, ref SprayPainterSetDecalColorMessage args)
+    {
+        ent.Comp.SelectedDecalColor = args.Color;
+        Dirty(ent);
+        UpdateUi(ent);
+    }
+
+    protected virtual void UpdateUi(Entity<SprayPainterComponent> ent)
+    {
     }
 
     #endregion
 }
-
-public record struct AirlockStyle(string Name, string? Department);
diff --git a/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs b/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs
new file mode 100644
index 0000000000..d43420efc5
--- /dev/null
+++ b/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.SprayPainter.Components;
+
+namespace Content.Shared.SprayPainter;
+
+/// <summary>
+/// The system handles interactions with spray painter ammo.
+/// </summary>
+public sealed class SprayPainterAmmoSystem : EntitySystem
+{
+    [Dependency] private readonly SharedChargesSystem _charges = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SprayPainterAmmoComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<SprayPainterAmmoComponent, AfterInteractEvent>(OnAfterInteract);
+    }
+
+    private void OnAfterInteract(Entity<SprayPainterAmmoComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        if (args.Target is not { Valid: true } target ||
+            !HasComp<SprayPainterComponent>(target) ||
+            !TryComp<LimitedChargesComponent>(target, out var charges))
+            return;
+
+        var user = args.User;
+        args.Handled = true;
+        var count = Math.Min(charges.MaxCharges - charges.LastCharges, ent.Comp.Charges);
+        if (count <= 0)
+        {
+            _popup.PopupClient(Loc.GetString("spray-painter-ammo-after-interact-full"), target, user);
+            return;
+        }
+
+        _popup.PopupClient(Loc.GetString("spray-painter-ammo-after-interact-refilled"), target, user);
+        _charges.AddCharges(target, count);
+        ent.Comp.Charges -= count;
+        Dirty(ent, ent.Comp);
+
+        if (ent.Comp.Charges <= 0)
+            PredictedQueueDel(ent.Owner);
+    }
+
+    private void OnExamine(Entity<SprayPainterAmmoComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        var examineMessage = Loc.GetString("rcd-ammo-component-on-examine", ("charges", ent.Comp.Charges));
+        args.PushText(examineMessage);
+    }
+}
diff --git a/Content.Shared/SprayPainter/SprayPainterEvents.cs b/Content.Shared/SprayPainter/SprayPainterEvents.cs
index b88b054ad1..db9de9c278 100644
--- a/Content.Shared/SprayPainter/SprayPainterEvents.cs
+++ b/Content.Shared/SprayPainter/SprayPainterEvents.cs
@@ -1,4 +1,7 @@
+using Content.Shared.Decals;
 using Content.Shared.DoAfter;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SprayPainter;
@@ -10,46 +13,75 @@ public enum SprayPainterUiKey
 }
 
 [Serializable, NetSerializable]
-public sealed class SprayPainterSpritePickedMessage : BoundUserInterfaceMessage
+public sealed class SprayPainterSetDecalMessage(ProtoId<DecalPrototype> protoId) : BoundUserInterfaceMessage
 {
-    public readonly int Index;
-
-    public SprayPainterSpritePickedMessage(int index)
-    {
-        Index = index;
-    }
+    public ProtoId<DecalPrototype> DecalPrototype = protoId;
 }
 
 [Serializable, NetSerializable]
-public sealed class SprayPainterColorPickedMessage : BoundUserInterfaceMessage
+public sealed class SprayPainterSetDecalColorMessage(Color? color) : BoundUserInterfaceMessage
 {
-    public readonly string? Key;
-
-    public SprayPainterColorPickedMessage(string? key)
-    {
-        Key = key;
-    }
+    public Color? Color = color;
 }
 
 [Serializable, NetSerializable]
-public sealed partial class SprayPainterDoorDoAfterEvent : DoAfterEvent
+public sealed class SprayPainterSetDecalSnapMessage(bool snap) : BoundUserInterfaceMessage
+{
+    public bool Snap = snap;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterSetDecalAngleMessage(int angle) : BoundUserInterfaceMessage
+{
+    public int Angle = angle;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterTabChangedMessage(int index, bool isSelectedTabWithDecals) : BoundUserInterfaceMessage
+{
+    public readonly int Index = index;
+    public readonly bool IsSelectedTabWithDecals = isSelectedTabWithDecals;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterSetPaintableStyleMessage(string group, string style) : BoundUserInterfaceMessage
+{
+    public readonly string Group = group;
+    public readonly string Style = style;
+}
+
+[Serializable, NetSerializable]
+public sealed class SprayPainterSetPipeColorMessage(string? key) : BoundUserInterfaceMessage
+{
+    public readonly string? Key = key;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class SprayPainterDoAfterEvent : DoAfterEvent
 {
     /// <summary>
-    /// Base RSI path to set for the door sprite.
+    /// The prototype to use to repaint this object.
     /// </summary>
     [DataField]
-    public string Sprite;
+    public string Prototype;
 
     /// <summary>
-    /// Department id to set for the door, if the style has one.
+    /// The group ID of the object being painted.
     /// </summary>
     [DataField]
-    public string? Department;
+    public string Group;
 
-    public SprayPainterDoorDoAfterEvent(string sprite, string? department)
+    /// <summary>
+    /// The cost, in charges, to paint this object.
+    /// </summary>
+    [DataField]
+    public int Cost;
+
+    public SprayPainterDoAfterEvent(string prototype, string group, int cost)
     {
-        Sprite = sprite;
-        Department = department;
+        Prototype = prototype;
+        Group = group;
+        Cost = cost;
     }
 
     public override DoAfterEvent Clone() => this;
@@ -71,3 +103,17 @@ public sealed partial class SprayPainterPipeDoAfterEvent : DoAfterEvent
 
     public override DoAfterEvent Clone() => this;
 }
+
+/// <summary>
+/// An action raised on an entity when it is spray painted.
+/// </summary>
+/// <param name="User">The entity painting this item.</param>
+/// <param name="Tool">The entity used to paint this item.</param>
+/// <param name="Prototype">The prototype used to generate the new painted appearance.</param>
+/// <param name="Group">The group of the entity being painted (e.g. airlocks with glass, canisters).</param>
+[ByRefEvent]
+public partial record struct EntityPaintedEvent(
+    EntityUid? User,
+    EntityUid Tool,
+    EntProtoId Prototype,
+    ProtoId<PaintableGroupPrototype> Group);
diff --git a/Content.Shared/Sprite/ScaleVisualsComponent.cs b/Content.Shared/Sprite/ScaleVisualsComponent.cs
new file mode 100644
index 0000000000..a9c1fcb39c
--- /dev/null
+++ b/Content.Shared/Sprite/ScaleVisualsComponent.cs
@@ -0,0 +1,27 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Sprite;
+
+/// <summary>
+/// Used to set the <see cref="Robust.Client.GameObjects.SpriteComponent.Scale"/> datafield to a certain value from the server.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedScaleVisualsSystem))]
+public sealed partial class ScaleVisualsComponent : Component
+{
+    /// <summary>
+    /// The current sprite scale.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables]
+    public Vector2 Scale = Vector2.One;
+
+    /// <summary>
+    /// The original sprite scale, which we revert to if this component is removed.
+    /// Only set on the client.
+    /// </summary>
+    [DataField]
+    [ViewVariables]
+    public Vector2? OriginalScale;
+}
diff --git a/Content.Shared/Sprite/SharedScaleVisualsSystem.cs b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
new file mode 100644
index 0000000000..408f5984b1
--- /dev/null
+++ b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
@@ -0,0 +1,78 @@
+using System.Numerics;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Sprite;
+
+public abstract class SharedScaleVisualsSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScaleVisualsComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ScaleVisualsComponent, ComponentShutdown>(OnComponentShutdown);
+    }
+
+    private void OnMapInit(Entity<ScaleVisualsComponent> ent, ref MapInitEvent args)
+    {
+        SetSpriteScale(ent.Owner, ent.Comp.Scale);
+    }
+
+    private void OnComponentShutdown(Entity<ScaleVisualsComponent> ent, ref ComponentShutdown args)
+    {
+        ResetScale(ent);
+    }
+
+    protected virtual void ResetScale(Entity<ScaleVisualsComponent> ent)
+    {
+        _appearance.RemoveData(ent.Owner, ScaleVisuals.Scale);
+        var ev = new ScaleEntityEvent(ent.Owner, Vector2.One);
+        RaiseLocalEvent(ent.Owner, ref ev);
+    }
+
+    /// <summary>
+    /// Used to set the <see cref="Robust.Client.GameObjects.SpriteComponent.Scale"/> datafield to a certain value from the server.
+    /// </summary>
+    public void SetSpriteScale(EntityUid uid, Vector2 scale)
+    {
+        var comp = EnsureComp<ScaleVisualsComponent>(uid);
+        comp.Scale = scale;
+        Dirty(uid, comp);
+
+        var appearanceComponent = EnsureComp<AppearanceComponent>(uid);
+        _appearance.SetData(uid, ScaleVisuals.Scale, scale, appearanceComponent);
+
+        // Raise an event for content use.
+        var ev = new ScaleEntityEvent(uid, scale);
+        RaiseLocalEvent(uid, ref ev);
+    }
+
+    /// <summary>
+    /// Gets the current scale set by <see cref="SetSpriteScale"/>.
+    /// This does not include any direct changes made to the SpriteComponent.
+    /// </summary>
+    public Vector2 GetSpriteScale(EntityUid uid)
+    {
+        if (!TryComp<AppearanceComponent>(uid, out var appearanceComponent))
+            return Vector2.One;
+
+        if (!_appearance.TryGetData<Vector2>(uid, ScaleVisuals.Scale, out var scale, appearanceComponent))
+            scale = Vector2.One;
+
+        return scale;
+    }
+}
+
+/// <summary>
+/// Raised when a sprite scale is changed.
+/// </summary>
+[ByRefEvent]
+public readonly record struct ScaleEntityEvent(EntityUid Uid, Vector2 Scale);
+
+[Serializable, NetSerializable]
+public enum ScaleVisuals : byte
+{
+    Scale,
+}
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index c444b8936d..912089379a 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Nutrition;
 using Content.Shared.Popups;
 using Content.Shared.Storage.EntitySystems;
 using JetBrains.Annotations;
@@ -37,6 +38,8 @@ namespace Content.Shared.Stacks
             SubscribeLocalEvent<StackComponent, ComponentStartup>(OnStackStarted);
             SubscribeLocalEvent<StackComponent, ExaminedEvent>(OnStackExamined);
             SubscribeLocalEvent<StackComponent, InteractUsingEvent>(OnStackInteractUsing);
+            SubscribeLocalEvent<StackComponent, BeforeIngestedEvent>(OnBeforeEaten);
+            SubscribeLocalEvent<StackComponent, IngestedEvent>(OnEaten);
 
             _vvm.GetTypeHandler<StackComponent>()
                 .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
@@ -146,7 +149,7 @@ namespace Content.Shared.Stacks
             }
 
             // This is shit code until hands get fixed and give an easy way to enumerate over items, starting with the currently active item.
-            foreach (var held in Hands.EnumerateHeld(user, hands))
+            foreach (var held in Hands.EnumerateHeld((user, hands)))
             {
                 TryMergeStacks(item, held, out _, donorStack: itemStack);
 
@@ -389,6 +392,51 @@ namespace Content.Shared.Stacks
                 )
             );
         }
+
+        private void OnBeforeEaten(Entity<StackComponent> eaten, ref BeforeIngestedEvent args)
+        {
+            if (args.Cancelled)
+                return;
+
+            if (args.Solution is not { } sol)
+                return;
+
+            // If the entity is empty and is a lingering entity we can't eat from it.
+            if (eaten.Comp.Count <= 0)
+            {
+                args.Cancelled = true;
+                return;
+            }
+
+            /*
+            Edible stacked items is near completely evil so we must choose one of the following:
+            - Option 1: Eat the entire solution each bite and reduce the stack by 1.
+            - Option 2: Multiply the solution eaten by the stack size.
+            - Option 3: Divide the solution consumed by stack size.
+            The easiest and safest option is and always will be Option 1 otherwise we risk reagent deletion or duplication.
+            That is why we cancel if we cannot set the minimum to the entire volume of the solution.
+            */
+            if(args.TryNewMinimum(sol.Volume))
+                return;
+
+            args.Cancelled = true;
+        }
+
+        private void OnEaten(Entity<StackComponent> eaten, ref IngestedEvent args)
+        {
+            if (!Use(eaten, 1))
+                return;
+
+            // We haven't eaten the whole stack yet or are unable to eat it completely.
+            if (eaten.Comp.Count > 0 || eaten.Comp.Lingering)
+            {
+                args.Refresh = true;
+                return;
+            }
+
+            // Here to tell the food system to do destroy stuff.
+            args.Destroy = true;
+        }
     }
 
     /// <summary>
diff --git a/Content.Server/Station/Components/StationDataComponent.cs b/Content.Shared/Station/Components/StationDataComponent.cs
similarity index 55%
rename from Content.Server/Station/Components/StationDataComponent.cs
rename to Content.Shared/Station/Components/StationDataComponent.cs
index d154c6936d..ef01525d31 100644
--- a/Content.Server/Station/Components/StationDataComponent.cs
+++ b/Content.Shared/Station/Components/StationDataComponent.cs
@@ -1,26 +1,23 @@
-using Content.Server.Shuttles.Systems;
-using Content.Server.Station.Systems;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Utility;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Station.Components;
+namespace Content.Shared.Station.Components;
 
 /// <summary>
 /// Stores core information about a station, namely its config and associated grids.
 /// All station entities will have this component.
 /// </summary>
-[RegisterComponent, Access(typeof(StationSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationSystem))]
 public sealed partial class StationDataComponent : Component
 {
     /// <summary>
     /// The game map prototype, if any, associated with this station.
     /// </summary>
-    [DataField("stationConfig")]
-    public StationConfig? StationConfig = null;
+    [DataField]
+    public StationConfig? StationConfig;
 
     /// <summary>
     /// List of all grids this station is part of.
     /// </summary>
-    [DataField("grids")]
+    [DataField, AutoNetworkedField]
     public HashSet<EntityUid> Grids = new();
 }
diff --git a/Content.Shared/Station/Components/StationMemberComponent.cs b/Content.Shared/Station/Components/StationMemberComponent.cs
index ce5d95ad0d..3f2cd4856b 100644
--- a/Content.Shared/Station/Components/StationMemberComponent.cs
+++ b/Content.Shared/Station/Components/StationMemberComponent.cs
@@ -5,12 +5,12 @@ namespace Content.Shared.Station.Components;
 /// <summary>
 /// Indicates that a grid is a member of the given station.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class StationMemberComponent : Component
 {
     /// <summary>
     /// Station that this grid is a part of.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityUid Station = EntityUid.Invalid;
 }
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index c164454fd3..cecd0b809f 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -128,7 +128,7 @@ public abstract class SharedStationSpawningSystem : EntitySystem
                 var equipmentStr = startingGear.GetGear(slot.Name);
                 if (!string.IsNullOrEmpty(equipmentStr))
                 {
-                    var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, xform.Coordinates);
+                    var equipmentEntity = Spawn(equipmentStr, xform.Coordinates);
                     InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true);
                 }
             }
@@ -140,13 +140,13 @@ public abstract class SharedStationSpawningSystem : EntitySystem
             var coords = xform.Coordinates;
             foreach (var prototype in inhand)
             {
-                var inhandEntity = EntityManager.SpawnEntity(prototype, coords);
+                var inhandEntity = Spawn(prototype, coords);
 
                 // Sunrise added start - Ивент нужный для автопривязки питомцев при выборе в лоадаутах
                 RaiseLocalEvent(inhandEntity, new LoadoutPetSpawned(entity));
                 // Sunrise added end
 
-                if (_handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent))
+                if (_handsSystem.TryGetEmptyHand((entity, handsComponent), out var emptyHand))
                 {
                     _handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
                 }
diff --git a/Content.Shared/Station/SharedStationSystem.Tracker.cs b/Content.Shared/Station/SharedStationSystem.Tracker.cs
new file mode 100644
index 0000000000..770420d47e
--- /dev/null
+++ b/Content.Shared/Station/SharedStationSystem.Tracker.cs
@@ -0,0 +1,88 @@
+using Content.Shared.Station.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Map;
+
+namespace Content.Shared.Station;
+
+public abstract partial class SharedStationSystem
+{
+    private void InitializeTracker()
+    {
+        SubscribeLocalEvent<StationTrackerComponent, MapInitEvent>(OnTrackerMapInit);
+        SubscribeLocalEvent<StationTrackerComponent, ComponentRemove>(OnTrackerRemove);
+        SubscribeLocalEvent<StationTrackerComponent, GridUidChangedEvent>(OnTrackerGridChanged);
+        SubscribeLocalEvent<StationTrackerComponent, MetaFlagRemoveAttemptEvent>(OnMetaFlagRemoveAttempt);
+    }
+
+    private void OnTrackerMapInit(Entity<StationTrackerComponent> ent, ref MapInitEvent args)
+    {
+        _meta.AddFlag(ent, MetaDataFlags.ExtraTransformEvents);
+        UpdateStationTracker(ent.AsNullable());
+    }
+
+    private void OnTrackerRemove(Entity<StationTrackerComponent> ent, ref ComponentRemove args)
+    {
+        _meta.RemoveFlag(ent, MetaDataFlags.ExtraTransformEvents);
+    }
+
+    private void OnTrackerGridChanged(Entity<StationTrackerComponent> ent, ref GridUidChangedEvent args)
+    {
+        UpdateStationTracker((ent, ent.Comp, args.Transform));
+    }
+
+    private void OnMetaFlagRemoveAttempt(Entity<StationTrackerComponent> ent, ref MetaFlagRemoveAttemptEvent args)
+    {
+        if ((args.ToRemove & MetaDataFlags.ExtraTransformEvents) != 0 &&
+            ent.Comp.LifeStage <= ComponentLifeStage.Running)
+        {
+            args.ToRemove &= ~MetaDataFlags.ExtraTransformEvents;
+        }
+    }
+
+    /// <summary>
+    /// Updates the station tracker component based on entity's current location.
+    /// </summary>
+    [PublicAPI]
+    public void UpdateStationTracker(Entity<StationTrackerComponent?, TransformComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp1))
+            return;
+
+        var xform = ent.Comp2;
+
+        if (!_xformQuery.Resolve(ent, ref xform))
+            return;
+
+        // Entity is in nullspace or not on a grid
+        if (xform.MapID == MapId.Nullspace || xform.GridUid == null)
+        {
+            SetStation(ent, null);
+            return;
+        }
+
+        // Check if the grid is part of a station
+        if (!_stationMemberQuery.TryGetComponent(xform.GridUid.Value, out var stationMember))
+        {
+            SetStation(ent, null);
+            return;
+        }
+
+        SetStation(ent, stationMember.Station);
+    }
+
+    /// <summary>
+    /// Sets the station for a StationTrackerComponent.
+    /// </summary>
+    [PublicAPI]
+    public void SetStation(Entity<StationTrackerComponent?> ent, EntityUid? station)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        if (ent.Comp.Station == station)
+            return;
+
+        ent.Comp.Station = station;
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Station/SharedStationSystem.cs b/Content.Shared/Station/SharedStationSystem.cs
index c067af610d..afd2e77258 100644
--- a/Content.Shared/Station/SharedStationSystem.cs
+++ b/Content.Shared/Station/SharedStationSystem.cs
@@ -1,11 +1,14 @@
+using System.Linq;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Shared.Station;
 
 public abstract partial class SharedStationSystem : EntitySystem
 {
+    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
@@ -16,96 +19,164 @@ public abstract partial class SharedStationSystem : EntitySystem
     {
         base.Initialize();
 
+        InitializeTracker();
+
         _xformQuery = GetEntityQuery<TransformComponent>();
         _stationMemberQuery = GetEntityQuery<StationMemberComponent>();
-
-        SubscribeLocalEvent<StationTrackerComponent, MapInitEvent>(OnTrackerMapInit);
-        SubscribeLocalEvent<StationTrackerComponent, ComponentRemove>(OnTrackerRemove);
-        SubscribeLocalEvent<StationTrackerComponent, GridUidChangedEvent>(OnTrackerGridChanged);
-        SubscribeLocalEvent<StationTrackerComponent, MetaFlagRemoveAttemptEvent>(OnMetaFlagRemoveAttempt);
-    }
-
-    private void OnTrackerMapInit(Entity<StationTrackerComponent> ent, ref MapInitEvent args)
-    {
-        _meta.AddFlag(ent, MetaDataFlags.ExtraTransformEvents);
-        UpdateStationTracker(ent.AsNullable());
-    }
-
-    private void OnTrackerRemove(Entity<StationTrackerComponent> ent, ref ComponentRemove args)
-    {
-        _meta.RemoveFlag(ent, MetaDataFlags.ExtraTransformEvents);
-    }
-
-    private void OnTrackerGridChanged(Entity<StationTrackerComponent> ent, ref GridUidChangedEvent args)
-    {
-        UpdateStationTracker((ent, ent.Comp, args.Transform));
-    }
-
-    private void OnMetaFlagRemoveAttempt(Entity<StationTrackerComponent> ent, ref MetaFlagRemoveAttemptEvent args)
-    {
-        if ((args.ToRemove & MetaDataFlags.ExtraTransformEvents) != 0 &&
-            ent.Comp.LifeStage <= ComponentLifeStage.Running)
-        {
-            args.ToRemove &= ~MetaDataFlags.ExtraTransformEvents;
-        }
     }
 
     /// <summary>
-    /// Updates the station tracker component based on entity's current location.
+    /// Gets the largest member grid from a station.
     /// </summary>
-    [PublicAPI]
-    public void UpdateStationTracker(Entity<StationTrackerComponent?, TransformComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp1))
-            return;
-
-        var xform = ent.Comp2;
-
-        if (!_xformQuery.Resolve(ent, ref xform))
-            return;
-
-        // Entity is in nullspace or not on a grid
-        if (xform.MapID == MapId.Nullspace || xform.GridUid == null)
-        {
-            SetStation(ent, null);
-            return;
-        }
-
-        // Check if the grid is part of a station
-        if (!_stationMemberQuery.TryGetComponent(xform.GridUid.Value, out var stationMember))
-        {
-            SetStation(ent, null);
-            return;
-        }
-
-        SetStation(ent, stationMember.Station);
-    }
-
-    /// <summary>
-    /// Sets the station for a StationTrackerComponent.
-    /// </summary>
-    [PublicAPI]
-    public void SetStation(Entity<StationTrackerComponent?> ent, EntityUid? station)
+    public EntityUid? GetLargestGrid(Entity<StationDataComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp))
-            return;
+            return null;
 
-        if (ent.Comp.Station == station)
-            return;
+        EntityUid? largestGrid = null;
+        Box2 largestBounds = new Box2();
 
-        ent.Comp.Station = station;
-        Dirty(ent);
+        foreach (var gridUid in ent.Comp.Grids)
+        {
+            if (!TryComp<MapGridComponent>(gridUid, out var grid) ||
+                grid.LocalAABB.Size.LengthSquared() < largestBounds.Size.LengthSquared())
+                continue;
+
+            largestBounds = grid.LocalAABB;
+            largestGrid = gridUid;
+        }
+
+        return largestGrid;
     }
 
     /// <summary>
-    /// Gets the station an entity is currently on, if any.
+    /// Returns the total number of tiles contained in the station's grids.
     /// </summary>
-    [PublicAPI]
-    public EntityUid? GetCurrentStation(Entity<StationTrackerComponent?> ent)
+    public int GetTileCount(Entity<StationDataComponent?> ent)
     {
-        if (!Resolve(ent, ref ent.Comp, logMissing: false))
+        if (!Resolve(ent, ref ent.Comp))
+            return 0;
+
+        var count = 0;
+        foreach (var gridUid in ent.Comp.Grids)
+        {
+            if (!TryComp<MapGridComponent>(gridUid, out var grid))
+                continue;
+
+            count += _map.GetAllTiles(gridUid, grid).Count();
+        }
+
+        return count;
+    }
+
+    [PublicAPI]
+    public EntityUid? GetOwningStation(EntityUid? entity, TransformComponent? xform = null)
+    {
+        if (entity == null)
             return null;
 
-        return ent.Comp.Station;
+        return GetOwningStation(entity.Value, xform);
+    }
+
+    /// <summary>
+    /// Gets the station that "owns" the given entity (essentially, the station the grid it's on is attached to)
+    /// </summary>
+    /// <param name="entity">Entity to find the owner of.</param>
+    /// <param name="xform">Resolve pattern, transform of the entity.</param>
+    /// <returns>The owning station, if any.</returns>
+    /// <remarks>
+    /// This does not remember what station an entity started on, it simply checks where it is currently located.
+    /// </remarks>
+    public EntityUid? GetOwningStation(EntityUid entity, TransformComponent? xform = null)
+    {
+        if (!Resolve(entity, ref xform))
+            throw new ArgumentException("Tried to use an abstract entity!", nameof(entity));
+
+        if (TryComp<StationTrackerComponent>(entity, out var stationTracker))
+        {
+            // We have a specific station we are tracking and are tethered to.
+            return stationTracker.Station;
+        }
+
+        if (HasComp<StationDataComponent>(entity))
+        {
+            // We are the station, just return ourselves.
+            return entity;
+        }
+
+        if (HasComp<MapGridComponent>(entity))
+        {
+            // We are the station, just check ourselves.
+            return CompOrNull<StationMemberComponent>(entity)?.Station;
+        }
+
+        if (xform.GridUid == EntityUid.Invalid)
+        {
+            Log.Debug("Unable to get owning station - GridUid invalid.");
+            return null;
+        }
+
+        return CompOrNull<StationMemberComponent>(xform.GridUid)?.Station;
+    }
+
+    public List<EntityUid> GetStations()
+    {
+        var stations = new List<EntityUid>();
+        var query = EntityQueryEnumerator<StationDataComponent>();
+        while (query.MoveNext(out var uid, out _))
+        {
+            stations.Add(uid);
+        }
+
+        return stations;
+    }
+
+    public HashSet<EntityUid> GetStationsSet()
+    {
+        var stations = new HashSet<EntityUid>();
+        var query = EntityQueryEnumerator<StationDataComponent>();
+        while (query.MoveNext(out var uid, out _))
+        {
+            stations.Add(uid);
+        }
+
+        return stations;
+    }
+
+    public List<(string Name, NetEntity Entity)> GetStationNames()
+    {
+        var stations = GetStationsSet();
+        var stats = new List<(string Name, NetEntity Station)>();
+
+        foreach (var weh in stations)
+        {
+            stats.Add((MetaData(weh).EntityName, GetNetEntity(weh)));
+        }
+
+        return stats;
+    }
+
+    /// <summary>
+    /// Returns the first station that has a grid in a certain map.
+    /// If the map has no stations, null is returned instead.
+    /// </summary>
+    /// <remarks>
+    /// If there are multiple stations on a map it is probably arbitrary which one is returned.
+    /// </remarks>
+    public EntityUid? GetStationInMap(MapId map)
+    {
+        var query = EntityQueryEnumerator<StationDataComponent>();
+        while (query.MoveNext(out var uid, out var data))
+        {
+            foreach (var gridUid in data.Grids)
+            {
+                if (Transform(gridUid).MapID == map)
+                {
+                    return uid;
+                }
+            }
+        }
+
+        return null;
     }
 }
diff --git a/Content.Server/Station/StationConfig.cs b/Content.Shared/Station/StationConfig.cs
similarity index 59%
rename from Content.Server/Station/StationConfig.cs
rename to Content.Shared/Station/StationConfig.cs
index 8bc0caf1aa..5bdbf77422 100644
--- a/Content.Server/Station/StationConfig.cs
+++ b/Content.Shared/Station/StationConfig.cs
@@ -1,17 +1,15 @@
-using Content.Server.Maps.NameGenerators;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Station;
+namespace Content.Shared.Station;
 
 /// <summary>
 /// A config for a station. Specifies name and component modifications.
 /// </summary>
-[DataDefinition, PublicAPI]
+[DataDefinition]
 public sealed partial class StationConfig
 {
     [DataField("stationProto", required: true)]
-    public string StationPrototype = default!;
+    public EntProtoId StationPrototype;
 
     [DataField("components", required: true)]
     public ComponentRegistry StationComponentOverrides = default!;
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index 5fa634351d..c0c409d168 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Alert;
 using Content.Shared.Rejuvenate;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -8,6 +9,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.StatusEffect
 {
+    [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
     public sealed class StatusEffectsSystem : EntitySystem
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -104,6 +106,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="status">The status effects component to change, if you already have it.</param>
         /// <returns>False if the effect could not be added or the component already exists, true otherwise.</returns>
         /// <typeparam name="T">The component type to add and remove from the entity.</typeparam>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddStatusEffect<T>(EntityUid uid, string key, TimeSpan time, bool refresh,
             StatusEffectsComponent? status = null)
             where T : IComponent, new()
@@ -117,12 +120,13 @@ namespace Content.Shared.StatusEffect
             if (HasComp<T>(uid))
                 return true;
 
-            EntityManager.AddComponent<T>(uid);
+            AddComp<T>(uid);
             status.ActiveEffects[key].RelevantComponent = Factory.GetComponentName<T>();
             return true;
 
         }
 
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool refresh, string component,
             StatusEffectsComponent? status = null)
         {
@@ -132,10 +136,10 @@ namespace Content.Shared.StatusEffect
             if (TryAddStatusEffect(uid, key, time, refresh, status))
             {
                 // If they already have the comp, we just won't bother updating anything.
-                if (!EntityManager.HasComponent(uid, Factory.GetRegistration(component).Type))
+                if (!HasComp(uid, Factory.GetRegistration(component).Type))
                 {
                     var newComponent = (Component) Factory.GetComponent(component);
-                    EntityManager.AddComponent(uid, newComponent);
+                    AddComp(uid, newComponent);
                     status.ActiveEffects[key].RelevantComponent = component;
                 }
                 return true;
@@ -162,6 +166,7 @@ namespace Content.Shared.StatusEffect
         ///     If the effect already exists, it will simply replace the cooldown with the new one given.
         ///     If you want special 'effect merging' behavior, do it your own damn self!
         /// </remarks>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddStatusEffect(EntityUid uid,
             string key,
             TimeSpan time,
@@ -255,6 +260,7 @@ namespace Content.Shared.StatusEffect
         ///     Obviously this doesn't automatically clear any effects a status effect might have.
         ///     That's up to the removed component to handle itself when it's removed.
         /// </remarks>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryRemoveStatusEffect(EntityUid uid, string key,
             StatusEffectsComponent? status = null, bool remComp = true)
         {
@@ -273,7 +279,7 @@ namespace Content.Shared.StatusEffect
                 && Factory.TryGetRegistration(state.RelevantComponent, out var registration))
             {
                 var type = registration.Type;
-                EntityManager.RemoveComponent(uid, type);
+                RemComp(uid, type);
             }
 
             if (proto.Alert != null)
@@ -298,6 +304,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="uid">The entity to remove effects from.</param>
         /// <param name="status">The status effects component to change, if you already have it.</param>
         /// <returns>False if any status effects failed to be removed, true if they all did.</returns>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryRemoveAllStatusEffects(EntityUid uid,
             StatusEffectsComponent? status = null)
         {
@@ -321,6 +328,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="uid">The entity to check on.</param>
         /// <param name="key">The status effect ID to check for</param>
         /// <param name="status">The status effect component, should you already have it.</param>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool HasStatusEffect(EntityUid uid, string key,
             StatusEffectsComponent? status = null)
         {
@@ -338,13 +346,14 @@ namespace Content.Shared.StatusEffect
         /// <param name="uid">The entity to check on.</param>
         /// <param name="key">The status effect ID to check for</param>
         /// <param name="status">The status effect component, should you already have it.</param>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool CanApplyEffect(EntityUid uid, string key, StatusEffectsComponent? status = null)
         {
             // don't log since stuff calling this prolly doesn't care if we don't actually have it
             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;
@@ -364,6 +373,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="key">The status effect to add time to.</param>
         /// <param name="time">The amount of time to add.</param>
         /// <param name="status">The status effect component, should you already have it.</param>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryAddTime(EntityUid uid, string key, TimeSpan time,
             StatusEffectsComponent? status = null)
         {
@@ -395,6 +405,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="key">The status effect to remove time from.</param>
         /// <param name="time">The amount of time to add.</param>
         /// <param name="status">The status effect component, should you already have it.</param>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryRemoveTime(EntityUid uid, string key, TimeSpan time,
             StatusEffectsComponent? status = null)
         {
@@ -430,6 +441,7 @@ namespace Content.Shared.StatusEffect
         /// <remarks>
         ///     Not used internally; just sets it itself.
         /// </remarks>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TrySetTime(EntityUid uid, string key, TimeSpan time,
             StatusEffectsComponent? status = null)
         {
@@ -453,6 +465,7 @@ namespace Content.Shared.StatusEffect
         /// <param name="time">Out var for the time, if it exists.</param>
         /// <param name="status">The status effects component to use, if any.</param>
         /// <returns>False if the status effect was not active, true otherwise.</returns>
+        [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")]
         public bool TryGetTime(EntityUid uid, string key,
             [NotNullWhen(true)] out (TimeSpan, TimeSpan)? time,
             StatusEffectsComponent? status = null)
@@ -469,10 +482,11 @@ namespace Content.Shared.StatusEffect
     }
 
     /// <summary>
-    ///     Raised on an entity before a status effect is added to determine if adding it should be cancelled.
+    /// 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]
-    public record struct BeforeStatusEffectAddedEvent(string Key, bool Cancelled=false);
+    [ByRefEvent, Obsolete("Migration to StatusEffectNew.StatusEffectsSystem is required")]
+    public record struct BeforeOldStatusEffectAddedEvent(string EffectKey, bool Cancelled = false);
 
     public readonly struct StatusEffectAddedEvent
     {
diff --git a/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs
new file mode 100644
index 0000000000..808830f7e2
--- /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/Components/StatusEffectAlertComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectAlertComponent.cs
new file mode 100644
index 0000000000..a389be6947
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectAlertComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Alert;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.StatusEffectNew.Components;
+
+/// <summary>
+/// Used in conjunction with <see cref="StatusEffectComponent"/> to display an alert when the status effect is present.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[EntityCategory("StatusEffects")]
+public sealed partial class StatusEffectAlertComponent : Component
+{
+    /// <summary>
+    /// Status effect indication for the player.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> Alert;
+
+    /// <summary>
+    /// If the status effect has a set end time and this is true, a duration
+    /// indicator will be displayed with the alert.
+    /// </summary>
+    [DataField]
+    public bool ShowDuration = true;
+}
diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
new file mode 100644
index 0000000000..25f40718e9
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Alert;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.StatusEffectNew.Components;
+
+/// <summary>
+/// Marker component for all status effects - every status effect entity should have it.
+/// Provides a link between the effect and the affected entity, and some data common to all status effects.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(StatusEffectsSystem))]
+[EntityCategory("StatusEffects")]
+public sealed partial class StatusEffectComponent : Component
+{
+    /// <summary>
+    /// The entity that this status effect is applied to.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? AppliedTo;
+
+    /// <summary>
+    /// When this effect will end. If Null, the effect lasts indefinitely.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField, AutoNetworkedField]
+    public TimeSpan? EndEffectTime;
+
+    /// <summary>
+    /// Whitelist, by which it is determined whether this status effect can be imposed on a particular entity.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist, by which it is determined whether this status effect can be imposed on a particular entity.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+}
diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs
new file mode 100644
index 0000000000..9c2820653a
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.StatusEffectNew.Components;
+
+/// <summary>
+/// Adds container for status effect entities that are applied to entity.
+/// Is applied automatically upon adding any status effect.
+/// Can be used for tracking currently applied status effects.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(StatusEffectsSystem))]
+public sealed partial class StatusEffectContainerComponent : Component
+{
+    public const string ContainerId = "status-effects";
+
+    /// <summary>
+    /// The actual container holding references to the active status effects
+    /// </summary>
+    [ViewVariables]
+    public Container? ActiveStatusEffects;
+}
diff --git a/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs
new file mode 100644
index 0000000000..d540f865c0
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.Alert;
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.StatusEffectNew;
+
+/// <summary>
+/// Handles displaying status effects that should show an alert, optionally with a duration.
+/// </summary>
+public sealed class StatusEffectAlertSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+
+    private EntityQuery<StatusEffectComponent> _effectQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StatusEffectAlertComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
+        SubscribeLocalEvent<StatusEffectAlertComponent, StatusEffectRemovedEvent>(OnStatusEffectRemoved);
+        SubscribeLocalEvent<StatusEffectAlertComponent, StatusEffectEndTimeUpdatedEvent>(OnEndTimeUpdated);
+
+        _effectQuery = GetEntityQuery<StatusEffectComponent>();
+    }
+
+    private void OnStatusEffectApplied(Entity<StatusEffectAlertComponent> ent, ref StatusEffectAppliedEvent args)
+    {
+        if (!_effectQuery.TryComp(ent, out var effectComp))
+            return;
+
+        RefreshAlert(ent, args.Target, effectComp.EndEffectTime);
+    }
+
+    private void OnStatusEffectRemoved(Entity<StatusEffectAlertComponent> ent, ref StatusEffectRemovedEvent args)
+    {
+        _alerts.ClearAlert(args.Target, ent.Comp.Alert);
+    }
+
+    private void OnEndTimeUpdated(Entity<StatusEffectAlertComponent> ent, ref StatusEffectEndTimeUpdatedEvent args)
+    {
+        RefreshAlert(ent, args.Target, args.EndTime);
+    }
+
+    private void RefreshAlert(Entity<StatusEffectAlertComponent> ent, EntityUid target, TimeSpan? endTime)
+    {
+        (TimeSpan Start, TimeSpan End)? cooldown = null;
+
+        // Make sure the start time of the alert cooldown is still accurate
+        // This ensures the progress wheel doesn't "reset" every duration change.
+        if (ent.Comp.ShowDuration
+            && endTime is not null
+            && _alerts.TryGet(ent.Comp.Alert, out var alert))
+        {
+            _alerts.TryGetAlertState(target, alert.AlertKey, out var alertState);
+            cooldown = (alertState.Cooldown?.Item1 ?? _timing.CurTime, endTime.Value);
+        }
+
+        _alerts.ShowAlert(target, ent.Comp.Alert, cooldown: cooldown);
+    }
+}
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
new file mode 100644
index 0000000000..2144b5a0c1
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -0,0 +1,374 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.StatusEffectNew;
+
+public sealed partial class StatusEffectsSystem
+{
+    /// <summary>
+    /// Increments duration of status effect by <see cref="duration"/>.
+    /// Tries to add status effect if it is not yet present on entity.
+    /// </summary>
+    /// <param name="target">The target entity to which the effect should be added.</param>
+    /// <param name="effectProto">ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it.</param>
+    /// <param name="duration">Duration of status effect. Leave null and the effect will be permanent until it is removed using <c>TryRemoveStatusEffect</c>.</param>
+    /// <param name="statusEffect">The EntityUid of the status effect we have just created or null if it doesn't exist.</param>
+    /// <returns>True if effect exists and its duration is set properly, false in case effect cannot be applied.</returns>
+    public bool TryAddStatusEffectDuration(
+        EntityUid target,
+        EntProtoId effectProto,
+        [NotNullWhen(true)] out EntityUid? statusEffect,
+        TimeSpan duration
+    )
+    {
+        if (duration == TimeSpan.Zero)
+        {
+            statusEffect = null;
+            return false;
+        }
+
+        // We check to make sure time is greater than zero here because sometimes you want to use TryAddStatusEffect to remove duration instead...
+        if (!TryGetStatusEffect(target, effectProto, out statusEffect))
+            return TryAddStatusEffect(target, effectProto, out statusEffect, duration);
+
+        AddStatusEffectTime(statusEffect.Value, duration);
+
+        return true;
+    }
+
+
+    ///<inheritdoc cref="TryAddStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan)"/>
+    public bool TryAddStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan duration)
+    {
+        return TryAddStatusEffectDuration(target, effectProto, out _, duration);
+    }
+
+    /// <summary>
+    /// Sets duration of status effect by <see cref="duration"/>.
+    /// Tries to add status effect if it is not yet present on entity.
+    /// </summary>
+    /// <param name="target">The target entity to which the effect should be added.</param>
+    /// <param name="effectProto">ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it.</param>
+    /// <param name="duration">Duration of status effect. Leave null and the effect will be permanent until it is removed using <c>TryRemoveStatusEffect</c>.</param>
+    /// <param name="statusEffect">The EntityUid of the status effect we have just created or null if it doesn't exist.</param>
+    /// <returns>True if effect exists and its duration is set properly, false in case effect cannot be applied.</returns>
+    public bool TrySetStatusEffectDuration(
+        EntityUid target,
+        EntProtoId effectProto,
+        [NotNullWhen(true)] out EntityUid? statusEffect,
+        TimeSpan? duration = null
+    )
+    {
+        if (duration <= TimeSpan.Zero)
+        {
+            statusEffect = null;
+            return false;
+        }
+
+        if (!TryGetStatusEffect(target, effectProto, out statusEffect))
+            return TryAddStatusEffect(target, effectProto, out statusEffect, duration);
+
+        SetStatusEffectTime(statusEffect.Value, duration);
+
+        return true;
+    }
+
+    /// <inheritdoc cref="TrySetStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan?)"/>
+    public bool TrySetStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null)
+    {
+        return TrySetStatusEffectDuration(target, effectProto, out _, duration);
+    }
+
+    /// <summary>
+    /// Updates duration of effect to larger value between provided <see cref="duration"/> and current effect duration.
+    /// Tries to add status effect if it is not yet present on entity.
+    /// </summary>
+    /// <param name="target">The target entity to which the effect should be added.</param>
+    /// <param name="effectProto">ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it.</param>
+    /// <param name="duration">Duration of status effect. Leave null and the effect will be permanent until it is removed using <c>TryRemoveStatusEffect</c>.</param>
+    /// <param name="statusEffect">The EntityUid of the status effect we have just created or null if it doesn't exist.</param>
+    /// <returns>True if effect exists and its duration is set properly, false in case effect cannot be applied.</returns>
+    public bool TryUpdateStatusEffectDuration(
+        EntityUid target,
+        EntProtoId effectProto,
+        [NotNullWhen(true)] out EntityUid? statusEffect,
+        TimeSpan? duration = null
+    )
+    {
+        if (duration <= TimeSpan.Zero)
+        {
+            statusEffect = null;
+            return false;
+        }
+
+        if (!TryGetStatusEffect(target, effectProto, out statusEffect))
+            return TryAddStatusEffect(target, effectProto, out statusEffect, duration);
+
+        UpdateStatusEffectTime(statusEffect.Value, duration);
+
+        return true;
+    }
+
+    /// <inheritdoc cref="TryUpdateStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan?)"/>
+    public bool TryUpdateStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null)
+    {
+        return TryUpdateStatusEffectDuration(target, effectProto, out _, duration);
+    }
+
+    /// <summary>
+    /// Attempting to remove a status effect from an entity.
+    /// Returns True if the status effect existed on the entity and was successfully removed, and False in otherwise.
+    /// </summary>
+    public bool TryRemoveStatusEffect(EntityUid target, EntProtoId effectProto)
+    {
+        if (!_containerQuery.TryComp(target, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            var meta = MetaData(effect);
+
+            if (meta.EntityPrototype is null
+                || meta.EntityPrototype != effectProto)
+                continue;
+
+            if (!_effectQuery.HasComp(effect))
+                return false;
+
+            PredictedQueueDel(effect);
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks whether the specified entity is under a specific status effect.
+    /// </summary>
+    public bool HasStatusEffect(EntityUid target, EntProtoId effectProto)
+    {
+        if (!_containerQuery.TryComp(target, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            var meta = MetaData(effect);
+            if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Attempting to retrieve the EntityUid of a status effect from an entity.
+    /// </summary>
+    public bool TryGetStatusEffect(EntityUid target, EntProtoId effectProto, [NotNullWhen(true)] out EntityUid? effect)
+    {
+        effect = null;
+        if (!_containerQuery.TryComp(target, out var container))
+            return false;
+
+        foreach (var e in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            var meta = MetaData(e);
+            if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
+            {
+                effect = e;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Attempting to retrieve the time of a status effect from an entity.
+    /// </summary>
+    /// <param name="uid">The target entity on which the effect is applied.</param>
+    /// <param name="effectProto">The prototype ID of the status effect to retrieve.</param>
+    /// <param name="time">The output tuple containing the effect entity and its remaining time.</param>
+    /// <param name="container">Optional. The status effect container component of the entity.</param>
+    public bool TryGetTime(
+        EntityUid uid,
+        EntProtoId effectProto,
+        out (EntityUid EffectEnt, TimeSpan? EndEffectTime) time,
+        StatusEffectContainerComponent? container = null
+    )
+    {
+        time = default;
+        if (!Resolve(uid, ref container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            var meta = MetaData(effect);
+            if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
+            {
+                if (!_effectQuery.TryComp(effect, out var effectComp))
+                    return false;
+
+                time = (effect, effectComp.EndEffectTime);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Attempts to get the maximum time left for a given Status Effect Component, returns false if no such
+    /// component exists.
+    /// </summary>
+    /// <param name="uid">The target entity on which the effect is applied.</param>
+    /// <param name="time">Returns the EntityUid of the status effect with the most time left, and the end effect time
+    /// of that status effect.</param>
+    /// <returns> True if a status effect entity with the given component exists</returns>
+    public bool TryGetMaxTime<T>(EntityUid uid, out (EntityUid EffectEnt, TimeSpan? EndEffectTime) time) where T : IComponent
+    {
+        time = default;
+        if (!TryEffectsWithComp<T>(uid, out var status))
+            return false;
+
+        time.EndEffectTime = TimeSpan.Zero;
+
+        foreach (var effect in status)
+        {
+            if (effect.Comp2.EndEffectTime == null)
+            {
+                time = (effect.Owner, null);
+                return true;
+            }
+
+            if (effect.Comp2.EndEffectTime > time.EndEffectTime)
+                time = (effect.Owner, effect.Comp2.EndEffectTime);
+        }
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to edit the remaining time for a status effect on an entity.
+    /// </summary>
+    /// <param name="uid">The target entity on which the effect is applied.</param>
+    /// <param name="effectProto">The prototype ID of the status effect to modify.</param>
+    /// <param name="time">
+    /// The time adjustment to apply to the status effect. Positive values extend the duration,
+    /// while negative values reduce it.
+    /// </param>
+    /// <returns> True if duration was edited successfully, false otherwise.</returns>
+    public bool TryAddTime(EntityUid uid, EntProtoId effectProto, TimeSpan time)
+    {
+        if (!_containerQuery.TryComp(uid, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            var meta = MetaData(effect);
+            if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
+            {
+                AddStatusEffectTime(effect, time);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// Attempts to set the remaining time for a status effect on an entity.
+    /// </summary>
+    /// <param name="uid">The target entity on which the effect is applied.</param>
+    /// <param name="effectProto">The prototype ID of the status effect to modify.</param>
+    /// <param name="time">The new duration for the status effect.</param>
+    /// <returns> True if duration was set successfully, false otherwise.</returns>
+    public bool TrySetTime(EntityUid uid, EntProtoId effectProto, TimeSpan time)
+    {
+        if (!_containerQuery.TryComp(uid, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            var meta = MetaData(effect);
+            if (meta.EntityPrototype is not null && meta.EntityPrototype == effectProto)
+            {
+                SetStatusEffectTime(effect, time);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if the specified component is present on any of the entity's status effects.
+    /// </summary>
+    public bool HasEffectComp<T>(EntityUid? target) where T : IComponent
+    {
+        if (!_containerQuery.TryComp(target, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            if (HasComp<T>(effect))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns all status effects that have the specified component.
+    /// </summary>
+    public bool TryEffectsWithComp<T>(EntityUid? target, [NotNullWhen(true)] out HashSet<Entity<T, StatusEffectComponent>>? effects) where T : IComponent
+    {
+        effects = null;
+        if (!_containerQuery.TryComp(target, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            if (!_effectQuery.TryComp(effect, out var statusComp))
+                continue;
+
+            if (TryComp<T>(effect, out var comp))
+            {
+                effects ??= [];
+                effects.Add((effect, comp, statusComp));
+            }
+        }
+
+        return effects is not null;
+    }
+
+    /// <summary>
+    /// Helper function for calculating how long it takes for all effects with a particular component to disappear. Useful for overlays.
+    /// </summary>
+    /// <param name="target">An entity from which status effects are checked.</param>
+    /// <param name="endTime">The farthest end time of effects with this component is returned. Can be null if one of the effects is infinite.</param>
+    /// <returns>True if effects with the specified component were found, or False if there are no such effects.</returns>
+    public bool TryGetEffectsEndTimeWithComp<T>(EntityUid? target, out TimeSpan? endTime) where T : IComponent
+    {
+        endTime = _timing.CurTime;
+        if (!_containerQuery.TryComp(target, out var container))
+            return false;
+
+        foreach (var effect in container.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            if (!HasComp<T>(effect))
+                continue;
+
+            if (!_effectQuery.TryComp(effect, out var statusComp))
+                continue;
+
+            if (statusComp.EndEffectTime is null)
+            {
+                endTime = null;
+                return true; //This effect never ends, so we return null at endTime, but return true that there is time.
+            }
+
+            if (statusComp.EndEffectTime > endTime)
+                endTime = statusComp.EndEffectTime;
+        }
+
+        return endTime is not null;
+    }
+}
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
new file mode 100644
index 0000000000..0c4c5cf1f7
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -0,0 +1,65 @@
+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;
+
+public sealed partial class StatusEffectsSystem
+{
+    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
+    {
+        RelayEvent((uid, component), ref args);
+    }
+
+    private void RelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, T args) where T : class
+    {
+        RelayEvent((uid, component), args);
+    }
+
+    public void RelayEvent<T>(Entity<StatusEffectContainerComponent> statusEffect, ref T args) where T : struct
+    {
+        // this copies the by-ref event if it is a struct
+        var ev = new StatusEffectRelayedEvent<T>(args);
+        foreach (var activeEffect in statusEffect.Comp.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            RaiseLocalEvent(activeEffect, ref ev);
+        }
+        // and now we copy it back
+        args = ev.Args;
+    }
+
+    public void RelayEvent<T>(Entity<StatusEffectContainerComponent> statusEffect, T args) where T : class
+    {
+        // this copies the by-ref event if it is a struct
+        var ev = new StatusEffectRelayedEvent<T>(args);
+        foreach (var activeEffect in statusEffect.Comp.ActiveStatusEffects?.ContainedEntities ?? [])
+        {
+            RaiseLocalEvent(activeEffect, ref ev);
+        }
+    }
+}
+
+/// <summary>
+/// Event wrapper for relayed events.
+/// </summary>
+[ByRefEvent]
+public record struct StatusEffectRelayedEvent<TEvent>(TEvent Args);
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
new file mode 100644
index 0000000000..1ffb74570a
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -0,0 +1,283 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Rejuvenate;
+using Content.Shared.StatusEffectNew.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.StatusEffectNew;
+
+/// <summary>
+/// This system controls status effects, their lifetime, and provides an API for adding them to entities,
+/// removing them from entities, or getting information about current effects on entities.
+/// </summary>
+public sealed partial class StatusEffectsSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    private EntityQuery<StatusEffectContainerComponent> _containerQuery;
+    private EntityQuery<StatusEffectComponent> _effectQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeRelay();
+
+        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentInit>(OnStatusContainerInit);
+        SubscribeLocalEvent<StatusEffectContainerComponent, ComponentShutdown>(OnStatusContainerShutdown);
+        SubscribeLocalEvent<StatusEffectContainerComponent, EntInsertedIntoContainerMessage>(OnEntityInserted);
+        SubscribeLocalEvent<StatusEffectContainerComponent, EntRemovedFromContainerMessage>(OnEntityRemoved);
+
+        SubscribeLocalEvent<RejuvenateRemovedStatusEffectComponent, StatusEffectRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
+
+        _containerQuery = GetEntityQuery<StatusEffectContainerComponent>();
+        _effectQuery = GetEntityQuery<StatusEffectComponent>();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<StatusEffectComponent>();
+        while (query.MoveNext(out var ent, out var effect))
+        {
+            if (effect.EndEffectTime is null)
+                continue;
+
+            if (!(_timing.CurTime >= effect.EndEffectTime))
+                continue;
+
+            if (effect.AppliedTo is null)
+                continue;
+
+            var meta = MetaData(ent);
+            if (meta.EntityPrototype is null)
+                continue;
+
+            TryRemoveStatusEffect(effect.AppliedTo.Value, meta.EntityPrototype);
+        }
+    }
+
+    private void OnStatusContainerInit(Entity<StatusEffectContainerComponent> ent, ref ComponentInit args)
+    {
+        ent.Comp.ActiveStatusEffects =
+            _container.EnsureContainer<Container>(ent, StatusEffectContainerComponent.ContainerId);
+        // We show the contents of the container to allow status effects to have visible sprites.
+        ent.Comp.ActiveStatusEffects.ShowContents = true;
+        ent.Comp.ActiveStatusEffects.OccludesLight = false;
+    }
+
+    private void OnStatusContainerShutdown(Entity<StatusEffectContainerComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.ActiveStatusEffects is { } container)
+            _container.ShutdownContainer(container);
+    }
+
+    private void OnEntityInserted(Entity<StatusEffectContainerComponent> ent, ref EntInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
+            return;
+
+        if (!TryComp<StatusEffectComponent>(args.Entity, out var statusComp))
+            return;
+
+        // Make sure AppliedTo is set correctly so events can rely on it
+        if (statusComp.AppliedTo != ent)
+        {
+            statusComp.AppliedTo = ent;
+            Dirty(args.Entity, statusComp);
+        }
+
+        var ev = new StatusEffectAppliedEvent(ent);
+        RaiseLocalEvent(args.Entity, ref ev);
+    }
+
+    private void OnEntityRemoved(Entity<StatusEffectContainerComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
+            return;
+
+        if (!TryComp<StatusEffectComponent>(args.Entity, out var statusComp))
+            return;
+
+        var ev = new StatusEffectRemovedEvent(ent);
+        RaiseLocalEvent(args.Entity, ref ev);
+
+        // Clear AppliedTo after events are handled so event handlers can use it.
+        if (statusComp.AppliedTo == null)
+            return;
+
+        // Why not just delete it? Well, that might end up being best, but this
+        // could theoretically allow for moving status effects from one entity
+        // to another. That might be good to have for polymorphs or something.
+        statusComp.AppliedTo = null;
+        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))
+            return;
+
+        if (duration is null)
+        {
+            if(effectComp.EndEffectTime is null)
+                return;
+
+            effectComp.EndEffectTime = null;
+        }
+        else
+            effectComp.EndEffectTime = _timing.CurTime + duration;
+
+        Dirty(effect, effectComp);
+    }
+
+    private void UpdateStatusEffectTime(EntityUid effect, TimeSpan? duration)
+    {
+        if (!_effectQuery.TryComp(effect, out var effectComp))
+            return;
+
+        // It's already infinitely long
+        if (effectComp.EndEffectTime is null)
+            return;
+
+        if (duration is null)
+            effectComp.EndEffectTime = null;
+        else
+        {
+            var newEndTime = _timing.CurTime + duration;
+            if (effectComp.EndEffectTime >= newEndTime)
+                return;
+
+            effectComp.EndEffectTime = newEndTime;
+        }
+
+        Dirty(effect, effectComp);
+    }
+
+    public bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
+    {
+        if (!_proto.TryIndex(effectProto, out var effectProtoData))
+            return false;
+
+        if (!effectProtoData.TryGetComponent<StatusEffectComponent>(out var effectProtoComp, Factory))
+            return false;
+
+        if (!_whitelist.CheckBoth(uid, effectProtoComp.Blacklist, effectProtoComp.Whitelist))
+            return false;
+
+        var ev = new BeforeStatusEffectAddedEvent(effectProto);
+        RaiseLocalEvent(uid, ref ev);
+
+        if (ev.Cancelled)
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to add a status effect to the specified entity. Returns True if the effect is added, does not check if one
+    /// already exists as it's intended to be called after a check for an existing effect has already failed.
+    /// </summary>
+    /// <param name="target">The target entity to which the effect should be added.</param>
+    /// <param name="effectProto">ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it.</param>
+    /// <param name="duration">Duration of status effect. Leave null and the effect will be permanent until it is removed using <c>TryRemoveStatusEffect</c>.</param>
+    /// <param name="statusEffect">The EntityUid of the status effect we have just created or null if we couldn't create one.</param>
+    private bool TryAddStatusEffect(
+        EntityUid target,
+        EntProtoId effectProto,
+        [NotNullWhen(true)] out EntityUid? statusEffect,
+        TimeSpan? duration = null
+    )
+    {
+        statusEffect = null;
+
+        if (duration <= TimeSpan.Zero)
+            return false;
+
+        if (!CanAddStatusEffect(target, effectProto))
+            return false;
+
+        EnsureComp<StatusEffectContainerComponent>(target);
+
+        // And only if all checks passed we spawn the effect
+        if (!PredictedTrySpawnInContainer(effectProto,
+                target,
+                StatusEffectContainerComponent.ContainerId,
+                out var effect))
+            return false;
+
+        if (!_effectQuery.TryComp(effect, out var effectComp))
+            return false;
+
+        statusEffect = effect;
+        SetStatusEffectEndTime((effect.Value, effectComp), _timing.CurTime + duration);
+
+        return true;
+    }
+
+    private void AddStatusEffectTime(EntityUid effect, TimeSpan delta)
+    {
+        if (!_effectQuery.TryComp(effect, out var effectComp))
+            return;
+
+        // If we don't have an end time set, we want to just make the status effect end in delta time from now.
+        SetStatusEffectEndTime((effect, effectComp), (effectComp.EndEffectTime ?? _timing.CurTime) + delta);
+    }
+
+    private void SetStatusEffectEndTime(Entity<StatusEffectComponent?> ent, TimeSpan? endTime)
+    {
+        if (!_effectQuery.Resolve(ent, ref ent.Comp))
+            return;
+
+        if (ent.Comp.EndEffectTime == endTime)
+            return;
+
+        ent.Comp.EndEffectTime = endTime;
+
+        if (ent.Comp.AppliedTo is not { } appliedTo)
+            return; // Not much we can do!
+
+        var ev = new StatusEffectEndTimeUpdatedEvent(appliedTo, endTime);
+        RaiseLocalEvent(ent, ref ev);
+
+        Dirty(ent);
+    }
+}
+
+/// <summary>
+/// Calls on effect entity, when a status effect is applied.
+/// </summary>
+[ByRefEvent]
+public readonly record struct StatusEffectAppliedEvent(EntityUid Target);
+
+/// <summary>
+/// Calls on effect entity, when a status effect is removed.
+/// </summary>
+[ByRefEvent]
+public readonly record struct StatusEffectRemovedEvent(EntityUid Target);
+
+/// <summary>
+/// Raised on an entity before a status effect is added to determine if adding it should be cancelled.
+/// </summary>
+[ByRefEvent]
+public record struct BeforeStatusEffectAddedEvent(EntProtoId Effect, bool Cancelled = false);
+
+/// <summary>
+/// Raised on an effect entity when its <see cref="StatusEffectComponent.EndEffectTime"/> is updated in any way.
+/// </summary>
+/// <param name="Target">The entity the effect is attached to.</param>
+/// <param name="EndTime">The new end time of the status effect, included for convenience.</param>
+[ByRefEvent]
+public record struct StatusEffectEndTimeUpdatedEvent(EntityUid Target, TimeSpan? EndTime);
diff --git a/Content.Shared/Sticky/Components/StickyComponent.cs b/Content.Shared/Sticky/Components/StickyComponent.cs
index 4513091754..a4007b0780 100644
--- a/Content.Shared/Sticky/Components/StickyComponent.cs
+++ b/Content.Shared/Sticky/Components/StickyComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Sticky.Systems;
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
diff --git a/Content.Shared/Storage/Components/DumpableComponent.cs b/Content.Shared/Storage/Components/DumpableComponent.cs
index ecf5f17ea9..0c751df2a3 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.Server/Storage/Components/PickRandomComponent.cs b/Content.Shared/Storage/Components/PickRandomComponent.cs
similarity index 69%
rename from Content.Server/Storage/Components/PickRandomComponent.cs
rename to Content.Shared/Storage/Components/PickRandomComponent.cs
index 00c79b9ea4..e243d25dde 100644
--- a/Content.Server/Storage/Components/PickRandomComponent.cs
+++ b/Content.Shared/Storage/Components/PickRandomComponent.cs
@@ -1,31 +1,32 @@
-using Content.Server.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Storage.Components;
+namespace Content.Shared.Storage.Components;
 
 /// <summary>
 /// Adds a verb to pick a random item from a container.
 /// Only picks items that match the whitelist.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(PickRandomSystem))]
 public sealed partial class PickRandomComponent : Component
 {
     /// <summary>
     /// Whitelist for potential picked items.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
     /// Locale id for the pick verb text.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public LocId VerbText = "comp-pick-random-verb-text";
 
     /// <summary>
     /// Locale id for the empty storage message.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public LocId EmptyText = "comp-pick-random-empty";
 }
diff --git a/Content.Shared/Storage/EntitySystems/BinSystem.cs b/Content.Shared/Storage/EntitySystems/BinSystem.cs
index 3b57dd8fea..9009df3753 100644
--- a/Content.Shared/Storage/EntitySystems/BinSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/BinSystem.cs
@@ -67,12 +67,18 @@ public sealed class BinSystem : EntitySystem
 
     private void OnEntInserted(Entity<BinComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
+        if (args.Container.ID != ent.Comp.ContainerId)
+            return;
+
         ent.Comp.Items.Add(args.Entity);
     }
 
-    private void OnEntRemoved(EntityUid uid, BinComponent component, EntRemovedFromContainerMessage args)
+    private void OnEntRemoved(Entity<BinComponent> ent, ref EntRemovedFromContainerMessage args)
     {
-        component.Items.Remove(args.Entity);
+        if (args.Container.ID != ent.Comp.ContainerId)
+            return;
+
+        ent.Comp.Items.Remove(args.Entity);
     }
 
     private void OnInteractHand(EntityUid uid, BinComponent component, InteractHandEvent args)
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index d0ad27eee5..6c0cc2d656 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 sealed class DumpableSystem : EntitySystem
 
     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 @@ public sealed class DumpableSystem : EntitySystem
         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 @@ public sealed class DumpableSystem : EntitySystem
         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 @@ public sealed class DumpableSystem : EntitySystem
 
     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 @@ public sealed class DumpableSystem : EntitySystem
                 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.Server/Storage/EntitySystems/PickRandomSystem.cs b/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs
similarity index 78%
rename from Content.Server/Storage/EntitySystems/PickRandomSystem.cs
rename to Content.Shared/Storage/EntitySystems/PickRandomSystem.cs
index f0e986e199..87fb4219ad 100644
--- a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs
@@ -1,22 +1,22 @@
 using System.Linq;
-using Content.Server.Storage.Components;
 using Content.Shared.Database;
 using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Storage;
+using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
+using Robust.Shared.Network;
 using Robust.Shared.Random;
 
-namespace Content.Server.Storage.EntitySystems;
+namespace Content.Shared.Storage.EntitySystems;
 
-// TODO: move this to shared for verb prediction if/when storage is in shared
 public sealed class PickRandomSystem : EntitySystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -50,12 +50,19 @@ public sealed class PickRandomSystem : EntitySystem
 
     private void TryPick(EntityUid uid, PickRandomComponent comp, StorageComponent storage, EntityUid user)
     {
+        // It's hard to predict picking a random entity from a container since the contained entity list will have a different order on the server and client.
+        // One idea might be to sort them by NetEntity ID, but that is expensive if there are a lot of entities.
+        // Another option would be to make this client authorative.
+        if (_net.IsClient)
+            return;
+
         var entities = storage.Container.ContainedEntities.Where(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item)).ToArray();
 
-        if (!entities.Any())
+        if (entities.Length == 0)
             return;
 
         var picked = _random.Pick(entities);
+
         // if it fails to go into a hand of the user, will be on the storage
         _container.AttachParentToContainerOrGrid((picked, Transform(picked)));
 
diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
index 51615c5afa..3691f6e2b6 100644
--- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Materials;
 using Content.Shared.Nutrition;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Storage.Components;
 using Content.Shared.Tools.EntitySystems;
@@ -25,6 +26,7 @@ namespace Content.Shared.Storage.EntitySystems;
 /// </summary>
 public sealed class SecretStashSystem : EntitySystem
 {
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
@@ -41,7 +43,7 @@ public sealed class SecretStashSystem : EntitySystem
         SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
         SubscribeLocalEvent<SecretStashComponent, GotReclaimedEvent>(OnReclaimed);
         SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem), typeof(AnchorableSystem) });
-        SubscribeLocalEvent<SecretStashComponent, AfterFullyEatenEvent>(OnEaten);
+        SubscribeLocalEvent<SecretStashComponent, FullyEatenEvent>(OnFullyEaten);
         SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<SecretStashComponent, GetVerbsEvent<InteractionVerb>>(OnGetVerb);
     }
@@ -61,7 +63,7 @@ public sealed class SecretStashSystem : EntitySystem
         DropContentsAndAlert(entity, args.ReclaimerCoordinates);
     }
 
-    private void OnEaten(Entity<SecretStashComponent> entity, ref AfterFullyEatenEvent args)
+    private void OnFullyEaten(Entity<SecretStashComponent> entity, ref FullyEatenEvent args)
     {
         // TODO: When newmed is finished should do damage to teeth (Or something like that!)
         var damage = entity.Comp.DamageEatenItemInside;
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 2b73a9349f..fd7cb87b2a 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -16,6 +16,7 @@ using Content.Shared.Verbs;
 using Content.Shared.Wall;
 using Content.Shared.Whitelist;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Mobs.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -355,7 +356,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
             return _whitelistSystem.IsValid(component.Whitelist, toInsert);
 
         // The inserted entity must be a mob or an item.
-        return HasComp<BodyComponent>(toInsert) || HasComp<ItemComponent>(toInsert);
+        return HasComp<MobStateComponent>(toInsert) || HasComp<ItemComponent>(toInsert);
     }
 
     public bool TryOpenStorage(EntityUid user, EntityUid target, bool silent = false)
diff --git a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
index 8ef62c45c4..62f91d8663 100644
--- a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
@@ -21,7 +21,7 @@ namespace Content.Shared.Storage.EntitySystems
         private void CounterEntityInserted(EntityUid uid, ItemCounterComponent itemCounter,
             EntInsertedIntoContainerMessage args)
         {
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
+            if (!TryComp(uid, out AppearanceComponent? appearanceComponent))
                 return;
 
             var count = GetCount(args, itemCounter);
@@ -37,7 +37,7 @@ namespace Content.Shared.Storage.EntitySystems
         private void CounterEntityRemoved(EntityUid uid, ItemCounterComponent itemCounter,
             EntRemovedFromContainerMessage args)
         {
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
+            if (!TryComp(uid, out AppearanceComponent? appearanceComponent))
                 return;
 
             var count = GetCount(args, itemCounter);
diff --git a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
index 7ae821d8d9..3b4b08bbfd 100644
--- a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
@@ -34,7 +34,7 @@ public abstract class SharedItemMapperSystem : EntitySystem
             val.Layer = layerName;
         }
 
-        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
+        if (TryComp(uid, out AppearanceComponent? appearanceComponent))
         {
             var list = new List<string>(component.MapLayers.Keys);
             _appearance.SetData(uid, StorageMapVisuals.InitLayers, new ShowLayerData(list), appearanceComponent);
@@ -67,7 +67,7 @@ public abstract class SharedItemMapperSystem : EntitySystem
         if (!Resolve(uid, ref itemMapper))
             return;
 
-        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent)
+        if (TryComp(uid, out AppearanceComponent? appearanceComponent)
             && TryGetLayers(uid, itemMapper, out var containedLayers))
         {
             _appearance.SetData(uid,
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 8143cb9cdd..74c47bbb25 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -83,8 +83,7 @@ public abstract class SharedStorageSystem : EntitySystem
     /// </summary>
     public bool NestedStorage = true;
 
-    [ValidatePrototypeId<ItemSizePrototype>]
-    public const string DefaultStorageMaxItemSize = "Normal";
+    public static readonly ProtoId<ItemSizePrototype> DefaultStorageMaxItemSize = "Normal";
 
     public const float AreaInsertDelayPerItem = 0.075f;
     private static AudioParams _audioParams = AudioParams.Default
@@ -233,7 +232,14 @@ public abstract class SharedStorageSystem : EntitySystem
             StoredItems = storedItems,
             SavedLocations = component.SavedLocations,
             Whitelist = component.Whitelist,
-            Blacklist = component.Blacklist
+            Blacklist = component.Blacklist,
+            QuickInsert = component.QuickInsert,
+            AreaInsert = component.AreaInsert,
+            StorageInsertSound = component.StorageInsertSound,
+            StorageRemoveSound = component.StorageRemoveSound,
+            StorageOpenSound = component.StorageOpenSound,
+            StorageCloseSound = component.StorageCloseSound,
+            DefaultStorageOrientation = component.DefaultStorageOrientation,
         };
     }
 
@@ -254,7 +260,7 @@ public abstract class SharedStorageSystem : EntitySystem
 
     private void UpdatePrototypeCache()
     {
-        _defaultStorageMaxItemSize = _prototype.Index<ItemSizePrototype>(DefaultStorageMaxItemSize);
+        _defaultStorageMaxItemSize = _prototype.Index(DefaultStorageMaxItemSize);
         _sortedSizes.Clear();
         _sortedSizes.AddRange(_prototype.EnumeratePrototypes<ItemSizePrototype>());
         _sortedSizes.Sort();
@@ -349,6 +355,44 @@ public abstract class SharedStorageSystem : EntitySystem
         args.Verbs.Add(verb);
     }
 
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because we don't want to copy the references to the items inside the storage.
+    /// <summary>
+    public void CopyComponent(Entity<StorageComponent?> source, EntityUid target)
+    {
+        if (!Resolve(source, ref source.Comp))
+            return;
+
+        var targetComp = EnsureComp<StorageComponent>(target);
+        targetComp.Grid = new List<Box2i>(source.Comp.Grid);
+        targetComp.MaxItemSize = source.Comp.MaxItemSize;
+        targetComp.QuickInsert = source.Comp.QuickInsert;
+        targetComp.QuickInsertCooldown = source.Comp.QuickInsertCooldown;
+        targetComp.OpenUiCooldown = source.Comp.OpenUiCooldown;
+        targetComp.ClickInsert = source.Comp.ClickInsert;
+        targetComp.OpenOnActivate = source.Comp.OpenOnActivate;
+        targetComp.AreaInsert = source.Comp.AreaInsert;
+        targetComp.AreaInsertRadius = source.Comp.AreaInsertRadius;
+        targetComp.Whitelist = source.Comp.Whitelist;
+        targetComp.Blacklist = source.Comp.Blacklist;
+        targetComp.StorageInsertSound = source.Comp.StorageInsertSound;
+        targetComp.StorageRemoveSound = source.Comp.StorageRemoveSound;
+        targetComp.StorageOpenSound = source.Comp.StorageOpenSound;
+        targetComp.StorageCloseSound = source.Comp.StorageCloseSound;
+        targetComp.DefaultStorageOrientation = source.Comp.DefaultStorageOrientation;
+        targetComp.HideStackVisualsWhenClosed = source.Comp.HideStackVisualsWhenClosed;
+        targetComp.SilentStorageUserTag = source.Comp.SilentStorageUserTag;
+        targetComp.ShowVerb = source.Comp.ShowVerb;
+
+        UpdateOccupied((target, targetComp));
+        Dirty(target, targetComp);
+
+        var targetUI = EnsureComp<UserInterfaceComponent>(target);
+
+        UI.SetUi((target, targetUI), StorageComponent.StorageUiKey.Key, new InterfaceData("StorageBoundUserInterface"));
+    }
+
     /// <summary>
     /// Tries to get the storage location of an item.
     /// </summary>
@@ -689,7 +733,7 @@ public abstract class SharedStorageSystem : EntitySystem
             return;
 
         // If the user's active hand is empty, try pick up the item.
-        if (player.Comp.ActiveHandEntity == null)
+        if (!_sharedHandsSystem.TryGetActiveItem(player.AsNullable(), out var activeItem))
         {
             _adminLog.Add(
                 LogType.Storage,
@@ -709,11 +753,11 @@ public abstract class SharedStorageSystem : EntitySystem
         _adminLog.Add(
             LogType.Storage,
             LogImpact.Low,
-            $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(player.Comp.ActiveHandEntity):used}");
+            $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(activeItem):used}");
 
         // Else, interact using the held item
         if (_interactionSystem.InteractUsing(player,
-                player.Comp.ActiveHandEntity.Value,
+                activeItem.Value,
                 item,
                 Transform(item).Coordinates,
                 checkCanInteract: false))
@@ -1208,10 +1252,10 @@ public abstract class SharedStorageSystem : EntitySystem
     {
         if (!Resolve(ent.Owner, ref ent.Comp)
             || !Resolve(player.Owner, ref player.Comp)
-            || player.Comp.ActiveHandEntity == null)
+            || !_sharedHandsSystem.TryGetActiveItem(player, out var activeItem))
             return false;
 
-        var toInsert = player.Comp.ActiveHandEntity;
+        var toInsert = activeItem;
 
         if (!CanInsert(ent, toInsert.Value, out var reason, ent.Comp))
         {
@@ -1219,7 +1263,7 @@ public abstract class SharedStorageSystem : EntitySystem
             return false;
         }
 
-        if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, player.Comp))
+        if (!_sharedHandsSystem.CanDrop(player, toInsert.Value))
         {
             _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), ent, player);
             return false;
@@ -1297,7 +1341,7 @@ public abstract class SharedStorageSystem : EntitySystem
         Angle startAngle;
         if (storageEnt.Comp.DefaultStorageOrientation == null)
         {
-            startAngle = Angle.FromDegrees(-itemEnt.Comp.StoredRotation);
+            startAngle = Angle.Zero;
         }
         else
         {
@@ -1933,7 +1977,7 @@ public abstract class SharedStorageSystem : EntitySystem
 
         if (held)
         {
-            if (!_sharedHandsSystem.IsHolding(player, itemUid, out _))
+            if (!_sharedHandsSystem.IsHolding(player.AsNullable(), itemUid, out _))
                 return false;
         }
         else
@@ -1958,15 +2002,17 @@ public abstract class SharedStorageSystem : EntitySystem
     protected sealed class StorageComponentState : ComponentState
     {
         public Dictionary<NetEntity, ItemStorageLocation> StoredItems = new();
-
         public Dictionary<string, List<ItemStorageLocation>> SavedLocations = new();
-
         public List<Box2i> Grid = new();
-
         public ProtoId<ItemSizePrototype>? MaxItemSize;
-
         public EntityWhitelist? Whitelist;
-
         public EntityWhitelist? Blacklist;
+        public bool QuickInsert;
+        public bool AreaInsert;
+        public SoundSpecifier? StorageInsertSound;
+        public SoundSpecifier? StorageRemoveSound;
+        public SoundSpecifier? StorageOpenSound;
+        public SoundSpecifier? StorageCloseSound;
+        public StorageDefaultOrientation? DefaultStorageOrientation;
     }
 }
diff --git a/Content.Shared/Store/CurrencyPrototype.cs b/Content.Shared/Store/CurrencyPrototype.cs
index 03cc59d2df..fdd113d3a2 100644
--- a/Content.Shared/Store/CurrencyPrototype.cs
+++ b/Content.Shared/Store/CurrencyPrototype.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Store;
 ///     This is separate to the cargo ordering system.
 /// </summary>
 [Prototype]
-[DataDefinition, Serializable, NetSerializable]
+[DataDefinition]
 public sealed partial class CurrencyPrototype : IPrototype
 {
     [ViewVariables]
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index b9e4d092e1..ca75b3185c 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -244,7 +244,6 @@ public partial class ListingData : IEquatable<ListingData>
 ///     Defines a set item listing that is available in a store
 /// </summary>
 [Prototype]
-[Serializable, NetSerializable]
 [DataDefinition]
 public sealed partial class ListingPrototype : ListingData, IPrototype
 {
@@ -425,7 +424,7 @@ public sealed partial class ListingDataWithCostModifiers : ListingData
 ///     how <see cref="StoreDiscountComponent"/> will be filled by respective system.
 /// </summary>
 [Prototype]
-[DataDefinition, Serializable, NetSerializable]
+[DataDefinition]
 public sealed partial class DiscountCategoryPrototype : IPrototype
 {
     [ViewVariables]
diff --git a/Content.Shared/Store/StoreCategoryPrototype.cs b/Content.Shared/Store/StoreCategoryPrototype.cs
index 5713ecd98a..fcf7ec3496 100644
--- a/Content.Shared/Store/StoreCategoryPrototype.cs
+++ b/Content.Shared/Store/StoreCategoryPrototype.cs
@@ -7,7 +7,6 @@ namespace Content.Shared.Store;
 ///     Used to define different categories for a store.
 /// </summary>
 [Prototype]
-[Serializable, NetSerializable, DataDefinition]
 public sealed partial class StoreCategoryPrototype : IPrototype
 {
     private string _name = string.Empty;
diff --git a/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs b/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
index 38dab902e2..564a3f16d4 100644
--- a/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
+++ b/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.StoryGen;
 /// <summary>
 /// Prototype for a story template that can be filled in with words chosen from <see cref="DatasetPrototype"/>s.
 /// </summary>
-[Serializable, Prototype]
+[Prototype]
 public sealed partial class StoryTemplatePrototype : IPrototype
 {
     /// <summary>
diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs
index a851dd5ef6..f40201723b 100644
--- a/Content.Shared/Strip/Components/ThievingComponent.cs
+++ b/Content.Shared/Strip/Components/ThievingComponent.cs
@@ -1,22 +1,44 @@
+using Content.Shared.Alert;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Strip.Components;
 
 /// <summary>
 /// Give this to an entity when you want to decrease stripping times
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(fieldDeltas: true)]
 public sealed partial class ThievingComponent : Component
 {
     /// <summary>
     /// How much the strip time should be shortened by
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("stripTimeReduction")]
+    [DataField, AutoNetworkedField]
     public TimeSpan StripTimeReduction = TimeSpan.FromSeconds(0.5f);
 
     /// <summary>
     /// Should it notify the user if they're stripping a pocket?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("stealthy")]
+    [DataField, AutoNetworkedField]
     public bool Stealthy;
+
+    /// <summary>
+    /// Variable pointing at the Alert modal
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> StealthyAlertProtoId = "Stealthy";
+
+    /// <summary>
+    /// Prevent component replication to clients other than the owner,
+    /// doesn't affect prediction.
+    /// Get mogged.
+    /// </summary>
+    public override bool SendOnlyToOwner => true;
 }
+
+/// <summary>
+/// Event raised to toggle the thieving component.
+/// </summary>
+public sealed partial class ToggleThievingEvent : BaseAlertEvent;
+
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 9688eb7d4e..5443287c32 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -104,8 +104,8 @@ public abstract class SharedStrippableSystem : EntitySystem
 
         var hasEnt = _inventorySystem.TryGetSlotEntity(strippable, args.Slot, out var held, inventory);
 
-        if (userHands.ActiveHandEntity != null && !hasEnt)
-            StartStripInsertInventory((user, userHands), strippable.Owner, userHands.ActiveHandEntity.Value, args.Slot);
+        if (_handsSystem.GetActiveItem((user, userHands)) is { } activeItem && !hasEnt)
+            StartStripInsertInventory((user, userHands), strippable.Owner, activeItem, args.Slot);
         else if (hasEnt)
             StartStripRemoveInventory(user, strippable.Owner, held!.Value, args.Slot);
     }
@@ -124,11 +124,10 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!target.Comp.CanBeStripped)
             return;
 
-        if (!_handsSystem.TryGetHand(target.Owner, handId, out var handSlot))
-            return;
+        var heldEntity = _handsSystem.GetHeldItem(target.Owner, handId);
 
         // Is the target a handcuff?
-        if (TryComp<VirtualItemComponent>(handSlot.HeldEntity, out var virtualItem) &&
+        if (TryComp<VirtualItemComponent>(heldEntity, out var virtualItem) &&
             TryComp<CuffableComponent>(target.Owner, out var cuffable) &&
             _cuffableSystem.GetAllCuffs(cuffable).Contains(virtualItem.BlockingEntity))
         {
@@ -136,10 +135,10 @@ public abstract class SharedStrippableSystem : EntitySystem
             return;
         }
 
-        if (user.Comp.ActiveHandEntity != null && handSlot.HeldEntity == null)
-            StartStripInsertHand(user, target, user.Comp.ActiveHandEntity.Value, handId, targetStrippable);
-        else if (handSlot.HeldEntity != null)
-            StartStripRemoveHand(user, target, handSlot.HeldEntity.Value, handId, targetStrippable);
+        if (_handsSystem.GetActiveItem(user.AsNullable()) is { } activeItem && heldEntity == null)
+            StartStripInsertHand(user, target, activeItem, handId, targetStrippable);
+        else if (heldEntity != null)
+            StartStripRemoveHand(user, target, heldEntity.Value, handId, targetStrippable);
     }
 
     /// <summary>
@@ -154,16 +153,10 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!Resolve(user, ref user.Comp))
             return false;
 
-        if (user.Comp.ActiveHand == null)
+        if (!_handsSystem.TryGetActiveItem(user, out var activeItem) || activeItem != held)
             return false;
 
-        if (user.Comp.ActiveHandEntity == null)
-            return false;
-
-        if (user.Comp.ActiveHandEntity != held)
-            return false;
-
-        if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHand))
+        if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHandId!))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop"));
             return false;
@@ -210,10 +203,14 @@ public abstract class SharedStrippableSystem : EntitySystem
         var (time, stealth) = GetStripTimeModifiers(user, target, held, slotDef.StripTime);
 
         if (!stealth)
+        {
             _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert",
                                                         ("user", Identity.Entity(user, EntityManager)),
-                                                        ("item", user.Comp.ActiveHandEntity!.Value)),
-                                                        target, target, PopupType.Large);
+                                                        ("item", _handsSystem.GetActiveItem((user, user.Comp))!.Value)),
+                                                        target,
+                                                        target,
+                                                        PopupType.Large);
+        }
 
         var prefix = stealth ? "stealthily " : "";
         _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
@@ -246,7 +243,7 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!CanStripInsertInventory(user, target, held, slot))
             return;
 
-        if (!_handsSystem.TryDrop(user, handsComp: user.Comp))
+        if (!_handsSystem.TryDrop(user))
             return;
 
         _inventorySystem.TryEquip(user, target, held, slot, triggerHandContact: true);
@@ -305,10 +302,15 @@ public abstract class SharedStrippableSystem : EntitySystem
             if (IsStripHidden(slotDef, user))
                 _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target, target, PopupType.Large);
             else
+            {
                 _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner",
                                                             ("user", Identity.Entity(user, EntityManager)),
                                                             ("item", item)),
-                                                            target, target, PopupType.Large);
+                                                            target,
+                                                            target,
+                                                            PopupType.Large);
+
+            }
         }
 
         var prefix = stealth ? "stealthily " : "";
@@ -368,23 +370,16 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!target.Comp.CanBeStripped)
             return false;
 
-        if (user.Comp.ActiveHand == null)
+        if (!_handsSystem.TryGetActiveItem(user, out var activeItem) || activeItem != held)
             return false;
 
-        if (user.Comp.ActiveHandEntity == null)
-            return false;
-
-        if (user.Comp.ActiveHandEntity != held)
-            return false;
-
-        if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHand))
+        if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHandId!))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop"));
             return false;
         }
 
-        if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp) ||
-            !_handsSystem.CanPickupToHand(target, user.Comp.ActiveHandEntity.Value, handSlot, checkActionBlocker: false, target.Comp))
+        if (!_handsSystem.CanPickupToHand(target, activeItem.Value, handName, checkActionBlocker: false, target.Comp))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-put-message", ("owner", Identity.Entity(target, EntityManager))));
             return false;
@@ -414,10 +409,15 @@ public abstract class SharedStrippableSystem : EntitySystem
         var (time, stealth) = GetStripTimeModifiers(user, target, null, targetStrippable.HandStripDelay);
 
         if (!stealth)
+        {
             _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert-hand",
                                                         ("user", Identity.Entity(user, EntityManager)),
-                                                        ("item", user.Comp.ActiveHandEntity!.Value)),
-                                                        target, target, PopupType.Large);
+                                                        ("item", _handsSystem.GetActiveItem(user)!.Value)),
+                                                        target,
+                                                        target,
+                                                        PopupType.Large);
+
+        }
 
         var prefix = stealth ? "stealthily " : "";
         _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
@@ -452,7 +452,7 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!CanStripInsertHand(user, target, held, handName))
             return;
 
-        _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: user.Comp);
+        _handsSystem.TryDrop(user, checkActionBlocker: false);
         _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: stealth, animate: !stealth, handsComp: target.Comp);
         _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
@@ -474,22 +474,22 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!target.Comp.CanBeStripped)
             return false;
 
-        if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp))
+        if (!_handsSystem.TryGetHand(target, handName, out _))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", Identity.Entity(target, EntityManager))));
             return false;
         }
 
-        if (HasComp<VirtualItemComponent>(handSlot.HeldEntity))
+        if (!_handsSystem.TryGetHeldItem(target, handName, out var heldEntity))
             return false;
 
-        if (handSlot.HeldEntity == null)
+        if (HasComp<VirtualItemComponent>(heldEntity))
             return false;
 
-        if (handSlot.HeldEntity != item)
+        if (heldEntity != item)
             return false;
 
-        if (!_handsSystem.CanDropHeld(target, handSlot, false))
+        if (!_handsSystem.CanDropHeld(target, handName, false))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop-message", ("owner", Identity.Entity(target, EntityManager))));
             return false;
@@ -519,10 +519,13 @@ public abstract class SharedStrippableSystem : EntitySystem
         var (time, stealth) = GetStripTimeModifiers(user, target, null, targetStrippable.HandStripDelay);
 
         if (!stealth)
+        {
             _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner",
                                                         ("user", Identity.Entity(user, EntityManager)),
                                                         ("item", item)),
-                                                        target, target);
+                                                        target,
+                                                        target);
+        }
 
         var prefix = stealth ? "stealthily " : "";
         _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
@@ -560,7 +563,7 @@ public abstract class SharedStrippableSystem : EntitySystem
         if (!CanStripRemoveHand(user, target, item, handName))
             return;
 
-        _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: target.Comp);
+        _handsSystem.TryDrop(target, item, checkActionBlocker: false);
         _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: !stealth, handsComp: user.Comp);
         _adminLogger.Add(LogType.Stripping, LogImpact.High, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
 
@@ -580,13 +583,17 @@ public abstract class SharedStrippableSystem : EntitySystem
         {
             if ( ev.Event.InsertOrRemove && !CanStripInsertInventory((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) ||
                 !ev.Event.InsertOrRemove && !CanStripRemoveInventory(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName))
-                    ev.Cancel();
+            {
+                ev.Cancel();
+            }
         }
         else
         {
             if ( ev.Event.InsertOrRemove && !CanStripInsertHand((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) ||
                 !ev.Event.InsertOrRemove && !CanStripRemoveHand(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName))
-                    ev.Cancel();
+            {
+                ev.Cancel();
+            }
         }
     }
 
diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs
index 2b3d3b38a0..4a76354844 100644
--- a/Content.Shared/Strip/ThievingSystem.cs
+++ b/Content.Shared/Strip/ThievingSystem.cs
@@ -1,23 +1,54 @@
+using Content.Shared.Alert;
 using Content.Shared.Inventory;
-using Content.Shared.Strip;
 using Content.Shared.Strip.Components;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Strip;
 
-public sealed class ThievingSystem : EntitySystem
+public sealed partial class ThievingSystem : EntitySystem
 {
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<ThievingComponent, BeforeStripEvent>(OnBeforeStrip);
-        SubscribeLocalEvent<ThievingComponent, InventoryRelayedEvent<BeforeStripEvent>>((e, c, ev) => OnBeforeStrip(e, c, ev.Args));
+        SubscribeLocalEvent<ThievingComponent, InventoryRelayedEvent<BeforeStripEvent>>((e, c, ev) =>
+            OnBeforeStrip(e, c, ev.Args));
+        SubscribeLocalEvent<ThievingComponent, ToggleThievingEvent>(OnToggleStealthy);
+        SubscribeLocalEvent<ThievingComponent, ComponentInit>(OnCompInit);
+        SubscribeLocalEvent<ThievingComponent, ComponentRemove>(OnCompRemoved);
     }
 
     private void OnBeforeStrip(EntityUid uid, ThievingComponent component, BeforeStripEvent args)
     {
         args.Stealth |= component.Stealthy;
-        args.Additive -= component.StripTimeReduction;
+        if (args.Stealth)
+        {
+            args.Additive -= component.StripTimeReduction;
+        }
+    }
+
+    private void OnCompInit(Entity<ThievingComponent> entity, ref ComponentInit args)
+    {
+        _alertsSystem.ShowAlert(entity, entity.Comp.StealthyAlertProtoId, 1);
+    }
+
+    private void OnCompRemoved(Entity<ThievingComponent> entity, ref ComponentRemove args)
+    {
+        _alertsSystem.ClearAlert(entity, entity.Comp.StealthyAlertProtoId);
+    }
+
+    private void OnToggleStealthy(Entity<ThievingComponent> ent, ref ToggleThievingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        ent.Comp.Stealthy = !ent.Comp.Stealthy;
+        _alertsSystem.ShowAlert(ent.Owner, ent.Comp.StealthyAlertProtoId, (short)(ent.Comp.Stealthy ? 1 : 0));
+        DirtyField(ent.AsNullable(), nameof(ent.Comp.Stealthy), null);
+
+        args.Handled = true;
     }
 }
diff --git a/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
new file mode 100644
index 0000000000..79b2fb695b
--- /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/KnockedDownComponent.cs b/Content.Shared/Stunnable/KnockedDownComponent.cs
index e4f11b8cda..1ee2255c22 100644
--- a/Content.Shared/Stunnable/KnockedDownComponent.cs
+++ b/Content.Shared/Stunnable/KnockedDownComponent.cs
@@ -1,18 +1,46 @@
-using Robust.Shared.Audio;
+using Content.Shared.DoAfter;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Stunnable;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStunSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas:true), AutoGenerateComponentPause, Access(typeof(SharedStunSystem))]
 public sealed partial class KnockedDownComponent : Component
 {
-    [DataField("helpInterval"), AutoNetworkedField]
-    public float HelpInterval = 1f;
+    /// <summary>
+    /// Game time that we can stand up.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate;
 
-    [DataField("helpAttemptSound")]
-    public SoundSpecifier StunAttemptSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg");
+    /// <summary>
+    /// Should we try to stand up?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AutoStand = true;
 
-    [ViewVariables, AutoNetworkedField]
-    public float HelpTimer = 0f;
+    /// <summary>
+    /// The Standing Up DoAfter.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ushort? DoAfterId;
+
+    /// <summary>
+    /// Friction modifier for knocked down players.
+    /// Makes them accelerate and deccelerate slower.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float FrictionModifier = 1f; // Should add a friction modifier to slipping to compensate for this
+
+    /// <summary>
+    /// Modifier to the maximum movement speed of a knocked down mover.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SpeedModifier = 1f;
+
+    /// <summary>
+    /// How long does it take us to get up?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan GetUpDoAfter = TimeSpan.FromSeconds(1);
 }
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
new file mode 100644
index 0000000000..26e8e47f03
--- /dev/null
+++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
@@ -0,0 +1,519 @@
+using Content.Shared.Alert;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Input;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Rejuvenate;
+using Content.Shared.Standing;
+using Robust.Shared.Audio;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// This contains the knockdown logic for the stun system for organization purposes.
+/// </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 SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
+
+    public static readonly ProtoId<AlertPrototype> KnockdownAlert = "Knockdown";
+
+    private void InitializeKnockdown()
+    {
+        SubscribeLocalEvent<KnockedDownComponent, RejuvenateEvent>(OnRejuvenate);
+
+        // Startup and Shutdown
+        SubscribeLocalEvent<KnockedDownComponent, ComponentInit>(OnKnockInit);
+        SubscribeLocalEvent<KnockedDownComponent, ComponentShutdown>(OnKnockShutdown);
+
+        // Action blockers
+        SubscribeLocalEvent<KnockedDownComponent, BuckleAttemptEvent>(OnBuckleAttempt);
+        SubscribeLocalEvent<KnockedDownComponent, StandAttemptEvent>(OnStandAttempt);
+
+        // Updating movement a friction
+        SubscribeLocalEvent<KnockedDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshKnockedSpeed);
+        SubscribeLocalEvent<KnockedDownComponent, RefreshFrictionModifiersEvent>(OnRefreshFriction);
+        SubscribeLocalEvent<KnockedDownComponent, TileFrictionEvent>(OnKnockedTileFriction);
+
+        // DoAfter event subscriptions
+        SubscribeLocalEvent<KnockedDownComponent, TryStandDoAfterEvent>(OnStandDoAfter);
+
+        // Knockdown Extenders
+        SubscribeLocalEvent<KnockedDownComponent, DamageChangedEvent>(OnDamaged);
+
+        // Handling Alternative Inputs
+        SubscribeAllEvent<ForceStandUpEvent>(OnForceStandup);
+        SubscribeLocalEvent<KnockedDownComponent, KnockedDownAlertEvent>(OnKnockedDownAlert);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.ToggleKnockdown, InputCmdHandler.FromDelegate(HandleToggleKnockdown, handle: false))
+            .Register<SharedStunSystem>();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<KnockedDownComponent>();
+
+        while (query.MoveNext(out var uid, out var knockedDown))
+        {
+            if (!knockedDown.AutoStand || knockedDown.DoAfterId.HasValue || knockedDown.NextUpdate > GameTiming.CurTime)
+                continue;
+
+            TryStanding(uid);
+        }
+    }
+
+    private void OnRejuvenate(Entity<KnockedDownComponent> entity, ref RejuvenateEvent args)
+    {
+        SetKnockdownTime(entity, GameTiming.CurTime);
+
+        if (entity.Comp.AutoStand)
+            RemComp<KnockedDownComponent>(entity);
+    }
+
+    #region Startup and Shutdown
+
+    private void OnKnockInit(Entity<KnockedDownComponent> entity, ref ComponentInit args)
+    {
+        // Other systems should handle dropping held items...
+        _standingState.Down(entity, true, false);
+        RefreshKnockedMovement(entity);
+    }
+
+    private void OnKnockShutdown(Entity<KnockedDownComponent> entity, ref ComponentShutdown args)
+    {
+        // This is jank but if we don't do this it'll still use the knockedDownComponent modifiers for friction because it hasn't been deleted quite yet.
+        entity.Comp.FrictionModifier = 1f;
+        entity.Comp.SpeedModifier = 1f;
+
+        _standingState.Stand(entity);
+        Alerts.ClearAlert(entity, KnockdownAlert);
+    }
+
+    #endregion
+
+    #region API
+
+    /// <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(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))
+            return;
+
+        if (entity.Comp.DoAfterId == null)
+            return;
+
+        DoAfter.Cancel(entity.Owner, entity.Comp.DoAfterId.Value);
+        entity.Comp.DoAfterId = null;
+        DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.DoAfterId));
+    }
+
+    /// <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)
+            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));
+    }
+
+    /// <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)
+        {
+            SetKnockdownTime(entity, GameTiming.CurTime + time);
+            return;
+        }
+
+        entity.Comp.NextUpdate += 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
+
+    private void HandleToggleKnockdown(ICommonSession? session)
+    {
+        if (session is not { } playerSession)
+            return;
+
+        if (playerSession.AttachedEntity is not { Valid: true } playerEnt || !Exists(playerEnt))
+            return;
+
+        if (!TryComp<KnockedDownComponent>(playerEnt, out var component))
+        {
+            TryKnockdown(playerEnt, DefaultKnockedDuration, true, false, false); // TODO: Unhardcode these numbers
+            return;
+        }
+
+        var stand = !component.DoAfterId.HasValue;
+        SetAutoStand(playerEnt, stand);
+
+        if (!stand || !TryStanding(playerEnt))
+            CancelKnockdownDoAfter((playerEnt, component));
+    }
+
+    public bool TryStanding(Entity<KnockedDownComponent?, StandingStateComponent?> entity)
+    {
+        // 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;
+
+        if (!TryStand((entity.Owner, entity.Comp1)))
+            return false;
+
+        var ev = new GetStandUpTimeEvent(entity.Comp2.StandTime);
+        RaiseLocalEvent(entity, ref ev);
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, entity, ev.DoAfterTime, new TryStandDoAfterEvent(), entity, entity)
+        {
+            BreakOnDamage = true,
+            DamageThreshold = 5,
+            CancelDuplicate = true,
+            RequireCanInteract = false,
+            BreakOnHandChange = true
+        };
+
+        // If we try standing don't try standing again
+        if (!DoAfter.TryStartDoAfter(doAfterArgs, out var doAfterId))
+            return false;
+
+        entity.Comp1.DoAfterId = doAfterId.Value.Index;
+        DirtyField(entity, entity.Comp1, nameof(KnockedDownComponent.DoAfterId));
+        return true;
+    }
+
+    /// <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 (entity.Comp.NextUpdate > GameTiming.CurTime)
+            return false;
+
+        if (!Blocker.CanMove(entity))
+            return false;
+
+        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 StandingBlocked(Entity<KnockedDownComponent> entity)
+    {
+        if (!TryStand(entity))
+            return true;
+
+        if (!IntersectingStandingColliders(entity.Owner))
+            return false;
+
+        _popup.PopupClient(Loc.GetString("knockdown-component-stand-no-room"), entity, entity, PopupType.SmallCaution);
+        SetAutoStand(entity.Owner);
+        return true;
+
+    }
+
+    private void OnForceStandup(ForceStandUpEvent msg, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is not {} user)
+            return;
+
+        ForceStandUp(user);
+    }
+
+    public void ForceStandUp(Entity<KnockedDownComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp, false))
+            return;
+
+        // That way if we fail to stand, the game will try to stand for us when we are able to
+        SetAutoStand(entity, true);
+
+        if (!HasComp<StandingStateComponent>(entity) || StandingBlocked((entity, entity.Comp)))
+            return;
+
+        if (!_hands.TryGetEmptyHand(entity.Owner, out _))
+            return;
+
+        if (!TryForceStand(entity.Owner))
+            return;
+
+        // If we have a DoAfter, cancel it
+        CancelKnockdownDoAfter(entity);
+        // Remove Component
+        RemComp<KnockedDownComponent>(entity);
+
+        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(entity):user} has force stood up from knockdown.");
+    }
+
+    private void OnKnockedDownAlert(Entity<KnockedDownComponent> entity, ref KnockedDownAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // If we're already trying to stand, or we fail to stand try forcing it
+        if (!TryStanding(entity.Owner))
+            ForceStandUp((entity.Owner, entity.Comp));
+
+        args.Handled = true;
+    }
+
+    private bool TryForceStand(Entity<StaminaComponent?> entity)
+    {
+        // Can't force stand if no Stamina.
+        if (!Resolve(entity, ref entity.Comp, false))
+            return false;
+
+        var ev = new TryForceStandEvent(entity.Comp.ForceStandStamina);
+        RaiseLocalEvent(entity, ref ev);
+
+        if (!Stamina.TryTakeStamina(entity, ev.Stamina, entity.Comp, visual: true))
+        {
+            _popup.PopupClient(Loc.GetString("knockdown-component-pushup-failure"), entity, entity, PopupType.MediumCaution);
+            return false;
+        }
+
+        _popup.PopupClient(Loc.GetString("knockdown-component-pushup-success"), entity, entity);
+        _audio.PlayPredicted(entity.Comp.ForceStandSuccessSound, entity.Owner, entity.Owner, AudioParams.Default.WithVariation(0.025f).WithVolume(5f));
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Checks if standing would cause us to collide with something and potentially get stuck.
+    ///     Returns true if we will collide with something, and false if we will not.
+    /// </summary>
+    private bool IntersectingStandingColliders(Entity<TransformComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        var intersecting = _physics.GetEntitiesIntersectingBody(entity, StandingStateSystem.StandingCollisionLayer, false);
+
+        if (intersecting.Count == 0)
+            return false;
+
+        var fixtureQuery = GetEntityQuery<FixturesComponent>();
+        var xformQuery = GetEntityQuery<TransformComponent>();
+
+        var ourAABB = _entityLookup.GetAABBNoContainer(entity, entity.Comp.LocalPosition, entity.Comp.LocalRotation);
+
+        foreach (var ent in intersecting)
+        {
+            if (!fixtureQuery.TryGetComponent(ent, out var fixtures))
+                continue;
+
+            if (!xformQuery.TryComp(ent, out var xformComp))
+                continue;
+
+            var xform = new Transform(xformComp.LocalPosition, xformComp.LocalRotation);
+
+            foreach (var fixture in fixtures.Fixtures.Values)
+            {
+                if (!fixture.Hard || (fixture.CollisionMask & StandingStateSystem.StandingCollisionLayer) != StandingStateSystem.StandingCollisionLayer)
+                    continue;
+
+                for (var i = 0; i < fixture.Shape.ChildCount; i++)
+                {
+                    var intersection = fixture.Shape.ComputeAABB(xform, i).IntersectPercentage(ourAABB);
+                    if (intersection > 0.1f)
+                        return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    #endregion
+
+    #region Knockdown Extenders
+
+    private void OnDamaged(Entity<KnockedDownComponent> entity, ref DamageChangedEvent args)
+    {
+        // We only want to extend our knockdown timer if it would've prevented us from standing up
+        if (!args.InterruptsDoAfters || !args.DamageIncreased || args.DamageDelta == null || GameTiming.ApplyingState)
+            return;
+
+        if (args.DamageDelta.GetTotal() >= KnockdownDamageThreshold) // TODO: Unhardcode this
+            SetKnockdownTime(entity, GameTiming.CurTime + DefaultKnockedDuration);
+    }
+
+    #endregion
+
+    #region Action Blockers
+
+    private void OnStandAttempt(Entity<KnockedDownComponent> entity, ref StandAttemptEvent args)
+    {
+        if (entity.Comp.LifeStage <= ComponentLifeStage.Running)
+            args.Cancel();
+    }
+
+    private void OnBuckleAttempt(Entity<KnockedDownComponent> entity, ref BuckleAttemptEvent args)
+    {
+        if (args.User == entity && entity.Comp.NextUpdate > GameTiming.CurTime)
+            args.Cancelled = true;
+    }
+
+    #endregion
+
+    #region DoAfter
+
+    private void OnStandDoAfter(Entity<KnockedDownComponent> entity, ref TryStandDoAfterEvent args)
+    {
+        entity.Comp.DoAfterId = null;
+
+        if (args.Cancelled || StandingBlocked(entity))
+        {
+            DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.DoAfterId));
+            return;
+        }
+
+        RemComp<KnockedDownComponent>(entity);
+
+        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(entity):user} has stood up from knockdown.");
+    }
+
+    #endregion
+
+    #region Movement and Friction
+
+    private void RefreshKnockedMovement(Entity<KnockedDownComponent> ent)
+    {
+        var ev = new KnockedDownRefreshEvent();
+        RaiseLocalEvent(ent, ref ev);
+
+        ent.Comp.SpeedModifier = ev.SpeedModifier;
+        ent.Comp.FrictionModifier = ev.FrictionModifier;
+
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(ent);
+        _movementSpeedModifier.RefreshFrictionModifiers(ent);
+    }
+
+    private void OnRefreshKnockedSpeed(Entity<KnockedDownComponent> entity, ref RefreshMovementSpeedModifiersEvent args)
+    {
+        args.ModifySpeed(entity.Comp.SpeedModifier);
+    }
+
+    private void OnKnockedTileFriction(Entity<KnockedDownComponent> entity, ref TileFrictionEvent args)
+    {
+        args.Modifier *= entity.Comp.FrictionModifier;
+    }
+
+    private void OnRefreshFriction(Entity<KnockedDownComponent> entity, ref RefreshFrictionModifiersEvent args)
+    {
+        args.ModifyFriction(entity.Comp.FrictionModifier);
+        args.ModifyAcceleration(entity.Comp.FrictionModifier);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
new file mode 100644
index 0000000000..4d49621a8a
--- /dev/null
+++ b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Mobs;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Stunnable;
+
+public abstract partial class SharedStunSystem
+{
+    public void InitializeAppearance()
+    {
+        SubscribeLocalEvent<StunVisualsComponent, MobStateChangedEvent>(OnStunMobStateChanged);
+        SubscribeLocalEvent<StunVisualsComponent, SleepStateChangedEvent>(OnSleepStateChanged);
+    }
+
+    private bool GetStarsData(Entity<StunVisualsComponent, StunnedComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp2, false))
+            return false;
+
+        return Blocker.CanConsciouslyPerformAction(entity);
+    }
+
+    private void OnStunMobStateChanged(Entity<StunVisualsComponent> entity, ref MobStateChangedEvent args)
+    {
+        Appearance.SetData(entity, StunVisuals.SeeingStars, GetStarsData(entity));
+    }
+
+    private void OnSleepStateChanged(Entity<StunVisualsComponent> entity, ref SleepStateChangedEvent args)
+    {
+        Appearance.SetData(entity, StunVisuals.SeeingStars, GetStarsData(entity));
+    }
+
+    public void TrySeeingStars(Entity<AppearanceComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        // Here so server can tell the client to do things
+        // Don't dirty the component if we don't need to
+        if (!Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars, entity.Comp) && stars)
+            return;
+
+        if (!Blocker.CanConsciouslyPerformAction(entity))
+            return;
+
+        Appearance.SetData(entity, StunVisuals.SeeingStars, true);
+        Dirty(entity);
+    }
+
+    [Serializable, NetSerializable, Flags]
+    public enum StunVisuals
+    {
+        SeeingStars,
+    }
+}
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index fadefd1001..bffa1a75c4 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -1,64 +1,52 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Interaction;
+using Content.Shared.Alert;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
+using Content.Shared.DoAfter;
 using Content.Shared.Hands;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 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.Components;
 using Robust.Shared.Physics.Events;
-using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Stunnable;
 
-public abstract class SharedStunSystem : EntitySystem
+public abstract partial class SharedStunSystem : EntitySystem
 {
-    [Dependency] private readonly ActionBlockerSystem _blocker = default!;
+    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] 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] private readonly EntityWhitelistSystem _entityWhitelist = default!;
-    [Dependency] private readonly SharedStandingStateSystem _standingState = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
-
-    /// <summary>
-    /// Friction modifier for knocked down players.
-    /// Doesn't make them faster but makes them slow down... slower.
-    /// </summary>
-    public const float KnockDownModifier = 0.2f;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
+    [Dependency] protected readonly SharedStaminaSystem Stamina = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<KnockedDownComponent, ComponentInit>(OnKnockInit);
-        SubscribeLocalEvent<KnockedDownComponent, ComponentShutdown>(OnKnockShutdown);
-        SubscribeLocalEvent<KnockedDownComponent, StandAttemptEvent>(OnStandAttempt);
-
-        SubscribeLocalEvent<SlowedDownComponent, ComponentInit>(OnSlowInit);
-        SubscribeLocalEvent<SlowedDownComponent, ComponentShutdown>(OnSlowRemove);
-
         SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
-        SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(UpdateCanMove);
+        SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(OnStunShutdown);
 
         SubscribeLocalEvent<StunOnContactComponent, StartCollideEvent>(OnStunOnContactCollide);
 
-        // helping people up if they're knocked down
-        SubscribeLocalEvent<KnockedDownComponent, InteractHandEvent>(OnInteractHand);
-        SubscribeLocalEvent<SlowedDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
-
-        SubscribeLocalEvent<KnockedDownComponent, TileFrictionEvent>(OnKnockedTileFriction);
-
         // Attempt event subscriptions.
         SubscribeLocalEvent<StunnedComponent, ChangeDirectionAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<StunnedComponent, UpdateCanMoveEvent>(OnMoveAttempt);
@@ -71,6 +59,17 @@ public abstract class SharedStunSystem : EntitySystem
         SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
         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();
     }
 
     private void OnAttemptInteract(Entity<StunnedComponent> ent, ref InteractionAttemptEvent args)
@@ -80,10 +79,6 @@ public abstract class SharedStunSystem : EntitySystem
 
     private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobStateChangedEvent args)
     {
-        if (!TryComp<StatusEffectsComponent>(uid, out var status))
-        {
-            return;
-        }
         switch (args.NewMobState)
         {
             case MobState.Alive:
@@ -92,12 +87,12 @@ public abstract class SharedStunSystem : EntitySystem
                 }
             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:
@@ -107,9 +102,16 @@ public abstract class SharedStunSystem : EntitySystem
 
     }
 
+    private void OnStunShutdown(Entity<StunnedComponent> ent, ref ComponentShutdown args)
+    {
+        // This exists so the client can end their funny animation if they're playing one.
+        UpdateCanMove(ent, ent.Comp, args);
+        Appearance.RemoveData(ent, StunVisuals.SeeingStars);
+    }
+
     private void UpdateCanMove(EntityUid uid, StunnedComponent component, EntityEventArgs args)
     {
-        _blocker.UpdateCanMove(uid);
+        Blocker.UpdateCanMove(uid);
     }
 
     private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
@@ -120,207 +122,181 @@ public abstract class SharedStunSystem : EntitySystem
         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, true, status);
-    }
-
-    private void OnKnockInit(EntityUid uid, KnockedDownComponent component, ComponentInit args)
-    {
-        _standingState.Down(uid);
-    }
-
-    private void OnKnockShutdown(EntityUid uid, KnockedDownComponent component, ComponentShutdown args)
-    {
-        // Sunrise-Edit
-        //_standingState.Stand(uid);
-    }
-
-    private void OnStandAttempt(EntityUid uid, KnockedDownComponent component, StandAttemptEvent args)
-    {
-        if (component.LifeStage <= ComponentLifeStage.Running)
-            args.Cancel();
-    }
-
-    private void OnSlowInit(EntityUid uid, SlowedDownComponent component, ComponentInit args)
-    {
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
-    private void OnSlowRemove(EntityUid uid, SlowedDownComponent component, ComponentShutdown args)
-    {
-        component.SprintSpeedModifier = 1f;
-        component.WalkSpeedModifier = 1f;
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
-    private void OnRefreshMovespeed(EntityUid uid, SlowedDownComponent component, RefreshMovementSpeedModifiersEvent args)
-    {
-        args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
+        TryUpdateStunDuration(args.OtherEntity, ent.Comp.Duration);
+        TryKnockdown(args.OtherEntity, ent.Comp.Duration, true, force: true);
     }
 
     // TODO STUN: Make events for different things. (Getting modifiers, attempt events, informative events...)
-
-    /// <summary>
-    ///     Stuns the entity, disallowing it from doing many interactions temporarily.
-    /// </summary>
-    public bool TryStun(EntityUid uid, TimeSpan time, bool refresh,
-        StatusEffectsComponent? status = null)
+    public bool TryAddStunDuration(EntityUid uid, TimeSpan duration)
     {
-        if (time <= TimeSpan.Zero)
+        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration))
             return false;
 
-        if (!Resolve(uid, ref status, false))
+        OnStunnedSuccessfully(uid, duration);
+        return true;
+    }
+
+    public bool TryUpdateStunDuration(EntityUid uid, TimeSpan? duration)
+    {
+        if (!_status.TryUpdateStatusEffectDuration(uid, StunId, duration))
             return false;
 
-        if (!_statusEffect.TryAddStatusEffect<StunnedComponent>(uid, "Stun", time, refresh))
-            return false;
+        OnStunnedSuccessfully(uid, duration);
+        return true;
+    }
 
-        var ev = new StunnedEvent();
+    private void OnStunnedSuccessfully(EntityUid uid, TimeSpan? duration)
+    {
+        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);
 
-        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} stunned for {time.Seconds} seconds");
+        var timeForLogs = duration.HasValue
+            ? duration.Value.Seconds.ToString()
+            : "Infinite";
+        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} stunned for {timeForLogs} seconds");
+    }
+
+    public bool TryAddKnockdownDuration(EntityUid uid, TimeSpan duration)
+    {
+        if (!_status.TryAddStatusEffectDuration(uid, KnockdownId, duration))
+            return false;
+
+        TryKnockdown(uid, duration, true, force: true);
+
         return true;
+
+    }
+
+    public bool TryUpdateKnockdownDuration(EntityUid uid, TimeSpan? duration)
+    {
+        if (!_status.TryUpdateStatusEffectDuration(uid, KnockdownId, duration))
+            return false;
+
+        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,
-        StatusEffectsComponent? status = null)
+    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.TryAddStatusEffect<KnockedDownComponent>(uid, "KnockedDown", time, refresh))
-            return false;
+        if (!force)
+        {
+            var evAttempt = new KnockDownAttemptEvent(autoStand, drop);
+            RaiseLocalEvent(entity, ref evAttempt);
 
-        var ev = new KnockedDownEvent();
-        RaiseLocalEvent(uid, ref ev);
+            if (evAttempt.Cancelled)
+                return false;
+
+            autoStand = evAttempt.AutoStand;
+            drop = evAttempt.Drop;
+        }
+
+        Knockdown(entity!, time, refresh, autoStand, drop);
 
         return true;
     }
 
-    /// <summary>
-    ///     Applies knockdown and stun to the entity temporarily.
-    /// </summary>
-    public bool TryParalyze(EntityUid uid, TimeSpan time, bool refresh,
-        StatusEffectsComponent? status = null)
+    private void Knockdown(Entity<StandingStateComponent> entity, TimeSpan? time, bool refresh, bool autoStand, bool drop)
     {
-        if (!Resolve(uid, ref status, false))
-            return false;
+        // Initialize our component with the relevant data we need if we don't have it
+        if (EnsureComp<KnockedDownComponent>(entity, out var 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);
+            }
 
-        return TryKnockdown(uid, time, refresh, status) && TryStun(uid, time, refresh, status);
+            // Only update Autostand value if it's our first time being knocked down...
+            SetAutoStand((entity, component), autoStand);
+        }
+
+        var knockedEv = new KnockedDownEvent(time);
+        RaiseLocalEvent(entity, ref knockedEv);
+
+        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");
+
+        Alerts.ShowAlert(entity, KnockdownAlert, null, (GameTiming.CurTime, component.NextUpdate));
     }
 
-    /// <summary>
-    ///     Slows down the mob's walking/running speed temporarily
-    /// </summary>
-    public bool TrySlowdown(EntityUid uid, TimeSpan time, bool refresh,
-        float walkSpeedMultiplier = 1f, float runSpeedMultiplier = 1f,
-        StatusEffectsComponent? status = null)
+    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);
 
-        if (time <= TimeSpan.Zero)
-            return false;
+        return knockdown || stunned;
+    }
 
-        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?
-            walkSpeedMultiplier = Math.Clamp(walkSpeedMultiplier, 0f, 1f);
-            runSpeedMultiplier = Math.Clamp(runSpeedMultiplier, 0f, 1f);
+    public bool TryUpdateParalyzeDuration(EntityUid uid, TimeSpan? duration)
+    {
+        var knockdown = TryUpdateKnockdownDuration(uid, duration);
+        var stunned = TryUpdateStunDuration(uid, duration);
 
-            slowed.WalkSpeedModifier *= walkSpeedMultiplier;
-            slowed.SprintSpeedModifier *= runSpeedMultiplier;
+        return knockdown || stunned;
+    }
 
-            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+    public bool TryUnstun(Entity<StunnedComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp, logMissing: false))
             return true;
-        }
 
-        return false;
+        var ev = new StunEndAttemptEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        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);
     }
 
-    private void OnInteractHand(EntityUid uid, KnockedDownComponent knocked, InteractHandEvent args)
+    private void OnStunEndAttempt(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectRelayedEvent<StunEndAttemptEvent> args)
     {
-        if (args.Handled || knocked.HelpTimer > 0f)
+        if (args.Args.Cancelled)
             return;
 
-        // TODO: This should be an event.
-        if (HasComp<SleepingComponent>(uid))
-            return;
-
-        // Set it to half the help interval so helping is actually useful...
-        knocked.HelpTimer = knocked.HelpInterval / 2f;
-
-        _statusEffect.TryRemoveTime(uid, "KnockedDown", TimeSpan.FromSeconds(knocked.HelpInterval));
-        _audio.PlayPredicted(knocked.StunAttemptSound, uid, args.User);
-        Dirty(uid, knocked);
-
-        args.Handled = true;
+        var ev = args.Args;
+        ev.Cancelled = true;
+        args.Args = ev;
     }
 
-    private void OnKnockedTileFriction(EntityUid uid, KnockedDownComponent component, ref TileFrictionEvent args)
+    private void OnStandUpAttempt(Entity<KnockdownStatusEffectComponent> entity, ref StatusEffectRelayedEvent<StandUpAttemptEvent> args)
     {
-        args.Modifier *= KnockDownModifier;
+        if (args.Args.Cancelled)
+            return;
+
+        var ev = args.Args;
+        ev.Cancelled = true;
+        args.Args = ev;
     }
 
     #region Attempt Event Handling
@@ -361,15 +337,3 @@ public abstract class SharedStunSystem : EntitySystem
 
     #endregion
 }
-
-/// <summary>
-///     Raised directed on an entity when it is stunned.
-/// </summary>
-[ByRefEvent]
-public record struct StunnedEvent;
-
-/// <summary>
-///     Raised directed on an entity when it is knocked down.
-/// </summary>
-[ByRefEvent]
-public record struct KnockedDownEvent;
diff --git a/Content.Shared/Stunnable/SlowedDownComponent.cs b/Content.Shared/Stunnable/SlowedDownComponent.cs
deleted file mode 100644
index c4822b1eae..0000000000
--- 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/StunOnContactComponent.cs b/Content.Shared/Stunnable/StunOnContactComponent.cs
index cc4af53b3b..eae279d58a 100644
--- a/Content.Shared/Stunnable/StunOnContactComponent.cs
+++ b/Content.Shared/Stunnable/StunOnContactComponent.cs
@@ -18,6 +18,18 @@ public sealed partial class StunOnContactComponent : Component
     [DataField]
     public TimeSpan Duration = TimeSpan.FromSeconds(5);
 
+    /// <summary>
+    /// Should the stun applied refresh?
+    /// </summary>
+    [DataField]
+    public bool Refresh = true;
+
+    /// <summary>
+    /// Should the stunned entity try to stand up when knockdown ends?
+    /// </summary>
+    [DataField]
+    public bool AutoStand = true;
+
     [DataField]
     public EntityWhitelist Blacklist = new();
 }
diff --git a/Content.Shared/Stunnable/StunVisualsComponent.cs b/Content.Shared/Stunnable/StunVisualsComponent.cs
new file mode 100644
index 0000000000..6f1070a558
--- /dev/null
+++ b/Content.Shared/Stunnable/StunVisualsComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// This is used to listen to incoming events from the AppearanceSystem
+/// </summary>
+[RegisterComponent]
+public sealed partial class StunVisualsComponent : Component
+{
+    [DataField]
+    public ResPath StarsPath = new ("Mobs/Effects/stunned.rsi");
+
+    [DataField]
+    public string State = "stunned";
+}
diff --git a/Content.Shared/Stunnable/StunnableEvents.cs b/Content.Shared/Stunnable/StunnableEvents.cs
new file mode 100644
index 0000000000..f4a0191c92
--- /dev/null
+++ b/Content.Shared/Stunnable/StunnableEvents.cs
@@ -0,0 +1,95 @@
+using Content.Shared.Alert;
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// This contains all the events raised by the SharedStunSystem
+/// </summary>
+
+/// <summary>
+///     Raised directed on an entity when it is stunned.
+/// </summary>
+[ByRefEvent]
+public record struct StunnedEvent;
+
+/// <summary>
+///     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 AutoStand, bool Drop)
+{
+    public bool Cancelled;
+}
+
+/// <summary>
+///     Raised directed on an entity when it is knocked down.
+/// </summary>
+[ByRefEvent]
+public record struct KnockedDownEvent(TimeSpan? Time);
+
+/// <summary>
+///     Raised on an entity that needs to refresh its knockdown modifiers
+/// </summary>
+[ByRefEvent]
+public record struct KnockedDownRefreshEvent()
+{
+    public float SpeedModifier = 1f;
+    public float FrictionModifier = 1f;
+}
+
+/// <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 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 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 51a27ac90a..8fb53e1a68 100644
--- a/Content.Shared/Stunnable/StunnedComponent.cs
+++ b/Content.Shared/Stunnable/StunnedComponent.cs
@@ -2,7 +2,8 @@ using Robust.Shared.GameStates;
 
 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
-{
-}
+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 0000000000..62b34967e5
--- /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/SubFloor/SharedSubFloorHideSystem.cs b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
index c7edf01499..a4fa463ee0 100644
--- a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Audio;
 using Content.Shared.Construction.Components;
 using Content.Shared.Explosion;
 using Content.Shared.Eye;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
 using Content.Shared.Popups;
@@ -83,6 +84,10 @@ namespace Content.Shared.SubFloor
 
         private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, ref GettingInteractedWithAttemptEvent args)
         {
+            // Allow admins (e.g., mappers/aghosts) to twiddle with stuff under subfloors
+            if (HasComp<BypassInteractionChecksComponent>(args.Uid))
+                return;
+
             // No interactions with entities hidden under floor tiles.
             if (component.BlockInteractions && component.IsUnderCover)
                 args.Cancelled = true;
@@ -92,13 +97,13 @@ namespace Content.Shared.SubFloor
         {
             UpdateFloorCover(uid, component);
             UpdateAppearance(uid, component);
-            EntityManager.EnsureComponent<CollideOnAnchorComponent>(uid);
+            EnsureComp<CollideOnAnchorComponent>(uid);
         }
 
         private void OnSubFloorTerminating(EntityUid uid, SubFloorHideComponent component, ComponentShutdown _)
         {
             // If component is being deleted don't need to worry about updating any component stuff because it won't matter very shortly.
-            if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating)
+            if (Comp<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating)
                 return;
 
             // Regardless of whether we're on a subfloor or not, unhide.
diff --git a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
index 889dd17e51..b7c723dbcf 100644
--- a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
+++ b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared.DeviceNetwork;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
@@ -95,11 +97,11 @@ public sealed class SurveillanceCameraSetupBoundUiState : BoundUserInterfaceStat
 {
     public string Name { get; }
     public uint Network { get; }
-    public List<string> Networks { get; }
+    public List<ProtoId<DeviceFrequencyPrototype>> Networks { get; }
     public bool NameDisabled { get; }
     public bool NetworkDisabled { get; }
 
-    public SurveillanceCameraSetupBoundUiState(string name, uint network, List<string> networks, bool nameDisabled, bool networkDisabled)
+    public SurveillanceCameraSetupBoundUiState(string name, uint network, List<ProtoId<DeviceFrequencyPrototype>> networks, bool nameDisabled, bool networkDisabled)
     {
         Name = name;
         Network = network;
diff --git a/Content.Shared/Tabletop/SharedTabletopSystem.cs b/Content.Shared/Tabletop/SharedTabletopSystem.cs
index 03dd094805..ab6fe94fdb 100644
--- a/Content.Shared/Tabletop/SharedTabletopSystem.cs
+++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs
@@ -39,7 +39,7 @@ namespace Content.Shared.Tabletop
                 return;
 
             // Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map)
-            var transform = EntityManager.GetComponent<TransformComponent>(moved);
+            var transform = Comp<TransformComponent>(moved);
             Transforms.SetParent(moved, transform, _mapSystem.GetMapOrInvalid(transform.MapID));
             Transforms.SetLocalPositionNoLerp(moved, msg.Coordinates.Position, transform);
         }
diff --git a/Content.Shared/Telephone/TelephoneComponent.cs b/Content.Shared/Telephone/TelephoneComponent.cs
index c24840ce01..89748d78a4 100644
--- a/Content.Shared/Telephone/TelephoneComponent.cs
+++ b/Content.Shared/Telephone/TelephoneComponent.cs
@@ -81,12 +81,6 @@ public sealed partial class TelephoneComponent : Component
     [DataField]
     public float ListeningRange = 2;
 
-    /// <summary>
-    /// Specifies whether this telephone require power to fucntion
-    /// </summary>
-    [DataField]
-    public bool RequiresPower = true;
-
     /// <summary>
     /// This telephone should not appear on public telephone directories
     /// </summary>
diff --git a/Content.Shared/Throwing/CatchAttemptEvent.cs b/Content.Shared/Throwing/CatchAttemptEvent.cs
new file mode 100644
index 0000000000..03206bdcd9
--- /dev/null
+++ b/Content.Shared/Throwing/CatchAttemptEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Throwing;
+
+/// <summary>
+/// Raised on someone when they try to catch an item.
+/// </summary>
+[ByRefEvent]
+public record struct CatchAttemptEvent(EntityUid Item, float CatchChance, bool Cancelled = false);
diff --git a/Content.Shared/Throwing/CatchableComponent.cs b/Content.Shared/Throwing/CatchableComponent.cs
new file mode 100644
index 0000000000..ce68374440
--- /dev/null
+++ b/Content.Shared/Throwing/CatchableComponent.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Throwing;
+
+/// <summary>
+/// Allows this entity to be caught in your hands when someone else throws it at you.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CatchableComponent : Component
+{
+    /// <summary>
+    /// If true this item can only be caught while in combat mode.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequireCombatMode;
+
+    /// <summary>
+    /// The chance of successfully catching.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float CatchChance = 1.0f;
+
+    /// <summary>
+    /// Optional whitelist for who can catch this item.
+    /// </summary>
+    /// <summary>
+    /// Example usecase: Only someone who knows martial arts can catch grenades.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? CatcherWhitelist;
+
+    /// <summary>
+    /// The sound to play when successfully catching.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? CatchSuccessSound;
+}
diff --git a/Content.Shared/Throwing/CatchableSystem.cs b/Content.Shared/Throwing/CatchableSystem.cs
new file mode 100644
index 0000000000..8f2fd355ba
--- /dev/null
+++ b/Content.Shared/Throwing/CatchableSystem.cs
@@ -0,0 +1,84 @@
+using Content.Shared.CombatMode;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Throwing;
+
+public sealed partial class CatchableSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ThrownItemSystem _thrown = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+
+    private EntityQuery<HandsComponent> _handsQuery;
+    private EntityQuery<CombatModeComponent> _combatModeQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CatchableComponent, ThrowDoHitEvent>(OnDoHit);
+
+        _handsQuery = GetEntityQuery<HandsComponent>();
+        _combatModeQuery = GetEntityQuery<CombatModeComponent>();
+    }
+
+    private void OnDoHit(Entity<CatchableComponent> ent, ref ThrowDoHitEvent args)
+    {
+        if (!_handsQuery.TryGetComponent(args.Target, out var handsComp))
+            return; // don't do anything for walls etc
+
+        // Is the catcher in combat mode if required?
+        if (ent.Comp.RequireCombatMode && (!_combatModeQuery.TryComp(args.Target, out var combatModeComp) || !combatModeComp.IsInCombatMode))
+            return;
+
+        // Is the catcher able to catch this item?
+        if (!_whitelist.IsWhitelistPassOrNull(ent.Comp.CatcherWhitelist, args.Target))
+            return;
+
+        var attemptEv = new CatchAttemptEvent(ent.Owner, ent.Comp.CatchChance);
+        RaiseLocalEvent(args.Target, ref attemptEv);
+
+        if (attemptEv.Cancelled)
+            return;
+
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var seed = HashCode.Combine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
+        var rand = new System.Random(seed);
+        if (!rand.Prob(ent.Comp.CatchChance))
+            return;
+
+        // Try to catch!
+        if (!_hands.TryPickupAnyHand(args.Target, ent.Owner, handsComp: handsComp, animate: false))
+            return; // The hands are full!
+
+        // Success!
+
+        // We picked it up already but we still have to raise the throwing stop (but not the landing) events at the right time,
+        // otherwise it will raise the events for that later while still in your hand
+        _thrown.StopThrow(ent.Owner, args.Component);
+
+        // Collisions don't work properly with PopupPredicted or PlayPredicted.
+        // So we make this server only.
+        if (_net.IsClient)
+            return;
+
+        var selfMessage = Loc.GetString("catchable-component-success-self", ("item", ent.Owner), ("catcher", Identity.Entity(args.Target, EntityManager)));
+        var othersMessage = Loc.GetString("catchable-component-success-others", ("item", ent.Owner), ("catcher", Identity.Entity(args.Target, EntityManager)));
+        _popup.PopupEntity(selfMessage, args.Target, args.Target);
+        _popup.PopupEntity(othersMessage, args.Target, Filter.PvsExcept(args.Target), true);
+        _audio.PlayPvs(ent.Comp.CatchSuccessSound, args.Target);
+    }
+}
diff --git a/Content.Shared/Throwing/ThrowAttemptEvent.cs b/Content.Shared/Throwing/ThrowAttemptEvent.cs
index dfb3dca5c7..994206afa5 100644
--- a/Content.Shared/Throwing/ThrowAttemptEvent.cs
+++ b/Content.Shared/Throwing/ThrowAttemptEvent.cs
@@ -25,4 +25,13 @@
     /// Raised when we try to pushback an entity from throwing
     /// </summary>
     public sealed class ThrowPushbackAttemptEvent : CancellableEntityEventArgs {}
+
+    /// <summary>
+    /// Raised on an entity that is being pushed from a thrown entity
+    /// </summary>
+    [ByRefEvent]
+    public record struct ThrowerImpulseEvent()
+    {
+        public bool Push;
+    };
 }
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 2d01810d8b..ceb9cf8bfb 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -222,17 +222,21 @@ public sealed class ThrowingSystem : EntitySystem
             _recoil.KickCamera(user.Value, -direction * 0.04f);
 
         // Give thrower an impulse in the other direction
-        if (pushbackRatio != 0.0f &&
-            physics.Mass > 0f &&
-            TryComp(user.Value, out PhysicsComponent? userPhysics) &&
-            _gravity.IsWeightless(user.Value, userPhysics))
-        {
-            var msg = new ThrowPushbackAttemptEvent();
-            RaiseLocalEvent(uid, msg);
-            const float massLimit = 5f;
+        if (pushbackRatio == 0.0f ||
+            physics.Mass == 0f ||
+            !TryComp(user.Value, out PhysicsComponent? userPhysics))
+            return;
+        var msg = new ThrowPushbackAttemptEvent();
+        RaiseLocalEvent(uid, msg);
 
-            if (!msg.Cancelled)
-                _physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(massLimit, physics.Mass), body: userPhysics);
-        }
+        if (msg.Cancelled)
+            return;
+
+        var pushEv = new ThrowerImpulseEvent();
+        RaiseLocalEvent(user.Value, ref pushEv);
+        const float massLimit = 5f;
+
+        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/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index 3e1a4f18de..65c5a0f13e 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -47,7 +47,7 @@ namespace Content.Shared.Throwing
 
         private void ThrowItem(EntityUid uid, ThrownItemComponent component, ref ThrownEvent @event)
         {
-            if (!EntityManager.TryGetComponent(uid, out FixturesComponent? fixturesComponent) ||
+            if (!TryComp(uid, out FixturesComponent? fixturesComponent) ||
                 fixturesComponent.Fixtures.Count != 1 ||
                 !TryComp<PhysicsComponent>(uid, out var body))
             {
@@ -86,7 +86,7 @@ namespace Content.Shared.Throwing
         private void HandlePullStarted(PullStartedMessage message)
         {
             // TODO: this isn't directed so things have to be done the bad way
-            if (EntityManager.TryGetComponent(message.PulledUid, out ThrownItemComponent? thrownItemComponent))
+            if (TryComp(message.PulledUid, out ThrownItemComponent? thrownItemComponent))
                 StopThrow(message.PulledUid, thrownItemComponent);
         }
 
@@ -100,7 +100,7 @@ namespace Content.Shared.Throwing
                     _broadphase.RegenerateContacts((uid, physics));
             }
 
-            if (EntityManager.TryGetComponent(uid, out FixturesComponent? manager))
+            if (TryComp(uid, out FixturesComponent? manager))
             {
                 var fixture = _fixtures.GetFixtureOrNull(uid, ThrowingFixture, manager: manager);
 
diff --git a/Content.Shared/Tiles/FloorTileComponent.cs b/Content.Shared/Tiles/FloorTileComponent.cs
index 92208a76d4..5b9c48ca8b 100644
--- a/Content.Shared/Tiles/FloorTileComponent.cs
+++ b/Content.Shared/Tiles/FloorTileComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Maps;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Tiles
 {
@@ -12,8 +12,8 @@ namespace Content.Shared.Tiles
     [RegisterComponent, NetworkedComponent]
     public sealed partial class FloorTileComponent : Component
     {
-        [DataField("outputs", customTypeSerializer: typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-        public List<string>? OutputTiles;
+        [DataField]
+        public List<ProtoId<ContentTileDefinition>>? Outputs;
 
         [DataField("placeTileSound")] public SoundSpecifier PlaceTileSound =
             new SoundPathSpecifier("/Audio/Items/genhit.ogg")
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index d798fa2473..298c0390ba 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Audio;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
@@ -17,7 +16,6 @@ using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Tiles;
@@ -37,9 +35,15 @@ public sealed class FloorTileSystem : EntitySystem
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
 
     private static readonly Vector2 CheckRange = new(1f, 1f);
 
+    /// <summary>
+    ///     A recycled hashset used to check for walls when trying to place tiles on turfs.
+    /// </summary>
+    private readonly HashSet<EntityUid> _turfCheck = [];
+
     public override void Initialize()
     {
         base.Initialize();
@@ -54,7 +58,7 @@ public sealed class FloorTileSystem : EntitySystem
         if (!TryComp<StackComponent>(uid, out var stack))
             return;
 
-        if (component.OutputTiles == null)
+        if (component.Outputs == null)
             return;
 
         // this looks a bit sussy but it might be because it needs to be able to place off of grids and expand them
@@ -104,14 +108,16 @@ public sealed class FloorTileSystem : EntitySystem
 
         // if user can access tile center then they can place floor
         // otherwise check it isn't blocked by a wall
-        if (!canAccessCenter)
+        if (!canAccessCenter && _turf.TryGetTileRef(location, out var tileRef))
         {
-            foreach (var ent in location.GetEntitiesInTile(lookupSystem: _lookup))
+            _turfCheck.Clear();
+            _lookup.GetEntitiesInTile(tileRef.Value, _turfCheck);
+            foreach (var ent in _turfCheck)
             {
                 if (physicQuery.TryGetComponent(ent, out var phys) &&
                     phys.BodyType == BodyType.Static &&
                     phys.Hard &&
-                    (phys.CollisionLayer & (int) CollisionGroup.Impassable) != 0)
+                    (phys.CollisionLayer & (int)CollisionGroup.Impassable) != 0)
                 {
                     return;
                 }
@@ -119,7 +125,7 @@ public sealed class FloorTileSystem : EntitySystem
         }
         TryComp<MapGridComponent>(location.EntityId, out var mapGrid);
 
-        foreach (var currentTile in component.OutputTiles)
+        foreach (var currentTile in component.Outputs)
         {
             var currentTileDefinition = (ContentTileDefinition) _tileDefinitionManager[currentTile];
 
@@ -159,7 +165,7 @@ public sealed class FloorTileSystem : EntitySystem
                 var gridXform = Transform(grid);
                 _transform.SetWorldPosition((grid, gridXform), locationMap.Position);
                 location = new EntityCoordinates(grid, Vector2.Zero);
-                PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f);
+                PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.Outputs[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f);
                 return;
             }
         }
diff --git a/Content.Shared/Tiles/ProtectedGridSystem.cs b/Content.Shared/Tiles/ProtectedGridSystem.cs
index 0d6f5b7a6d..f90b0a52de 100644
--- a/Content.Shared/Tiles/ProtectedGridSystem.cs
+++ b/Content.Shared/Tiles/ProtectedGridSystem.cs
@@ -62,7 +62,7 @@ public sealed class ProtectedGridSystem : EntitySystem
             return;
         }
 
-        if (SharedMapSystem.FromBitmask(args.GridIndices, data))
+        if (!SharedMapSystem.FromBitmask(args.GridIndices, data))
         {
             args.Cancelled = true;
         }
diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
index d02752e16b..0950e8981d 100644
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ b/Content.Shared/Timing/UseDelaySystem.cs
@@ -9,7 +9,7 @@ public sealed class UseDelaySystem : EntitySystem
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
 
-    private const string DefaultId = "default";
+    public const string DefaultId = "default";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Toilet/Components/ToiletComponent.cs b/Content.Shared/Toilet/Components/ToiletComponent.cs
index 5de74e08f6..ab1d390980 100644
--- a/Content.Shared/Toilet/Components/ToiletComponent.cs
+++ b/Content.Shared/Toilet/Components/ToiletComponent.cs
@@ -2,39 +2,36 @@ using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Toilet.Components
+namespace Content.Shared.Toilet.Components;
+
+/// <summary>
+/// Seats that can toggled up and down with visuals to match.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ToiletComponent : Component
 {
     /// <summary>
-    /// Toilets that can be flushed, seats toggled up and down, items hidden in cistern.
+    /// Toggles seat state.
     /// </summary>
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    public sealed partial class ToiletComponent : Component
-    {
-        /// <summary>
-        /// Toggles seat state.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public bool ToggleSeat;
+    [DataField, AutoNetworkedField]
+    public bool ToggleSeat;
 
-
-        /// <summary>
-        /// Sound to play when toggling toilet seat.
-        /// </summary>
-        [DataField]
-        public SoundSpecifier SeatSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
-    }
-
-    [Serializable, NetSerializable]
-    public enum ToiletVisuals : byte
-    {
-        SeatVisualState,
-    }
-
-    [Serializable, NetSerializable]
-    public enum SeatVisualState : byte
-    {
-        SeatUp,
-        SeatDown
-    }
+    /// <summary>
+    /// Sound to play when toggling toilet seat.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SeatSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
 }
 
+[Serializable, NetSerializable]
+public enum ToiletVisuals : byte
+{
+    SeatVisualState,
+}
+
+[Serializable, NetSerializable]
+public enum SeatVisualState : byte
+{
+    SeatUp,
+    SeatDown,
+}
diff --git a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
deleted file mode 100644
index f11af33552..0000000000
--- a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using Content.Shared.Buckle.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Verbs;
-using Content.Shared.Plunger.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-using Robust.Shared.Utility;
-using Content.Shared.Toilet.Components;
-
-namespace Content.Shared.Toilet.Systems
-{
-    /// <summary>
-    /// Handles sprite changes for both toilet seat up and down as well as for lid open and closed. Handles interactions with hidden stash
-    /// </summary>
-
-    public abstract class SharedToiletSystem : EntitySystem
-    {
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
-            SubscribeLocalEvent<ToiletComponent, ActivateInWorldEvent>(OnActivateInWorld);
-        }
-
-        private void OnMapInit(EntityUid uid, ToiletComponent component, MapInitEvent args)
-        {
-            if (_random.Prob(0.5f))
-                component.ToggleSeat = true;
-
-            if (_random.Prob(0.3f))
-            {
-                TryComp<PlungerUseComponent>(uid, out var plunger);
-
-                if (plunger == null)
-                    return;
-
-                plunger.NeedsPlunger = true;
-            }
-
-            UpdateAppearance(uid);
-            Dirty(uid, component);
-        }
-
-        public bool CanToggle(EntityUid uid)
-        {
-            return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
-        }
-
-        private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess || !CanToggle(uid) || args.Hands == null)
-                return;
-
-            AlternativeVerb toggleVerb = new()
-            {
-                Act = () => ToggleToiletSeat(uid, args.User, component)
-            };
-
-            if (component.ToggleSeat)
-            {
-                toggleVerb.Text = Loc.GetString("toilet-seat-close");
-                toggleVerb.Icon =
-                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
-            }
-            else
-            {
-                toggleVerb.Text = Loc.GetString("toilet-seat-open");
-                toggleVerb.Icon =
-                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
-            }
-            args.Verbs.Add(toggleVerb);
-        }
-
-        private void OnActivateInWorld(EntityUid uid, ToiletComponent comp, ActivateInWorldEvent args)
-        {
-            if (args.Handled || !args.Complex)
-                return;
-
-            args.Handled = true;
-            ToggleToiletSeat(uid, args.User, comp);
-        }
-
-        public void ToggleToiletSeat(EntityUid uid, EntityUid? user = null, ToiletComponent? component = null, MetaDataComponent? meta = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            component.ToggleSeat = !component.ToggleSeat;
-
-            _audio.PlayPredicted(component.SeatSound, uid, uid);
-            UpdateAppearance(uid, component);
-            Dirty(uid, component, meta);
-        }
-
-        private void UpdateAppearance(EntityUid uid, ToiletComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            _appearance.SetData(uid, ToiletVisuals.SeatVisualState, component.ToggleSeat ? SeatVisualState.SeatUp : SeatVisualState.SeatDown);
-        }
-    }
-}
diff --git a/Content.Shared/Toilet/Systems/ToiletSystem.cs b/Content.Shared/Toilet/Systems/ToiletSystem.cs
new file mode 100644
index 0000000000..ad08012b11
--- /dev/null
+++ b/Content.Shared/Toilet/Systems/ToiletSystem.cs
@@ -0,0 +1,116 @@
+using Content.Shared.Buckle.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Verbs;
+using Content.Shared.Plunger.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using Content.Shared.Toilet.Components;
+
+namespace Content.Shared.Toilet.Systems;
+
+/// <summary>
+/// Handles sprite changes for both toilet seat up and down as well as for lid
+/// open and closed.
+/// </summary>
+public sealed class ToiletSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
+        SubscribeLocalEvent<ToiletComponent, ActivateInWorldEvent>(OnActivateInWorld);
+    }
+
+    private void OnMapInit(Entity<ToiletComponent> ent, ref MapInitEvent args)
+    {
+        if (_random.Prob(0.5f))
+        {
+            ent.Comp.ToggleSeat = true;
+            Dirty(ent);
+        }
+
+        if (_random.Prob(0.3f)
+            && TryComp<PlungerUseComponent>(ent, out var plunger))
+        {
+            plunger.NeedsPlunger = true;
+            Dirty(ent, plunger);
+        }
+
+        UpdateAppearance(ent);
+    }
+
+    private void OnToggleSeatVerb(Entity<ToiletComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null || !CanToggle(ent))
+            return;
+
+        var user = args.User;
+        AlternativeVerb toggleVerb = new() { Act = () => ToggleToiletSeat(ent.AsNullable(), user) };
+
+        if (ent.Comp.ToggleSeat)
+        {
+            toggleVerb.Text = Loc.GetString("toilet-seat-close");
+            toggleVerb.Icon =
+                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
+        }
+        else
+        {
+            toggleVerb.Text = Loc.GetString("toilet-seat-open");
+            toggleVerb.Icon =
+                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
+        }
+        args.Verbs.Add(toggleVerb);
+    }
+
+    private void OnActivateInWorld(Entity<ToiletComponent> ent, ref ActivateInWorldEvent args)
+    {
+        if (args.Handled || !args.Complex)
+            return;
+
+        args.Handled = true;
+        ToggleToiletSeat(ent.AsNullable(), args.User);
+    }
+
+    private void UpdateAppearance(Entity<ToiletComponent> ent)
+    {
+        _appearance.SetData(ent,
+            ToiletVisuals.SeatVisualState,
+            ent.Comp.ToggleSeat ? SeatVisualState.SeatUp : SeatVisualState.SeatDown);
+    }
+
+
+    /// <summary>
+    /// Toggles a toilet's seat. Yup. Doesn't check if anyone is on the seat.
+    /// </summary>
+    /// <param name="ent">The toilet being seat-toggled.</param>
+    /// <param name="user">The user doing the toggling; used for predicted audio.</param>
+    /// <seealso cref="CanToggle" />
+    public void ToggleToiletSeat(Entity<ToiletComponent?> ent, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.ToggleSeat = !ent.Comp.ToggleSeat;
+
+        _audio.PlayPredicted(ent.Comp.SeatSound, ent, user);
+        UpdateAppearance((ent, ent.Comp));
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Whether or not a toilet seat can be toggled without phasing through
+    /// someone's back. (That is, no one is seated on it.)
+    /// </summary>
+    /// <seealso cref="ToggleToiletSeat" />
+    public bool CanToggle(EntityUid uid)
+    {
+        return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
+    }
+}
diff --git a/Content.Shared/Tools/Components/WelderComponent.cs b/Content.Shared/Tools/Components/WelderComponent.cs
index 3c78a03fde..a9111c7f53 100644
--- a/Content.Shared/Tools/Components/WelderComponent.cs
+++ b/Content.Shared/Tools/Components/WelderComponent.cs
@@ -1,58 +1,76 @@
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Tools.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedToolSystem))]
+/// <summary>
+/// Handles fuel consumption for the tool and allows it to explode welding fuel tanks.
+/// </summary>
+/// <summary>
+/// TODO: De-hardcode welder bombing.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
+[Access(typeof(SharedToolSystem))]
 public sealed partial class WelderComponent : Component
 {
+    /// <summary>
+    /// Is the welder currently enabled?
+    /// </summary>
     [DataField, AutoNetworkedField]
     public bool Enabled;
 
-    [DataField]
-    public float WelderTimer;
+    /// <summary>
+    /// Timestamp for the next update loop update.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate;
 
     /// <summary>
-    ///     Name of <see cref="FuelSolution"/>.
+    /// Delay between updates.
+    /// </summary>
+    [DataField]
+    public TimeSpan WelderUpdateTimer = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Name of the fuel solution.
     /// </summary>
     [DataField]
     public string FuelSolutionName = "Welder";
 
     /// <summary>
-    ///     Reagent that will be used as fuel for welding.
+    /// Reagent that will be used as fuel for welding.
     /// </summary>
     [DataField]
     public ProtoId<ReagentPrototype> FuelReagent = "WeldingFuel";
 
     /// <summary>
-    ///     Fuel consumption per second while the welder is active.
+    /// Fuel consumption per second while the welder is active.
+    /// In u/s
     /// </summary>
     [DataField, AutoNetworkedField]
     public FixedPoint2 FuelConsumption = FixedPoint2.New(1.0f);
 
     /// <summary>
-    ///     A fuel amount to be consumed when the welder goes from being unlit to being lit.
+    /// A fuel amount to be consumed when the welder goes from being unlit to being lit.
     /// </summary>
     [DataField, AutoNetworkedField]
     public FixedPoint2 FuelLitCost = FixedPoint2.New(0.5f);
 
     /// <summary>
-    ///     Sound played when refilling the welder.
+    /// Sound played when refilling the welder.
     /// </summary>
     [DataField]
     public SoundSpecifier WelderRefill = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
 
     /// <summary>
-    ///     Whether the item is safe to refill while lit without exploding the tank.
+    /// Whether the item is safe to refill while lit without exploding the tank.
     /// </summary>
     [DataField]
     public bool TankSafe;
-
-    [DataField]
-    public float WelderUpdateTimer = 1f;
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
index 595ef8a925..5a5d719dde 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
@@ -22,7 +22,7 @@ public abstract partial class SharedToolSystem
     private void OnMultipleToolStartup(EntityUid uid, MultipleToolComponent multiple, ComponentStartup args)
     {
         // Only set the multiple tool if we have a tool component.
-        if (EntityManager.TryGetComponent(uid, out ToolComponent? tool))
+        if (TryComp(uid, out ToolComponent? tool))
             SetMultipleTool(uid, multiple, tool);
     }
 
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
index 2de3167c66..36eb65a21f 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
@@ -18,13 +18,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);
@@ -72,6 +75,12 @@ public abstract partial class SharedToolSystem
         return (fuelSolution.GetTotalPrototypeQuantity(welder.FuelReagent), fuelSolution.MaxVolume);
     }
 
+    private void OnWelderInit(Entity<WelderComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.WelderUpdateTimer;
+        Dirty(ent);
+    }
+
     private void OnWelderExamine(Entity<WelderComponent> entity, ref ExaminedEvent args)
     {
         using (args.PushGroup(nameof(WelderComponent)))
@@ -179,7 +188,8 @@ public abstract partial class SharedToolSystem
 
     private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
             return;
         }
@@ -201,9 +211,34 @@ public abstract partial class SharedToolSystem
 
     private void OnDeactivateAttempt(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
-            return;
+        }
+    }
+
+    private void UpdateWelders()
+    {
+        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
+        {
+            if (curTime < welder.NextUpdate)
+                continue;
+
+            welder.NextUpdate += welder.WelderUpdateTimer;
+            Dirty(uid, welder);
+
+            if (!welder.Enabled)
+                continue;
+
+            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
+                continue;
+
+            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderUpdateTimer.TotalSeconds);
+
+            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
+                ItemToggle.Toggle(uid);
         }
     }
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index 18cd5d262b..b47883f1bd 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -12,6 +12,7 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using BlockedToolComponent = Content.Shared._Sunrise.BlockedTool.BlockedToolComponent;
 
@@ -19,6 +20,7 @@ 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!;
@@ -270,6 +272,13 @@ public abstract partial class SharedToolSystem : EntitySystem
         return !beforeAttempt.Cancelled;
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateWelders();
+    }
+
     #region DoAfterEvents
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs
new file mode 100644
index 0000000000..d7da5cecde
--- /dev/null
+++ b/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Component used for tracking active timers triggers.
+/// Used internally for performance reasons.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTimerTriggerComponent : Component;
diff --git a/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs b/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs
new file mode 100644
index 0000000000..bddbbd402e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Component used for tracking active two-stage triggers.
+/// Used internally for performance reasons.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTwoStageTriggerComponent : Component;
diff --git a/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs
new file mode 100644
index 0000000000..7e77c99d93
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Base class for components that add a condition to triggers.
+/// </summary>
+public abstract partial class BaseTriggerConditionComponent : Component
+{
+    /// <summary>
+    /// The keys that are checked for the condition.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> Keys = new() { TriggerSystem.DefaultTriggerKey };
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs
new file mode 100644
index 0000000000..478f06602d
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Adds an alt verb that can be used to toggle a trigger.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ToggleTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Is the component currently enabled?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The text of the toggle verb.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleVerb = "toggle-trigger-condition-default-verb";
+
+    /// <summary>
+    /// The popup to show when toggled on.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleOn = "toggle-trigger-condition-default-on";
+
+    /// <summary>
+    /// The popup to show when toggled off.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleOff = "toggle-trigger-condition-default-off";
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
new file mode 100644
index 0000000000..70a331227e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Timing;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if the triggered entity has an active UseDelay.
+/// </summary>
+/// <remarks>
+/// TODO: Support specific UseDelay IDs for each trigger key.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UseDelayTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Checks if the triggered entity has an active UseDelay.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string UseDelayId = UseDelaySystem.DefaultId;
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
new file mode 100644
index 0000000000..a2779f79c6
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if the user of a trigger satisfies a whitelist and blacklist condition for the triggered entity or the one triggering it.
+/// Cancels the trigger otherwise.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class WhitelistTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Whitelist for what entites can cause this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserWhitelist;
+
+    /// <summary>
+    /// Blacklist for what entites can cause this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserBlacklist;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs
new file mode 100644
index 0000000000..06f5258fbe
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Adds the specified components when triggered.
+/// If TargetUser is true they will be added to the user.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AddComponentsOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The list of components that will be added.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// If this component has been triggered at least once already.
+    /// If this is true the components have been added.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Triggered = false;
+
+    /// <summary>
+    /// If this effect can only be triggered once.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TriggerOnce = false;
+
+    /// <summary>
+    /// Should components that already exist on the entity be overwritten?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RemoveExisting = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs
new file mode 100644
index 0000000000..0d161344d8
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Changes the alert level of the station when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AlertLevelChangeOnTriggerComponent : BaseXOnTriggerComponent
+{
+    ///<summary>
+    /// The alert level to change to when triggered.
+    ///</summary>
+    [DataField, AutoNetworkedField]
+    public string Level = "blue";
+
+    /// <summary>
+    /// Whether to play the sound when the alert level changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PlaySound = true;
+
+    /// <summary>
+    /// Whether to say the announcement when the alert level changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Announce = true;
+
+    /// <summary>
+    /// Force the alert change. This applies if the alert level is not selectable or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Force = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs
new file mode 100644
index 0000000000..ed61876f15
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will (un)anchor the entity when triggered.
+/// If TargetUser is true they will be (un)anchored instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AnchorOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Anchor the entity on trigger if it is currently unanchored?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanAnchor = true;
+
+    /// <summary>
+    /// Unanchor the entity on trigger if it is currently anchored?
+    /// If both this and CanAnchor are true then the trigger will toggle between states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanUnanchor = false;
+
+    /// <summary>
+    /// Removes this component when triggered so it can only be activated once.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this a generic thing for all triggers.
+    /// Or just add a RemoveComponentsOnTriggerComponent.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public bool RemoveOnTrigger = true;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs
new file mode 100644
index 0000000000..cf93ad6c4a
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Base class for components that do something when triggered.
+/// </summary>
+public abstract partial class BaseXOnTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// Set to true to make the user of the trigger the effect target.
+    /// Set to false to make the owner of this component the target.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetUser = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs
new file mode 100644
index 0000000000..8d35b019b4
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will damage an entity when triggered.
+/// If TargetUser is true it the user will take damage instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DamageOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Should the damage ignore resistances?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreResistances;
+
+    /// <summary>
+    /// The base damage amount that is dealt.
+    /// May be further modified by <see cref="Systems.BeforeDamageOnTriggerEvent"/> subscriptions.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs
new file mode 100644
index 0000000000..9d0a5b7517
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will delete the entity when triggered.
+/// If TargetUser is true it will delete them instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DeleteOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/DnaScrambleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DnaScrambleOnTriggerComponent.cs
new file mode 100644
index 0000000000..1f3767b392
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DnaScrambleOnTriggerComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Scrambles the entity's identity and DNA, turning them into a randomized humanoid of the same species.
+/// If TargetUser is true the user will be scrambled instead.
+/// Used for dna scrambler implants.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DnaScrambleOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs
new file mode 100644
index 0000000000..f3870225e2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will play a sound in PVS range when triggered.
+/// If TargetUser is true it will be played at their position.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmitSoundOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The <see cref="SoundSpecifier"/> to play.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public SoundSpecifier? Sound;
+
+    /// <summary>
+    /// Play the sound at the position instead of parented to the source entity.
+    /// Useful if the entity is deleted after.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Positional;
+
+    /// <summary>
+    /// Should this sound be predicted for the User?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs
new file mode 100644
index 0000000000..327e9f57db
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will cause an EMP at the entity's location when triggered.
+/// If TargetUser is true then it will be spawned at their position.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmpOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// EMP range.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1.0f;
+
+    /// <summary>
+    /// How much energy (in Joules) will be consumed per battery in range.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float EnergyConsumption;
+
+    /// <summary>
+    /// How long it disables targets.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DisableDuration = TimeSpan.FromSeconds(60);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs
new file mode 100644
index 0000000000..2a1af40a2c
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will explode using the entity's <see cref="ExplosiveComponent"/> when triggered.
+/// TargetUser will only work of the user has ExplosiveComponent as well.
+/// The User will be logged in the admin logs.
+/// </summary>
+/// <summary>
+/// TODO: Allow this to work without an ExplosiveComponent on the user via QueueExplosion.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ExplodeOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs
new file mode 100644
index 0000000000..8b75417031
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will cause a flash in an area around the entity when triggered.
+/// If TargetUser is true then their location will be used.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlashOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The range in which to flash entities in.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1.0f;
+
+    /// <summary>
+    /// The duration of the status effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(8);
+
+    /// <summary>
+    /// The probability to apply the status effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Probability = 1.0f;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
new file mode 100644
index 0000000000..16c1365c05
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will kick a player from the server as if their connection dropped if triggered.
+/// Yes, really. Don't use this component.
+/// If TargetUser is true then the user of the trigger will be kicked, otherwise the entity itself.
+/// <see cref="Server.GhostKick.GhostKickManager"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GhostKickOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The reason that will be displayed in the server log when a player is kicked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId Reason = "ghost-kick-on-trigger-default";
+}
diff --git a/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs
new file mode 100644
index 0000000000..b3475ac447
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will gib the entity when triggered.
+/// If TargetUser is true the user will be gibbed instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GibOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Should gibbing also delete the owners items?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteItems = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
new file mode 100644
index 0000000000..36273ef1b2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will ignite for a certain length of time when triggered.
+/// Requires <see cref="IgnitionSourceComponent"/> along with triggering components.
+/// The if TargetUser is true they will be ignited instead (they need IgnitionSourceComponent as well).
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class IgniteOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Once ignited, the time it will unignite at.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan IgnitedUntil = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long the ignition source is active for after triggering.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan IgnitedTime = TimeSpan.FromSeconds(0.5);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs
new file mode 100644
index 0000000000..4c5360f4d2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Item.ItemToggle.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will toggle an item when triggered. Requires <see cref="ItemToggleComponent"/>.
+/// If TargetUser is true and they have that component they will be toggled instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ItemToggleOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Can the item be toggled on using the trigger?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanActivate = true;
+
+    /// <summary>
+    /// Can the item be toggled on using the trigger?
+    /// If both this and CanActivate are true then the trigger will toggle between states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanDeactivate = true;
+
+    /// <summary>
+    /// Can the audio and popups be predicted?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted = true;
+
+    /// <summary>
+    /// Show a popup to the user when toggling the item?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ShowPopup = true;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs
new file mode 100644
index 0000000000..3d2021e425
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Polymorphs the enity when triggered.
+/// If TargetUser is true it will polymorph the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PolymorphOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Polymorph settings.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Polymorph;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs
new file mode 100644
index 0000000000..fa1175c3cb
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Mobs;
+using Content.Shared.Radio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Sends an emergency message over coms when triggered giving information about the entity's mob status.
+/// If TargetUser is true then the user's mob state will be used instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RattleOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The radio channel the message will be sent to.
+    /// </summary>
+    [DataField]
+    public ProtoId<RadioChannelPrototype> RadioChannel = "Syndicate";
+
+    /// <summary>
+    /// The message to be send depending on the target's current mob state.
+    /// </summary>
+    [DataField]
+    public Dictionary<MobState, LocId> Messages = new()
+    {
+        {MobState.Critical, "rattle-on-trigger-critical-message"},
+        {MobState.Dead, "rattle-on-trigger-dead-message"}
+    };
+}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
similarity index 90%
rename from Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
index 28a5c5cf81..4edd5f83f4 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
@@ -1,18 +1,16 @@
 using Content.Shared.Atmos;
-using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
 /// Contains a GasMixture that will release its contents to the atmosphere when triggered.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-[Access(typeof(SharedReleaseGasOnTriggerSystem))]
-public sealed partial class ReleaseGasOnTriggerComponent : Component
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class ReleaseGasOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
     /// Whether this grenade is active and releasing gas.
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
similarity index 57%
rename from Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
index 43febff03b..68af0bb544 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
@@ -1,37 +1,39 @@
 using Content.Shared.Physics;
 using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
-/// Generates a gravity pulse/repulse using the RepulseAttractComponent when the entity is triggered
+/// Generates a gravity pulse/repulse using the RepulseAttractComponent around the entity when triggered.
+/// If TargetUser is true their location will be used instead.
 /// </summary>
-[RegisterComponent]
-public sealed partial class SharedRepulseAttractOnTriggerComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RepulseAttractOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
     /// How fast should the Repulsion/Attraction be?
-    /// A positive value will repulse objects, a negative value will attract
+    /// A positive value will repulse objects, a negative value will attract.
     /// </summary>
-    [DataField]
-    public float Speed;
+    [DataField, AutoNetworkedField]
+    public float Speed = 5.0f;
 
     /// <summary>
     /// How close do the entities need to be?
     /// </summary>
-    [DataField]
-    public float Range;
+    [DataField, AutoNetworkedField]
+    public float Range = 5.0f;
 
     /// <summary>
     /// What kind of entities should this effect apply to?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
     /// What collision layers should be excluded?
     /// The default excludes ghost mobs, revenants, the AI camera etc.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public CollisionGroup CollisionMask = CollisionGroup.GhostImpassable;
 }
diff --git a/Content.Shared/Trigger/Components/Effects/ScramOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ScramOnTriggerComponent.cs
new file mode 100644
index 0000000000..bacf0f69e8
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ScramOnTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Randomly teleports the entity when triggered.
+/// If TargetUser is true the user will be teleported instead.
+/// Used for scram implants.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ScramOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Up to how far to teleport the entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float TeleportRadius = 100f;
+
+    /// <summary>
+    /// the sound to play when teleporting.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
new file mode 100644
index 0000000000..e7da7a3801
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will electrocute the entity when triggered.
+/// If TargetUser is true it will electrocute the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ShockOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Electrocute entity containing this entity instead (for example for wearable clothing).
+    /// Has priority over TargetUser.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this more generic so it can be used for all triggers.
+    /// Maybe a BeforeTriggerEvent where we modify the target.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public bool TargetContainer;
+
+    /// <summary>
+    /// The force of an electric shock when the trigger is triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Damage = 5;
+
+    /// <summary>
+    /// Duration of electric shock when the trigger is triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(2);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs
new file mode 100644
index 0000000000..0698f2ca33
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Sends a device link signal when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SignalOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The port that gets signaled when the switch turns on.
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> Port = "Trigger";
+}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
similarity index 59%
rename from Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
index 1138e74af8..07a5bad056 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
@@ -1,34 +1,34 @@
-using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Explosion.Components;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
 /// Creates a smoke cloud when triggered, with an optional solution to include in it.
-/// No sound is played incase a grenade is stealthy, use <see cref="SoundOnTriggerComponent"/> if you want a sound.
+/// No sound is played incase a grenade is stealthy, use <see cref="EmitSoundOnTriggerComponent"/> if you want a sound.
+/// If TargetUser is true the smoke is spawned at their location.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedSmokeOnTriggerSystem))]
-public sealed partial class SmokeOnTriggerComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SmokeOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
-    /// How long the smoke stays for, after it has spread.
+    /// How long the smoke stays for, after it has spread (in seconds).
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Duration = 10;
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// How much the smoke will spread.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true), AutoNetworkedField]
     public int SpreadAmount;
 
     /// <summary>
     /// Smoke entity to spawn.
     /// Defaults to smoke but you can use foam if you want.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntProtoId SmokePrototype = "Smoke";
 
     /// <summary>
@@ -37,6 +37,6 @@ public sealed partial class SmokeOnTriggerComponent : Component
     /// <remarks>
     /// When using repeating trigger this essentially gets multiplied so dont do anything crazy like omnizine or lexorin.
     /// </remarks>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public Solution Solution = new();
 }
diff --git a/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs
new file mode 100644
index 0000000000..782626f479
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Spawns a protoype when triggered.
+/// If TargetUser is true it will be spawned at their location.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SpawnOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The prototype to spawn.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId Proto = string.Empty;
+
+    /// <summary>
+    /// Use MapCoordinates for spawning?
+    /// Set to true if you don't want the new entity parented to the spawner.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool UseMapCoords;
+
+    /// <summary>
+    /// Whether or not to use predicted spawning.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs
new file mode 100644
index 0000000000..8fe6927046
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Dataset;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Makes the entity speak a message when triggered.
+/// If TargetUser is true then they will be forced to speak instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SpeakOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The text to speak. This has priority over Pack.
+    /// </summary>
+    [DataField]
+    public LocId? Text;
+
+    /// <summary>
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
+    /// The spoken text will be picked randomly from it.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? Pack;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/UncuffOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/UncuffOnTriggerComponent.cs
new file mode 100644
index 0000000000..770882f3e6
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/UncuffOnTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Removes a pair of handcuffs from the entity.
+/// If TargetUser is true the user will be uncuffed instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UncuffOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
new file mode 100644
index 0000000000..4d43c2860b
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Timing;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will activate an UseDelay on the target when triggered.
+/// </summary>
+/// <remarks>
+/// TODO: Support specific UseDelay IDs for each trigger key.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UseDelayOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The UseDelay Id to delay.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string UseDelayId = UseDelaySystem.DefaultId;
+
+    /// <summary>
+    /// If true ongoing delays won't be reset.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CheckDelayed;
+}
diff --git a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
similarity index 50%
rename from Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
rename to Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
index 3863b9c313..89b5535854 100644
--- a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
@@ -1,22 +1,22 @@
-using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Trigger.Components;
 
 /// <summary>
-/// This is used for randomizing a <see cref="RandomTimerTriggerComponent"/> on MapInit
+/// This is used for randomizing a <see cref="TimerTriggerComponent"/> on MapInit.
 /// </summary>
-[RegisterComponent, Access(typeof(TriggerSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class RandomTimerTriggerComponent : Component
 {
     /// <summary>
     /// The minimum random trigger time.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float Min;
 
     /// <summary>
     /// The maximum random trigger time.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float Max;
 }
diff --git a/Content.Shared/Trigger/Components/TimerTriggerComponent.cs b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
new file mode 100644
index 0000000000..9cc58d3cda
--- /dev/null
+++ b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Guidebook;
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using System.Linq;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Starts a timer when activated by a trigger.
+/// Will cause a different trigger once the time is over.
+/// Can play a sound while the timer is active.
+/// The time can be set by other components, for example <see cref="RandomTimerTriggerComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TimerTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the timer.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// The key that will trigger once the timer is finished.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = "timer";
+
+    /// <summary>
+    /// The time after which this timer will trigger after it is activated.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// If not empty, a user can use verbs to configure the delay to one of these options.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<TimeSpan> DelayOptions = new();
+
+    /// <summary>
+    /// The time at which this trigger will activate.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
+
+    /// <summary>
+    /// Time of the next beeping sound.
+    /// </summary>
+    /// <remarks>
+    /// Not networked because it's only used server side.
+    /// </remarks>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextBeep = TimeSpan.Zero;
+
+    /// <summary>
+    /// Initial beep delay.
+    /// Defaults to a single BeepInterval if null.
+    /// </summary>
+    /// <remarks>
+    /// Not networked because it's only used server side.
+    /// </remarks>
+    [DataField]
+    public TimeSpan? InitialBeepDelay;
+
+    /// <summary>
+    /// The time between beeps.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan BeepInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The entity that activated this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? User;
+
+    /// <summary>
+    /// The beeping sound, if any.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? BeepSound;
+
+    /// <summary>
+    /// Whether you can examine the item to see its timer or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Examinable = true;
+
+    /// <summary>
+    /// The popup to show the user when starting the timer, if any.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? Popup = "timer-trigger-activated";
+
+    #region GuidebookData
+
+    [GuidebookData]
+    public float? ShortestDelayOption => DelayOptions.Count == 0 ? null : (float)DelayOptions.Min().TotalSeconds;
+
+    [GuidebookData]
+    public float? LongestDelayOption => DelayOptions.Count == 0 ? null : (float)DelayOptions.Max().TotalSeconds;
+
+    #endregion GuidebookData
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
new file mode 100644
index 0000000000..88b68913f0
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTriggerOnTimedCollideComponent : Component;
diff --git a/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs b/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs
new file mode 100644
index 0000000000..1f4807f253
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Base class for components that cause a trigger to be activated.
+/// </summary>
+public abstract partial class BaseTriggerOnXComponent : Component
+{
+    /// <summary>
+    /// The key that the trigger will activate.
+    /// null will activate all triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = TriggerSystem.DefaultTriggerKey;
+}
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
similarity index 56%
rename from Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
index cc08de53f9..27527d7773 100644
--- a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
@@ -1,25 +1,26 @@
-using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Trigger.Components.Triggers;
 
 /// <summary>
 /// Constantly triggers after being added to an entity.
 /// </summary>
-[RegisterComponent, Access(typeof(TriggerSystem))]
-[AutoGenerateComponentPause]
-public sealed partial class RepeatingTriggerComponent : Component
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class RepeatingTriggerComponent : BaseTriggerOnXComponent
 {
     /// <summary>
     /// How long to wait between triggers.
     /// The first trigger starts this long after the component is added.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan Delay = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// When the next trigger will be.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextTrigger;
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
new file mode 100644
index 0000000000..9dd145bb26
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when activated in hand or by clicking on the entity.
+/// The user is the player activating it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnActivateComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Is this interaction a complex interaction?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequireComplex = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs
new file mode 100644
index 0000000000..b26f3b6875
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when activating an action granted by an implant.
+/// The user is the player activating it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnActivateImplantComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs
new file mode 100644
index 0000000000..a1e234bd7a
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when colliding with another entity.
+/// The user is the entity collided with.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnCollideComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The fixture with which to collide.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public string FixtureID = string.Empty;
+
+    /// <summary>
+    /// Doesn't trigger if the other colliding fixture is nonhard.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreOtherNonHard = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs
new file mode 100644
index 0000000000..40d468ec30
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when attempting to shoot a gun while it's empty.
+/// The user is the player holding the gun.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnEmptyGunshotComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
new file mode 100644
index 0000000000..a8dab4e6cd
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Mobs;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when this entity's mob state changes.
+/// The user is the entity that caused the state change or the owner depending on the settings.
+/// If added to an implant it will trigger when the implanted entity's mob state changes.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnMobstateChangeComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// What states should trigger this?
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public List<MobState> MobState = new();
+
+    /// <summary>
+    /// If true, prevents suicide attempts for the trigger to prevent cheese.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventSuicide = false;
+
+    /// <summary>
+    /// If false, the trigger user will be the entity that caused the mobstate to change.
+    /// If true, the trigger user will the entity that changed its mob state.
+    /// </summary>
+    /// <summary>
+    /// Set this to true for implants that apply an effect on the implanted entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetMobstateEntity = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs
new file mode 100644
index 0000000000..047d6f0374
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Physics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers whenever an entity collides with a fixture attached to the owner of this component.
+/// The user is the entity that collided with the fixture.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TriggerOnProximityComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The ID if the fixture that is observed for collisions.
+    /// </summary>
+    public const string FixtureID = "trigger-on-proximity-fixture";
+
+    /// <summary>
+    /// Currently colliding entities.
+    /// </summary>
+    [ViewVariables]
+    public readonly Dictionary<EntityUid, PhysicsComponent> Colliding = new();
+
+    /// <summary>
+    /// What is the shape of the proximity fixture?
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public IPhysShape Shape = new PhysShapeCircle(2f);
+
+    /// <summary>
+    /// How long the the proximity trigger animation plays for.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.6f);
+
+    /// <summary>
+    /// Whether the entity needs to be anchored for the proximity to work.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequiresAnchored = true;
+
+    /// <summary>
+    /// Whether the proximity trigger is currently enabled.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The minimum delay between repeating triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Cooldown = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// When can the trigger run again?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
+
+    /// <summary>
+    /// When will the visual state be updated again after activation?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextVisualUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// What speed should the other object be moving at to trigger the proximity fixture?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float TriggerSpeed = 3.5f;
+
+    /// <summary>
+    /// If this proximity is triggered should we continually repeat it?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Repeating = true;
+
+    /// <summary>
+    /// What layer is the trigger fixture on?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(FlagSerializer<CollisionLayer>))]
+    public int Layer = (int)(CollisionGroup.MidImpassable | CollisionGroup.LowImpassable | CollisionGroup.HighImpassable);
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs
new file mode 100644
index 0000000000..6ed81c5fcf
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Sends a trigger when signal is received.
+/// The user is the sender of the signal.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSignalComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The sink port prototype we can connect devices to.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<SinkPortPrototype> Port = "Trigger";
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs
new file mode 100644
index 0000000000..b0381ee74e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers an entity when someone slipped on it.
+/// The user is the entity that was slipped.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSlipComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs
new file mode 100644
index 0000000000..c718a20148
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the entity is initialized.
+/// The user is null.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSpawnComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
new file mode 100644
index 0000000000..70d33a1179
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers if a StepTrigger is activated by someone stepping on this entity.
+/// The user is the mob who stepped on it.
+/// </summary>
+/// <remarks>
+/// This is used for entities that want the more generic 'trigger' behavior after a step trigger occurs.
+/// Not done by default, since it's not useful for everything and might cause weird behavior. But it is useful for a lot of stuff like mousetraps.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnStepTriggerComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs
new file mode 100644
index 0000000000..073a64f66e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Sticky.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when an entity with <see cref="StickyComponent"/> is stuck to something.
+/// The user is the player doing so.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnStuckComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
new file mode 100644
index 0000000000..185ea7dbe4
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the entity is overlapped for the specified duration.
+/// The user is the entity that passes the time threshold while colliding.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnTimedCollideComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The time an entity has to collide until the trigger is activated.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Threshold = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// A collection of entities that are currently colliding with this, and their own unique accumulator.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Add AutoPausedField and (de)serialize values as time offsets when https://github.com/space-wizards/RobustToolbox/issues/3768 is fixed.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public Dictionary<EntityUid, TimeSpan> Colliding = new();
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
new file mode 100644
index 0000000000..71d289741e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers on use in hand.
+/// The user is the player holding the item.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUseComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs
new file mode 100644
index 0000000000..463860f077
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Starts a trigger when a verb is selected.
+/// The user is the player selecting the verb.
+/// </summary>
+/// <remarks>
+/// TODO: Support multiple verbs and trigger keys.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnVerbComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The text to display in the verb.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId Text = "trigger-on-verb-default";
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
new file mode 100644
index 0000000000..a36992d7da
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
@@ -0,0 +1,47 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Sends a trigger when the keyphrase is heard.
+/// The User is the speaker.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnVoiceComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Whether or not the component is actively listening at the moment.
+    /// </summary>
+    [ViewVariables]
+    public bool IsListening => IsRecording || !string.IsNullOrWhiteSpace(KeyPhrase);
+
+    /// <summary>
+    /// The keyphrase that has been set to trigger it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyPhrase;
+
+    /// <summary>
+    /// Range in which we listen for the keyphrase.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int ListenRange = 4;
+
+    /// <summary>
+    /// Whether we are currently recording a new keyphrase.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsRecording;
+
+    /// <summary>
+    /// Minimum keyphrase length.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int MinLength = 3;
+
+    /// <summary>
+    /// Maximum keyphrase length.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int MaxLength = 50;
+}
diff --git a/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs b/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs
new file mode 100644
index 0000000000..f0161c7175
--- /dev/null
+++ b/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// After being triggered applies the specified components and runs triggers again.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TwoStageTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the timer and add the given components (first stage).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// The key that will trigger once the timer is finished (second stage).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = "stageTwo";
+
+    /// <summary>
+    /// How long it takes for the second stage to be triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan TriggerDelay = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// This list of components that will be added on the first trigger.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// The time at which the second stage will trigger.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextTriggerTime;
+
+    /// <summary>
+    /// Has this entity been triggered already?
+    /// Used to prevent the components from being added multiple times.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Triggered = false;
+
+    /// <summary>
+    /// The entity that activated this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? User;
+}
diff --git a/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs
new file mode 100644
index 0000000000..908307dad0
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class AddComponentsOnTriggerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AddComponentsOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<AddComponentsOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (ent.Comp.TriggerOnce && ent.Comp.Triggered)
+            return;
+
+        EntityManager.AddComponents(target.Value, ent.Comp.Components, ent.Comp.RemoveExisting);
+        ent.Comp.Triggered = true;
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
new file mode 100644
index 0000000000..8f30c852ea
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Damage;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class DamageOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<DamageOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var damage = new DamageSpecifier(ent.Comp.Damage);
+        var ev = new BeforeDamageOnTriggerEvent(damage, target.Value);
+        RaiseLocalEvent(ent.Owner, ref ev);
+
+        args.Handled |= _damageableSystem.TryChangeDamage(target, ev.Damage, ent.Comp.IgnoreResistances, origin: ent.Owner) is not null;
+    }
+}
+
+/// <summary>
+/// Raised on an entity before it deals damage using DamageOnTriggerComponent.
+/// Used to modify the damage that will be dealt.
+/// </summary>
+[ByRefEvent]
+public record struct BeforeDamageOnTriggerEvent(DamageSpecifier Damage, EntityUid Tripper);
diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
new file mode 100644
index 0000000000..246c6a8c7a
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.DetailExaminable;
+using Content.Shared.Forensics.Systems;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Preferences;
+using Content.Shared.Popups;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class DnaScrambleOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidAppearance = default!;
+    [Dependency] private readonly SharedIdentitySystem _identity = default!;
+    [Dependency] private readonly SharedForensicsSystem _forensics = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DnaScrambleOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<DnaScrambleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<HumanoidAppearanceComponent>(target, out var humanoid))
+            return;
+
+        args.Handled = true;
+
+        // Randomness will mispredict
+        // and LoadProfile causes a debug assert on the client at the moment.
+        if (_net.IsClient)
+            return;
+
+        var newProfile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
+        _humanoidAppearance.LoadProfile(target.Value, newProfile, humanoid);
+        _metaData.SetEntityName(target.Value, newProfile.Name, raiseEvents: false); // raising events would update ID card, station record, etc.
+
+        // If the entity has the respective components, then scramble the dna and fingerprint strings.
+        _forensics.RandomizeDNA(target.Value);
+        _forensics.RandomizeFingerprint(target.Value);
+
+        RemComp<DetailExaminableComponent>(target.Value); // remove MRP+ custom description if one exists
+        _identity.QueueIdentityUpdate(target.Value); // manually queue identity update since we don't raise the event
+
+        // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted.
+        _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
new file mode 100644
index 0000000000..e296ccc177
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EmitSoundOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<EmitSoundOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        args.Handled |= TryEmitSound(ent, target.Value, args.User);
+    }
+
+    private bool TryEmitSound(Entity<EmitSoundOnTriggerComponent> ent, EntityUid target, EntityUid? user = null)
+    {
+        if (ent.Comp.Sound == null)
+            return false;
+
+        if (ent.Comp.Positional)
+        {
+            var coords = Transform(target).Coordinates;
+            if (ent.Comp.Predicted)
+                _audio.PlayPredicted(ent.Comp.Sound, coords, user);
+            else if (_netMan.IsServer)
+                _audio.PlayPvs(ent.Comp.Sound, coords);
+        }
+        else
+        {
+            if (ent.Comp.Predicted)
+                _audio.PlayPredicted(ent.Comp.Sound, target, user);
+            else if (_netMan.IsServer)
+                _audio.PlayPvs(ent.Comp.Sound, target);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
new file mode 100644
index 0000000000..136c4474a2
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Emp;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EmpOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedEmpSystem _emp = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<EmpOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _emp.EmpPulse(_transform.GetMapCoordinates(target.Value), ent.Comp.Range, ent.Comp.EnergyConsumption, (float)ent.Comp.DisableDuration.TotalSeconds);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
new file mode 100644
index 0000000000..1c773b79a6
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Explosion.EntitySystems;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ExplodeOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedExplosionSystem _explosion = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<ExplodeOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _explosion.TriggerExplosive(target.Value, user: args.User);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
new file mode 100644
index 0000000000..6153e228bf
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Flash;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class FlashOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<FlashOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _flash.FlashArea(target.Value, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
new file mode 100644
index 0000000000..95ef5ec1db
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Inventory;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class GibOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GibOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<GibOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (ent.Comp.DeleteItems)
+        {
+            var items = _inventory.GetHandOrInventoryEntities(target.Value);
+            foreach (var item in items)
+            {
+                PredictedQueueDel(item);
+            }
+        }
+        _body.GibBody(target.Value, true);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
new file mode 100644
index 0000000000..9bedc87b6b
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.RepulseAttract;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class RepulseAttractOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly RepulseAttractSystem _repulse = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<RepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var position = _transform.GetMapCoordinates(target.Value);
+        _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
new file mode 100644
index 0000000000..163012cec5
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
@@ -0,0 +1,151 @@
+using System.Numerics;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Physics;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ScramOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly PullingSystem _pulling = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private HashSet<Entity<MapGridComponent>> _targetGrids = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScramOnTriggerComponent, TriggerEvent>(OnTrigger);
+
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+    }
+
+    private void OnTrigger(Entity<ScramOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
+        // This can for example happen when the user is cuffed and being pulled.
+        if (TryComp<PullableComponent>(target, out var pull) && _pulling.IsPulled(target.Value, pull))
+            _pulling.TryStopPull(ent, pull);
+
+        // Check if the user is pulling anything, and drop it if so.
+        if (TryComp<PullerComponent>(target, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))
+            _pulling.TryStopPull(puller.Pulling.Value, pullable);
+
+        _audio.PlayPredicted(ent.Comp.TeleportSound, ent, args.User);
+
+        // Can't predict picking random grids and the target location might be out of PVS range.
+        if (_net.IsClient)
+            return;
+
+        var xform = Transform(target.Value);
+        var targetCoords = SelectRandomTileInRange(xform, ent.Comp.TeleportRadius);
+
+        if (targetCoords != null)
+        {
+            _transform.SetCoordinates(target.Value, targetCoords.Value);
+            args.Handled = true;
+        }
+    }
+
+    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
+    {
+        var userCoords = _transform.ToMapCoordinates(userXform.Coordinates);
+        _targetGrids.Clear();
+        _lookup.GetEntitiesInRange(userCoords, radius, _targetGrids);
+        Entity<MapGridComponent>? targetGrid = null;
+
+        if (_targetGrids.Count == 0)
+            return null;
+
+        // Give preference to the grid the entity is currently on.
+        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
+        // In reality the probability is higher and depends on the number of grids.
+        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
+        {
+            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
+            if (_random.Prob(0.5f))
+            {
+                _targetGrids.Remove(userGrid);
+                targetGrid = userGrid;
+            }
+        }
+
+        if (targetGrid == null)
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+
+        EntityCoordinates? targetCoords = null;
+
+        do
+        {
+            var valid = false;
+
+            var range = (float)Math.Sqrt(radius);
+            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
+            var tilesInRange = _map.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
+            var tileList = new ValueList<Vector2i>();
+
+            while (tilesInRange.MoveNext(out var tile))
+            {
+                tileList.Add(tile.GridIndices);
+            }
+
+            while (tileList.Count != 0)
+            {
+                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
+                valid = true;
+                foreach (var entity in _map.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp,
+                             tile))
+                {
+                    if (!_physicsQuery.TryGetComponent(entity, out var body))
+                        continue;
+
+                    if (body.BodyType != BodyType.Static ||
+                        !body.Hard ||
+                        (body.CollisionLayer & (int)CollisionGroup.MobMask) == 0)
+                        continue;
+
+                    valid = false;
+                    break;
+                }
+
+                if (valid)
+                {
+                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
+                        _map.TileCenterToVector(targetGrid.Value, tile));
+                    break;
+                }
+            }
+
+            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
+                break;
+
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+        } while (true);
+
+        return targetCoords;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
new file mode 100644
index 0000000000..e1871e0435
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// Releases a gas mixture to the atmosphere when triggered.
+/// Can also release gas over a set timespan to prevent trolling people
+/// with the instant-wall-of-pressure-inator.
+/// </summary>
+public abstract class SharedReleaseGasOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReleaseGasOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    /// <summary>
+    /// Shrimply sets the component to active when triggered, allowing it to release over time.
+    /// </summary>
+    private void OnTrigger(Entity<ReleaseGasOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        ent.Comp.Active = true;
+        ent.Comp.NextReleaseTime = _timing.CurTime;
+        ent.Comp.StartingTotalMoles = ent.Comp.Air.TotalMoles;
+        _appearance.SetData(ent, ReleaseGasOnTriggerVisuals.Key, true);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
new file mode 100644
index 0000000000..c4d34af7e1
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Electrocution;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ShockOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ShockOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<ShockOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        EntityUid? target;
+        if (ent.Comp.TargetContainer)
+        {
+            // shock whoever is wearing this clothing item
+            if (!_container.TryGetContainingContainer(ent.Owner, out var container))
+                return;
+            target = container.Owner;
+        }
+        else
+        {
+            target = ent.Comp.TargetUser ? args.User : ent.Owner;
+        }
+
+        if (target == null)
+            return;
+
+        _electrocution.TryDoElectrocution(target.Value, null, ent.Comp.Damage, ent.Comp.Duration, true, ignoreInsulation: true);
+        args.Handled = true;
+    }
+
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
new file mode 100644
index 0000000000..3825708550
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Implants.Components;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnActivateImplantSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnActivateImplantComponent, ActivateImplantEvent>(OnActivateImplant);
+    }
+
+    private void OnActivateImplant(Entity<TriggerOnActivateImplantComponent> ent, ref ActivateImplantEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Performer, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
new file mode 100644
index 0000000000..cc23fa2b84
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Weapons.Ranged.Events;
+
+namespace Content.Shared.Trigger.Systems;
+public sealed partial class TriggerOnEmptyGunshotSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnEmptyGunshotComponent, OnEmptyGunShotEvent>(OnEmptyGunShot);
+    }
+
+    private void OnEmptyGunShot(Entity<TriggerOnEmptyGunshotComponent> ent, ref OnEmptyGunShotEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
similarity index 56%
rename from Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
rename to Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
index ccd2a6e3df..68c109aef9 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
@@ -1,20 +1,25 @@
-using Content.Server.Explosion.Components;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Implants;
+using Content.Shared.Implants;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;
+using Content.Shared.Popups;
+using Content.Shared.Trigger.Components.Triggers;
 
-namespace Content.Server.Explosion.EntitySystems;
+namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerSystem
+public sealed partial class TriggerOnMobstateChangeSystem : EntitySystem
 {
-    private void InitializeMobstate()
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, SuicideEvent>(OnSuicide);
 
-        SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<SuicideEvent>>(OnSuicideRelay);
         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<MobStateChangedEvent>>(OnMobStateRelay);
+        SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<SuicideEvent>>(OnSuicideRelay);
     }
 
     private void OnMobStateChanged(EntityUid uid, TriggerOnMobstateChangeComponent component, MobStateChangedEvent args)
@@ -22,25 +27,21 @@ public sealed partial class TriggerSystem
         if (!component.MobState.Contains(args.NewMobState))
             return;
 
-        //This chains Mobstate Changed triggers with OnUseTimerTrigger if they have it
-        //Very useful for things that require a mobstate change and a timer
-        if (TryComp<OnUseTimerTriggerComponent>(uid, out var timerTrigger))
-        {
-            HandleTimerTrigger(
-                uid,
-                args.Origin,
-                timerTrigger.Delay,
-                timerTrigger.BeepInterval,
-                timerTrigger.InitialBeepDelay,
-                timerTrigger.BeepSound);
-        }
-        else
-            Trigger(uid);
+        _trigger.Trigger(uid, component.TargetMobstateEntity ? uid : args.Origin, component.KeyOut);
+    }
+
+    private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
+    {
+        if (!component.MobState.Contains(args.Event.NewMobState))
+            return;
+
+        _trigger.Trigger(uid, component.TargetMobstateEntity ? args.ImplantedEntity : args.Event.Origin, component.KeyOut);
     }
 
     /// <summary>
     /// Checks if the user has any implants that prevent suicide to avoid some cheesy strategies
     /// Prevents suicide by handling the event without killing the user
+    /// TODO: This doesn't seem to work at the moment as the event is never checked for being handled.
     /// </summary>
     private void OnSuicide(EntityUid uid, TriggerOnMobstateChangeComponent component, SuicideEvent args)
     {
@@ -50,17 +51,19 @@ public sealed partial class TriggerSystem
         if (!component.PreventSuicide)
             return;
 
-        _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim);
+        _popup.PopupClient(Loc.GetString("suicide-prevented"), args.Victim);
         args.Handled = true;
     }
 
     private void OnSuicideRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<SuicideEvent> args)
     {
-        OnSuicide(uid, component, args.Event);
-    }
+        if (args.Event.Handled)
+            return;
 
-    private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
-    {
-        OnMobStateChanged(uid, component, args.Event);
+        if (!component.PreventSuicide)
+            return;
+
+        _popup.PopupClient(Loc.GetString("suicide-prevented"), args.Event.Victim);
+        args.Event.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
new file mode 100644
index 0000000000..6940ea52e2
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Slippery;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnSlipSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlip);
+    }
+
+    private void OnSlip(Entity<TriggerOnSlipComponent> ent, ref SlipEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Slipped, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
new file mode 100644
index 0000000000..d364adccff
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Sticky;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TriggerOnStuckSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnStuckComponent, EntityStuckEvent>(OnStuck);
+    }
+
+    private void OnStuck(Entity<TriggerOnStuckComponent> ent, ref EntityStuckEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
new file mode 100644
index 0000000000..d5830dd75d
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Verbs;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnVerbSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnVerbComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
+    }
+
+    private void OnGetAltVerbs(Entity<TriggerOnVerbComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString(ent.Comp.Text),
+            Act = () => _trigger.Trigger(ent.Owner, user, ent.Comp.KeyOut),
+            Priority = 2 // should be above any timer settings
+        });
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
new file mode 100644
index 0000000000..5243b13742
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
@@ -0,0 +1,73 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeCollide()
+    {
+        SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnCollide);
+        SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
+
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, StartCollideEvent>(OnTimedCollide);
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, EndCollideEvent>(OnTimedEndCollide);
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, ComponentShutdown>(OnTimedShutdown);
+    }
+
+    private void OnCollide(Entity<TriggerOnCollideComponent> ent, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId == ent.Comp.FixtureID && (!ent.Comp.IgnoreOtherNonHard || args.OtherFixture.Hard))
+            Trigger(ent.Owner, args.OtherEntity, ent.Comp.KeyOut);
+    }
+
+    private void OnStepTriggered(Entity<TriggerOnStepTriggerComponent> ent, ref StepTriggeredOffEvent args)
+    {
+        Trigger(ent, args.Tripper, ent.Comp.KeyOut);
+    }
+
+    private void OnTimedCollide(Entity<TriggerOnTimedCollideComponent> ent, ref StartCollideEvent args)
+    {
+        //Ensures the trigger entity will have an active component
+        EnsureComp<ActiveTriggerOnTimedCollideComponent>(ent);
+        var otherUID = args.OtherEntity;
+        if (ent.Comp.Colliding.ContainsKey(otherUID))
+            return;
+        ent.Comp.Colliding.Add(otherUID, _timing.CurTime + ent.Comp.Threshold);
+        Dirty(ent);
+    }
+
+    private void OnTimedEndCollide(Entity<TriggerOnTimedCollideComponent> ent, ref EndCollideEvent args)
+    {
+        var otherUID = args.OtherEntity;
+        ent.Comp.Colliding.Remove(otherUID);
+        Dirty(ent);
+
+        if (ent.Comp.Colliding.Count == 0)
+            RemComp<ActiveTriggerOnTimedCollideComponent>(ent);
+    }
+
+    private void OnTimedShutdown(Entity<TriggerOnTimedCollideComponent> ent, ref ComponentShutdown args)
+    {
+        RemComp<ActiveTriggerOnTimedCollideComponent>(ent);
+    }
+
+    private void UpdateTimedCollide()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
+        while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
+        {
+            foreach (var (collidingEntity, collidingTime) in triggerOnTimedCollide.Colliding)
+            {
+                if (curTime > collidingTime)
+                {
+                    triggerOnTimedCollide.Colliding[collidingEntity] += triggerOnTimedCollide.Threshold;
+                    Dirty(uid, triggerOnTimedCollide);
+                    Trigger(uid, collidingEntity, triggerOnTimedCollide.KeyOut);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
new file mode 100644
index 0000000000..a917f1ad48
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Trigger.Components.Conditions;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeCondition()
+    {
+        SubscribeLocalEvent<WhitelistTriggerConditionComponent, AttemptTriggerEvent>(OnWhitelistTriggerAttempt);
+
+        SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
+
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
+    }
+
+    private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
+    }
+
+    private void OnUseDelayTriggerAttempt(Entity<UseDelayTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
+    }
+
+    private void OnToggleTriggerAttempt(Entity<ToggleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !ent.Comp.Enabled;
+    }
+
+    private void OnToggleGetAltVerbs(Entity<ToggleTriggerConditionComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb()
+        {
+            Text = Loc.GetString(ent.Comp.ToggleVerb),
+            Act = () => Toggle(ent, user)
+        });
+    }
+
+    private void Toggle(Entity<ToggleTriggerConditionComponent> ent, EntityUid user)
+    {
+        var msg = ent.Comp.Enabled ? ent.Comp.ToggleOff : ent.Comp.ToggleOn;
+        _popup.PopupPredicted(Loc.GetString(msg), ent.Owner, user);
+        ent.Comp.Enabled = !ent.Comp.Enabled;
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
new file mode 100644
index 0000000000..f506909760
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
@@ -0,0 +1,96 @@
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeInteraction()
+    {
+        SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
+        SubscribeLocalEvent<TriggerOnUseComponent, UseInHandEvent>(OnUse);
+
+        SubscribeLocalEvent<ItemToggleOnTriggerComponent, TriggerEvent>(HandleItemToggleOnTrigger);
+        SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(HandleAnchorOnTrigger);
+        SubscribeLocalEvent<UseDelayOnTriggerComponent, TriggerEvent>(HandleUseDelayOnTrigger);
+    }
+
+    private void OnActivate(Entity<TriggerOnActivateComponent> ent, ref ActivateInWorldEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (ent.Comp.RequireComplex && !args.Complex)
+            return;
+
+        Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+
+    private void OnUse(Entity<TriggerOnUseComponent> ent, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+
+    private void HandleItemToggleOnTrigger(Entity<ItemToggleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (!TryComp<ItemToggleComponent>(target, out var itemToggle))
+            return;
+
+        var handled = false;
+        if (itemToggle.Activated && ent.Comp.CanDeactivate)
+            handled = _itemToggle.TryDeactivate((target.Value, itemToggle), args.User, ent.Comp.Predicted, ent.Comp.ShowPopup);
+        else if (ent.Comp.CanActivate)
+            handled = _itemToggle.TryActivate((target.Value, itemToggle), args.User, ent.Comp.Predicted, ent.Comp.ShowPopup);
+
+        args.Handled |= handled;
+    }
+
+    private void HandleAnchorOnTrigger(Entity<AnchorOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var xform = Transform(target.Value);
+
+        if (xform.Anchored && ent.Comp.CanUnanchor)
+            _transform.Unanchor(target.Value, xform);
+        else if (ent.Comp.CanAnchor)
+            _transform.AnchorEntity(target.Value, xform);
+
+        if (ent.Comp.RemoveOnTrigger)
+            RemCompDeferred<AnchorOnTriggerComponent>(target.Value);
+
+        args.Handled = true;
+    }
+
+    private void HandleUseDelayOnTrigger(Entity<UseDelayOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        args.Handled |= _useDelay.TryResetDelay(target.Value, ent.Comp.CheckDelayed);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs
new file mode 100644
index 0000000000..cf7c11369b
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs
@@ -0,0 +1,138 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeProximity()
+    {
+        SubscribeLocalEvent<TriggerOnProximityComponent, StartCollideEvent>(OnProximityStartCollide);
+        SubscribeLocalEvent<TriggerOnProximityComponent, EndCollideEvent>(OnProximityEndCollide);
+        SubscribeLocalEvent<TriggerOnProximityComponent, MapInitEvent>(OnMapInit);
+        // Shouldn't need re-anchoring.
+        SubscribeLocalEvent<TriggerOnProximityComponent, AnchorStateChangedEvent>(OnProximityAnchor);
+    }
+
+    private void OnProximityAnchor(Entity<TriggerOnProximityComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        ent.Comp.Enabled = !ent.Comp.RequiresAnchored || args.Anchored;
+
+        SetProximityAppearance(ent);
+
+        if (!ent.Comp.Enabled)
+        {
+            ent.Comp.Colliding.Clear();
+        }
+        // Re-check for contacts as we cleared them.
+        else if (TryComp<PhysicsComponent>(ent, out var body))
+        {
+            _physics.RegenerateContacts((ent.Owner, body));
+        }
+
+        Dirty(ent);
+    }
+
+    private void OnMapInit(Entity<TriggerOnProximityComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.Enabled = !ent.Comp.RequiresAnchored || Transform(ent).Anchored;
+
+        SetProximityAppearance(ent);
+
+        if (!TryComp<PhysicsComponent>(ent, out var body))
+            return;
+
+        _fixture.TryCreateFixture(
+            ent.Owner,
+            ent.Comp.Shape,
+            TriggerOnProximityComponent.FixtureID,
+            hard: false,
+            body: body,
+            collisionLayer: ent.Comp.Layer);
+
+        Dirty(ent);
+    }
+
+    private void OnProximityStartCollide(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
+            return;
+
+        component.Colliding[args.OtherEntity] = args.OtherBody;
+    }
+
+    private static void OnProximityEndCollide(EntityUid uid, TriggerOnProximityComponent component, ref EndCollideEvent args)
+    {
+        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
+            return;
+
+        component.Colliding.Remove(args.OtherEntity);
+    }
+
+    private void SetProximityAppearance(Entity<TriggerOnProximityComponent> ent)
+    {
+        _appearance.SetData(ent.Owner, ProximityTriggerVisualState.State, ent.Comp.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off);
+    }
+
+    private void Activate(Entity<TriggerOnProximityComponent> ent, EntityUid user)
+    {
+        var curTime = _timing.CurTime;
+
+        if (!ent.Comp.Repeating)
+        {
+            ent.Comp.Enabled = false;
+            ent.Comp.Colliding.Clear();
+        }
+        else
+        {
+            ent.Comp.NextTrigger = curTime + ent.Comp.Cooldown;
+        }
+
+        // Queue a visual update for when the animation is complete.
+        ent.Comp.NextVisualUpdate = curTime + ent.Comp.AnimationDuration;
+        Dirty(ent);
+
+        _appearance.SetData(ent.Owner, ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active);
+
+        Trigger(ent.Owner, user, ent.Comp.KeyOut);
+    }
+
+    private void UpdateProximity()
+    {
+        var curTime = _timing.CurTime;
+
+        var query = EntityQueryEnumerator<TriggerOnProximityComponent>();
+        while (query.MoveNext(out var uid, out var trigger))
+        {
+            if (curTime >= trigger.NextVisualUpdate)
+            {
+                // Update the visual state once the animation is done.
+                trigger.NextVisualUpdate = TimeSpan.MaxValue;
+                Dirty(uid, trigger);
+                SetProximityAppearance((uid, trigger));
+            }
+
+            if (!trigger.Enabled)
+                continue;
+
+            if (curTime < trigger.NextTrigger)
+                // The trigger's on cooldown.
+                continue;
+
+            // Check for anything colliding and moving fast enough.
+            foreach (var (collidingUid, colliding) in trigger.Colliding)
+            {
+                if (TerminatingOrDeleted(collidingUid))
+                    continue;
+
+                if (colliding.LinearVelocity.Length() < trigger.TriggerSpeed)
+                    continue;
+
+                // Trigger!
+                Activate((uid, trigger), collidingUid);
+                break;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs
new file mode 100644
index 0000000000..fa5aa7ea6e
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.DeviceLinking.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeSignal()
+    {
+        SubscribeLocalEvent<SignalOnTriggerComponent, ComponentInit>(SignalOnTriggerInit);
+        SubscribeLocalEvent<TriggerOnSignalComponent, ComponentInit>(TriggerOnSignalInit);
+
+        SubscribeLocalEvent<SignalOnTriggerComponent, TriggerEvent>(HandleSignalOnTrigger);
+        SubscribeLocalEvent<TriggerOnSignalComponent, SignalReceivedEvent>(OnSignalReceived);
+    }
+
+    private void SignalOnTriggerInit(Entity<SignalOnTriggerComponent> ent, ref ComponentInit args)
+    {
+        _deviceLink.EnsureSourcePorts(ent.Owner, ent.Comp.Port);
+    }
+
+    private void TriggerOnSignalInit(Entity<TriggerOnSignalComponent> ent, ref ComponentInit args)
+    {
+        _deviceLink.EnsureSinkPorts(ent.Owner, ent.Comp.Port);
+    }
+
+    private void HandleSignalOnTrigger(Entity<SignalOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        _deviceLink.InvokePort(ent.Owner, ent.Comp.Port);
+        args.Handled = true;
+    }
+
+    private void OnSignalReceived(Entity<TriggerOnSignalComponent> ent, ref SignalReceivedEvent args)
+    {
+        if (args.Port != ent.Comp.Port)
+            return;
+
+        Trigger(ent.Owner, args.Trigger, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
new file mode 100644
index 0000000000..edcdd03894
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
@@ -0,0 +1,70 @@
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+
+    private void InitializeSpawn()
+    {
+        SubscribeLocalEvent<TriggerOnSpawnComponent, MapInitEvent>(OnSpawnInit);
+
+        SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(HandleSpawnOnTrigger);
+        SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteOnTrigger);
+    }
+
+    private void OnSpawnInit(Entity<TriggerOnSpawnComponent> ent, ref MapInitEvent args)
+    {
+        Trigger(ent.Owner, null, ent.Comp.KeyOut);
+    }
+
+    private void HandleSpawnOnTrigger(Entity<SpawnOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var xform = Transform(target.Value);
+
+        if (ent.Comp.UseMapCoords)
+        {
+            var mapCoords = _transform.GetMapCoordinates(target.Value, xform);
+            if (ent.Comp.Predicted)
+                EntityManager.PredictedSpawn(ent.Comp.Proto, mapCoords);
+            else if (_net.IsServer)
+                Spawn(ent.Comp.Proto, mapCoords);
+
+        }
+        else
+        {
+            var coords = xform.Coordinates;
+            if (!coords.IsValid(EntityManager))
+                return;
+
+            if (ent.Comp.Predicted)
+                PredictedSpawnAttachedTo(ent.Comp.Proto, coords);
+            else if (_net.IsServer)
+                SpawnAttachedTo(ent.Comp.Proto, coords);
+
+        }
+    }
+
+    private void HandleDeleteOnTrigger(Entity<DeleteOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        PredictedQueueDel(target);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
new file mode 100644
index 0000000000..58ac43e571
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
@@ -0,0 +1,179 @@
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeTimer()
+    {
+        SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
+        SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomInit);
+        SubscribeLocalEvent<TimerTriggerComponent, ComponentShutdown>(OnTimerShutdown);
+        SubscribeLocalEvent<TimerTriggerComponent, ExaminedEvent>(OnTimerExamined);
+        SubscribeLocalEvent<TimerTriggerComponent, TriggerEvent>(OnTimerTriggered);
+        SubscribeLocalEvent<TimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnTimerGetAltVerbs);
+    }
+
+    // set the time of the first trigger after being spawned
+    private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+        Dirty(ent);
+    }
+
+    private void OnRandomInit(Entity<RandomTimerTriggerComponent> ent, ref MapInitEvent args)
+    {
+        if (_net.IsClient) // Nextfloat will mispredict, so we set it on the server and dirty it
+            return;
+
+        if (!TryComp<TimerTriggerComponent>(ent, out var timerTriggerComp))
+            return;
+
+        timerTriggerComp.Delay = TimeSpan.FromSeconds(_random.NextFloat(ent.Comp.Min, ent.Comp.Max));
+        Dirty(ent.Owner, timerTriggerComp);
+    }
+
+    private void OnTimerShutdown(Entity<TimerTriggerComponent> ent, ref ComponentShutdown args)
+    {
+        RemComp<ActiveTimerTriggerComponent>(ent);
+    }
+
+    private void OnTimerExamined(Entity<TimerTriggerComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange && ent.Comp.Examinable)
+            args.PushText(Loc.GetString("timer-trigger-examine", ("time", ent.Comp.Delay.TotalSeconds)));
+    }
+
+    private void OnTimerTriggered(Entity<TimerTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        args.Handled |= ActivateTimerTrigger(ent.AsNullable(), args.User);
+    }
+
+    /// <summary>
+    /// Add an alt-click interaction that cycles through delays.
+    /// </summary>
+    private void OnTimerGetAltVerbs(Entity<TimerTriggerComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        if (ent.Comp.DelayOptions.Count <= 1)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Category = TimerOptions,
+            Text = Loc.GetString("timer-trigger-verb-cycle"),
+            Act = () => CycleDelay(ent, user),
+            Priority = 1
+        });
+
+        foreach (var option in ent.Comp.DelayOptions)
+        {
+            if (MathHelper.CloseTo(option.TotalSeconds, ent.Comp.Delay.TotalSeconds))
+            {
+                args.Verbs.Add(new AlternativeVerb
+                {
+                    Category = TimerOptions,
+                    Text = Loc.GetString("timer-trigger-verb-set-current", ("time", option.TotalSeconds)),
+                    Disabled = true,
+                    Priority = -100 * (int)option.TotalSeconds
+                });
+            }
+            else
+            {
+                args.Verbs.Add(new AlternativeVerb
+                {
+                    Category = TimerOptions,
+                    Text = Loc.GetString("timer-trigger-verb-set", ("time", option.TotalSeconds)),
+                    Priority = -100 * (int)option.TotalSeconds,
+                    Act = () =>
+                    {
+                        ent.Comp.Delay = option;
+                        Dirty(ent);
+                        _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", option.TotalSeconds)), user, user);
+                    }
+                });
+            }
+        }
+    }
+
+    public static readonly VerbCategory TimerOptions = new("verb-categories-timer", "/Textures/Interface/VerbIcons/clock.svg.192dpi.png");
+
+    /// <summary>
+    /// Select the next entry from the DelayOptions.
+    /// </summary>
+    private void CycleDelay(Entity<TimerTriggerComponent> ent, EntityUid? user)
+    {
+        if (ent.Comp.DelayOptions.Count <= 1)
+            return;
+
+        // This is somewhat inefficient, but its good enough. This is run rarely, and the lists should be short.
+
+        ent.Comp.DelayOptions.Sort();
+        Dirty(ent);
+
+        if (ent.Comp.DelayOptions[^1] <= ent.Comp.Delay)
+        {
+            ent.Comp.Delay = ent.Comp.DelayOptions[0];
+            _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", ent.Comp.Delay)), ent.Owner, user);
+            return;
+        }
+
+        foreach (var option in ent.Comp.DelayOptions)
+        {
+            if (option > ent.Comp.Delay)
+            {
+                ent.Comp.Delay = option;
+                _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", option)), ent.Owner, user);
+                return;
+            }
+        }
+    }
+
+    private void UpdateRepeat()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.NextTrigger > curTime)
+                continue;
+
+            comp.NextTrigger += comp.Delay;
+            Dirty(uid, comp);
+            Trigger(uid, null, comp.KeyOut);
+        }
+    }
+
+    private void UpdateTimer()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveTimerTriggerComponent, TimerTriggerComponent>();
+        while (query.MoveNext(out var uid, out _, out var timer))
+        {
+            if (_net.IsServer && timer.BeepSound != null && timer.NextBeep <= curTime)
+            {
+                _audio.PlayPvs(timer.BeepSound, uid);
+                timer.NextBeep += timer.BeepInterval;
+            }
+
+            if (timer.NextTrigger <= curTime)
+            {
+                Trigger(uid, timer.User, timer.KeyOut);
+                // Remove after triggering to prevent it from starting the timer again
+                RemComp<ActiveTimerTriggerComponent>(uid);
+                if (TryComp<AppearanceComponent>(uid, out var appearance))
+                    _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
new file mode 100644
index 0000000000..ac67cb7ed2
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
@@ -0,0 +1,160 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeVoice()
+    {
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ComponentInit>(OnVoiceInit);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ExaminedEvent>(OnVoiceExamine);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ListenEvent>(OnListen);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, GetVerbsEvent<AlternativeVerb>>(OnVoiceGetAltVerbs);
+    }
+
+    private void OnVoiceInit(Entity<TriggerOnVoiceComponent> ent, ref ComponentInit args)
+    {
+        if (ent.Comp.IsListening)
+            EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+        else
+            RemCompDeferred<ActiveListenerComponent>(ent);
+    }
+
+    private void OnVoiceExamine(Entity<TriggerOnVoiceComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange)
+        {
+            args.PushText(string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase)
+                ? Loc.GetString("trigger-on-voice-uninitialized")
+                : Loc.GetString("trigger-on-voice-examine", ("keyphrase", ent.Comp.KeyPhrase)));
+        }
+    }
+    private void OnListen(Entity<TriggerOnVoiceComponent> ent, ref ListenEvent args)
+    {
+        var component = ent.Comp;
+        var message = args.Message.Trim();
+
+        if (component.IsRecording)
+        {
+            var ev = new ListenAttemptEvent(args.Source);
+            RaiseLocalEvent(ent, ev);
+
+            if (ev.Cancelled)
+                return;
+
+            if (message.Length >= component.MinLength && message.Length <= component.MaxLength)
+                FinishRecording(ent, args.Source, args.Message);
+            else if (message.Length > component.MaxLength)
+                _popup.PopupEntity(Loc.GetString("trigger-on-voice-record-failed-too-long"), ent);
+            else if (message.Length < component.MinLength)
+                _popup.PopupEntity(Loc.GetString("trigger-on-voice-record-failed-too-short"), ent);
+
+            return;
+        }
+
+        if (!string.IsNullOrWhiteSpace(component.KeyPhrase) && message.IndexOf(component.KeyPhrase, StringComparison.InvariantCultureIgnoreCase) is var index and >= 0)
+        {
+            _adminLogger.Add(LogType.Trigger, LogImpact.Medium,
+                    $"A voice-trigger on {ToPrettyString(ent):entity} was triggered by {ToPrettyString(args.Source):speaker} speaking the key-phrase {component.KeyPhrase}.");
+            Trigger(ent, args.Source, ent.Comp.KeyOut);
+
+            var messageWithoutPhrase = message.Remove(index, component.KeyPhrase.Length).Trim();
+            var voice = new VoiceTriggeredEvent(args.Source, message, messageWithoutPhrase);
+            RaiseLocalEvent(ent, ref voice);
+        }
+    }
+
+    private void OnVoiceGetAltVerbs(Entity<TriggerOnVoiceComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        var user = args.User;
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString(ent.Comp.IsRecording ? "trigger-on-voice-stop" : "trigger-on-voice-record"),
+            Act = () =>
+            {
+                if (ent.Comp.IsRecording)
+                    StopRecording(ent, user);
+                else
+                    StartRecording(ent, user);
+            },
+            Priority = 1
+        });
+
+        if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
+            return;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString("trigger-on-voice-clear"),
+            Act = () =>
+            {
+                ClearRecording(ent);
+            }
+        });
+    }
+
+    /// <summary>
+    /// Start recording a new keyphrase.
+    /// </summary>
+    public void StartRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid? user)
+    {
+        ent.Comp.IsRecording = true;
+        Dirty(ent);
+        EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+
+        if (user == null)
+            _adminLogger.Add(LogType.Trigger, LogImpact.Low, $"A voice-trigger on {ToPrettyString(ent):entity} has started recording.");
+        else
+            _adminLogger.Add(LogType.Trigger, LogImpact.Low, $"A voice-trigger on {ToPrettyString(ent):entity} has started recording. User: {ToPrettyString(user.Value):user}");
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-start-recording"), ent, user);
+    }
+
+    /// <summary>
+    /// Stop recording without setting a keyphrase.
+    /// </summary>
+    public void StopRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid? user)
+    {
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
+            RemComp<ActiveListenerComponent>(ent);
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-stop-recording"), ent, user);
+    }
+
+
+    /// <summary>
+    /// Stop recording and set the current keyphrase message.
+    /// </summary>
+    public void FinishRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid source, string message)
+    {
+        ent.Comp.KeyPhrase = message;
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+
+        _adminLogger.Add(LogType.Trigger, LogImpact.Low,
+                $"A voice-trigger on {ToPrettyString(ent):entity} has recorded a new keyphrase: '{ent.Comp.KeyPhrase}'. Recorded from {ToPrettyString(source):speaker}");
+
+        _popup.PopupEntity(Loc.GetString("trigger-on-voice-recorded", ("keyphrase", ent.Comp.KeyPhrase)), ent);
+    }
+
+    /// <summary>
+    /// Resets the key phrase and stops recording.
+    /// </summary>
+    public void ClearRecording(Entity<TriggerOnVoiceComponent> ent)
+    {
+        ent.Comp.KeyPhrase = null;
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        RemComp<ActiveListenerComponent>(ent);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
new file mode 100644
index 0000000000..6a749b87ab
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -0,0 +1,186 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.DeviceLinking;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Popups;
+using Content.Shared.Timing;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Network;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
+using Robust.Shared.Random;
+using Robust.Shared.Audio.Systems;
+
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// System containing the basic trigger API.
+/// </summary>
+/// <remarks>
+/// If you add a custom trigger subscription or effect then don't put them here.
+/// Put them into a separate system so we don't end up with a giant list of imports.
+/// </remarks>
+public sealed partial class TriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly FixtureSystem _fixture = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+
+    public const string DefaultTriggerKey = "trigger";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeCollide();
+        InitializeCondition();
+        InitializeInteraction();
+        InitializeProximity();
+        InitializeSignal();
+        InitializeTimer();
+        InitializeSpawn();
+        InitializeVoice();
+    }
+
+    /// <summary>
+    /// Trigger the given entity.
+    /// </summary>
+    /// <param name="trigger">The entity that has the components that should be triggered.</param>
+    /// <param name="user">The user of the trigger. Some effects may target the user instead of the trigger entity.</param>
+    /// <param name="key">A key string to allow multiple, independent triggers on the same entity. If null then all triggers will activate.</param>
+    /// <returns>Whether or not the trigger has sucessfully activated an effect.</returns>
+    public bool Trigger(EntityUid trigger, EntityUid? user = null, string? key = null)
+    {
+        var attemptTriggerEvent = new AttemptTriggerEvent(user, key);
+        RaiseLocalEvent(trigger, ref attemptTriggerEvent);
+        if (attemptTriggerEvent.Cancelled)
+            return false;
+
+        var triggerEvent = new TriggerEvent(user, key);
+        RaiseLocalEvent(trigger, ref triggerEvent, true);
+        return triggerEvent.Handled;
+    }
+
+    /// <summary>
+    /// Activate a timer trigger on an entity with <see cref="TimerTriggerComponent"/>.
+    /// </summary>
+    /// <returns>Whether or not a timer was activated.</returns>
+    public bool ActivateTimerTrigger(Entity<TimerTriggerComponent?> ent, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (HasComp<ActiveTimerTriggerComponent>(ent))
+            return false; // already activated
+
+        if (user != null)
+        {
+            _adminLogger.Add(LogType.Trigger,
+                $"{ToPrettyString(user.Value):user} started a {ent.Comp.Delay} second timer trigger on entity {ToPrettyString(ent.Owner):timer}");
+        }
+        else
+        {
+            _adminLogger.Add(LogType.Trigger,
+                $"{ent.Comp.Delay} second timer trigger started on entity {ToPrettyString(ent.Owner):timer}");
+        }
+
+        if (ent.Comp.Popup != null)
+            _popup.PopupPredicted(Loc.GetString(ent.Comp.Popup.Value, ("device", ent.Owner)), ent.Owner, user);
+
+        AddComp<ActiveTimerTriggerComponent>(ent);
+        var curTime = _timing.CurTime;
+        ent.Comp.NextTrigger = curTime + ent.Comp.Delay;
+        var delay = ent.Comp.InitialBeepDelay ?? ent.Comp.BeepInterval;
+        ent.Comp.NextBeep = curTime + delay;
+        Dirty(ent);
+
+        var ev = new ActiveTimerTriggerEvent(user);
+        RaiseLocalEvent(ent.Owner, ref ev);
+
+        if (TryComp<AppearanceComponent>(ent, out var appearance))
+            _appearance.SetData(ent.Owner, TriggerVisuals.VisualState, TriggerVisualState.Primed, appearance);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Stop a timer trigger on an entity with <see cref="TimerTriggerComponent"/>.
+    /// </summary>
+    /// <returns>Whether or not a timer was stopped.</returns>
+    public bool StopTimerTrigger(Entity<TimerTriggerComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (!HasComp<ActiveTimerTriggerComponent>(ent))
+            return false; // the timer is not active
+
+        RemComp<ActiveTimerTriggerComponent>(ent);
+        if (TryComp<AppearanceComponent>(ent.Owner, out var appearance))
+            _appearance.SetData(ent.Owner, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
+
+        _adminLogger.Add(LogType.Trigger, $"A timer trigger was stopped before triggering on entity {ToPrettyString(ent.Owner):timer}");
+        return true;
+    }
+
+    /// <summary>
+    /// Delay an active timer trigger.
+    /// Returns false if not active.
+    /// </summary>
+    /// <param name="amount">The time to add.</param>
+    public bool TryDelay(Entity<TimerTriggerComponent?> ent, TimeSpan amount)
+    {
+        if (!Resolve(ent, ref ent.Comp, false) || !HasComp<ActiveTimerTriggerComponent>(ent))
+            return false;
+
+        ent.Comp.NextTrigger += amount;
+        Dirty(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Setter for the Delay datafield.
+    /// </summary>
+    public void SetDelay(Entity<TimerTriggerComponent?> ent, TimeSpan delay)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.Delay = delay;
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Gets the remaining time until the trigger will activate.
+    /// Returns null if the trigger is not currently active.
+    /// </summary>
+    public TimeSpan? GetRemainingTime(Entity<TimerTriggerComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false) || !HasComp<ActiveTimerTriggerComponent>(ent))
+            return null; // not a timer or not currently active
+
+        return ent.Comp.NextTrigger - _timing.CurTime;
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateTimer();
+        UpdateRepeat();
+        UpdateProximity();
+        UpdateTimedCollide();
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs
new file mode 100644
index 0000000000..2461e797dc
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Timing;
+using Content.Shared.Trigger.Components;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TwoStageTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly TriggerSystem _triggerSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TwoStageTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<TwoStageTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (ent.Comp.Triggered)
+            return; // already triggered
+
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        EntityManager.AddComponents(ent, ent.Comp.Components);
+        EnsureComp<ActiveTwoStageTriggerComponent>(ent);
+        ent.Comp.Triggered = true;
+        ent.Comp.NextTriggerTime = _timing.CurTime + ent.Comp.TriggerDelay;
+        ent.Comp.User = args.User;
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var enumerator = EntityQueryEnumerator<ActiveTwoStageTriggerComponent, TwoStageTriggerComponent>();
+        while (enumerator.MoveNext(out var uid, out _, out var component))
+        {
+            if (curTime < component.NextTriggerTime)
+                continue;
+
+            RemComp<ActiveTwoStageTriggerComponent>(uid);
+            _triggerSystem.Trigger(uid, component.User, component.KeyOut);
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
new file mode 100644
index 0000000000..9b83c4cf8e
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Cuffs;
+using Content.Shared.Cuffs.Components;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class UncuffOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedCuffableSystem _cuffable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<UncuffOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<UncuffOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<CuffableComponent>(target.Value, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1)
+            return;
+
+        _cuffable.Uncuff(target.Value, args.User, cuffs.LastAddedCuffs);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/TriggerEvent.cs b/Content.Shared/Trigger/TriggerEvent.cs
new file mode 100644
index 0000000000..e65e3b48a8
--- /dev/null
+++ b/Content.Shared/Trigger/TriggerEvent.cs
@@ -0,0 +1,33 @@
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// Raised whenever something is Triggered on the entity.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+/// <param name="Key">
+/// Allows to have multiple independent triggers on the same entity.
+/// Setting this to null will activate all triggers.
+/// </param>
+/// <param name="Handled">Marks the event as handled if at least one trigger effect was activated.</param>
+[ByRefEvent]
+public record struct TriggerEvent(EntityUid? User = null, string? Key = null, bool Handled = false);
+
+/// <summary>
+/// Raised before a trigger is activated.
+/// Cancelling prevents it from triggering.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+/// <param name="Key">
+/// Allows to have multiple independent triggers on the same entity.
+/// Setting this to null will activate all triggers.
+/// </param>
+/// <param name="Handled">Marks the event as handled if at least one trigger effect was activated.</param>
+[ByRefEvent]
+public record struct AttemptTriggerEvent(EntityUid? User, string? Key = null, bool Cancelled = false);
+
+/// <summary>
+/// Raised when a timer trigger becomes active.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+[ByRefEvent]
+public readonly record struct ActiveTimerTriggerEvent(EntityUid? User);
diff --git a/Content.Shared/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs
index ed544f3590..f1d4a55fb1 100644
--- a/Content.Shared/Trigger/TriggerVisuals.cs
+++ b/Content.Shared/Trigger/TriggerVisuals.cs
@@ -1,31 +1,30 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Trigger
+namespace Content.Shared.Trigger;
+
+[Serializable, NetSerializable]
+public enum ProximityTriggerVisuals : byte
 {
-    [Serializable, NetSerializable]
-    public enum ProximityTriggerVisuals : byte
-    {
-        Off,
-        Inactive,
-        Active,
-    }
-
-    [Serializable, NetSerializable]
-    public enum ProximityTriggerVisualState : byte
-    {
-        State,
-    }
-
-    [Serializable, NetSerializable]
-    public enum TriggerVisuals : byte
-    {
-        VisualState,
-    }
-
-    [Serializable, NetSerializable]
-    public enum TriggerVisualState : byte
-    {
-        Primed,
-        Unprimed,
-    }
+    Off,
+    Inactive,
+    Active,
+}
+
+[Serializable, NetSerializable]
+public enum ProximityTriggerVisualState : byte
+{
+    State,
+}
+
+[Serializable, NetSerializable]
+public enum TriggerVisuals : byte
+{
+    VisualState,
+}
+
+[Serializable, NetSerializable]
+public enum TriggerVisualState : byte
+{
+    Primed,
+    Unprimed,
 }
diff --git a/Content.Shared/Trigger/VoiceTriggeredEvent.cs b/Content.Shared/Trigger/VoiceTriggeredEvent.cs
new file mode 100644
index 0000000000..af138b56cf
--- /dev/null
+++ b/Content.Shared/Trigger/VoiceTriggeredEvent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// Raised when a voice trigger is activated, containing the message that triggered it.
+/// </summary>
+/// <param name="Source"> The EntityUid of the entity sending the message</param>
+/// <param name="Message"> The contents of the message</param>
+/// <param name="MessageWithoutPhrase"> The message without the phrase that triggered it.</param>
+[ByRefEvent]
+public readonly record struct VoiceTriggeredEvent(EntityUid Source, string? Message, string MessageWithoutPhrase);
diff --git a/Content.Shared/Turrets/StationAiTurretComponent.cs b/Content.Shared/Turrets/StationAiTurretComponent.cs
new file mode 100644
index 0000000000..125195787e
--- /dev/null
+++ b/Content.Shared/Turrets/StationAiTurretComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Turrets;
+
+/// <summary>
+/// This component designates a turret that is under the direct control of the station AI.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StationAiTurretComponent : Component
+{
+
+}
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs
index aa8a0f1834..d2fb70ee76 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.cs
@@ -126,10 +126,10 @@ public sealed partial class ActivatableUISystem : EntitySystem
 
             if (component.InHandsOnly)
             {
-                if (!_hands.IsHolding(args.User, uid, out var hand, args.Hands))
+                if (!_hands.IsHolding((args.User, args.Hands), uid, out var hand ))
                     return false;
 
-                if (component.RequireActiveHand && args.Hands.ActiveHand != hand)
+                if (component.RequireActiveHand && args.Hands.ActiveHandId != hand)
                     return false;
             }
         }
@@ -244,10 +244,10 @@ public sealed partial class ActivatableUISystem : EntitySystem
             if (!TryComp(user, out HandsComponent? hands))
                 return false;
 
-            if (!_hands.IsHolding(user, uiEntity, out var hand, hands))
+            if (!_hands.IsHolding((user, hands), uiEntity, out var hand))
                 return false;
 
-            if (aui.RequireActiveHand && hands.ActiveHand != hand)
+            if (aui.RequireActiveHand && hands.ActiveHandId != hand)
                 return false;
         }
 
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index 5ec060d0e2..194d4f57a3 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -205,16 +205,16 @@ namespace Content.Shared.VendingMachines
         #endregion
     }
 
-    [Serializable, NetSerializable]
-    public sealed class VendingMachineInventoryEntry
+    [Serializable, NetSerializable, DataDefinition]
+    public sealed partial class VendingMachineInventoryEntry
     {
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public InventoryType Type;
 
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public string ID;
 
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public uint Amount;
 
         public VendingMachineInventoryEntry(InventoryType type, string id, uint amount)
diff --git a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
index b39e29aead..be4816b319 100644
--- a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
+++ b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Shared.VendingMachines
 {
-    [Serializable, NetSerializable, Prototype]
+    [Prototype]
     public sealed partial class VendingMachineInventoryPrototype : IPrototype
     {
         [ViewVariables]
diff --git a/Content.Shared/Warps/WarpPointComponent.cs b/Content.Shared/Warps/WarpPointComponent.cs
index 61e84a660c..fdd33efb86 100644
--- a/Content.Shared/Warps/WarpPointComponent.cs
+++ b/Content.Shared/Warps/WarpPointComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Warps;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class WarpPointComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public string? Location;
 
     /// <summary>
diff --git a/Content.Server/Warps/WarpPointSystem.cs b/Content.Shared/Warps/WarpPointSystem.cs
similarity index 93%
rename from Content.Server/Warps/WarpPointSystem.cs
rename to Content.Shared/Warps/WarpPointSystem.cs
index 5763bc4882..ca9b98ac6d 100644
--- a/Content.Server/Warps/WarpPointSystem.cs
+++ b/Content.Shared/Warps/WarpPointSystem.cs
@@ -1,9 +1,9 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.Ghost;
 using Content.Shared.Warps;
 using Robust.Shared.Localization; //Sunrise-Edit
 
-namespace Content.Server.Warps;
+namespace Content.Shared.Warps;
 
 public sealed class WarpPointSystem : EntitySystem
 {
diff --git a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
index 84e75129b1..42b72efede 100644
--- a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
@@ -1,7 +1,4 @@
-using System.Numerics;
 using Robust.Shared.GameStates;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Weapons.Melee.Components;
 
@@ -9,7 +6,7 @@ namespace Content.Shared.Weapons.Melee.Components;
 /// This is used for a melee weapon that throws whatever gets hit by it in a line
 /// until it hits a wall or a time limit is exhausted.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
 [Access(typeof(MeleeThrowOnHitSystem))]
 public sealed partial class MeleeThrowOnHitComponent : Component
 {
@@ -42,6 +39,21 @@ public sealed partial class MeleeThrowOnHitComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool ActivateOnThrown;
+
+    /// <summary>
+    /// Whether the entity can apply knockback this instance of being thrown.
+    /// If true, the entity cannot apply knockback.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadOnly)]
+    public bool ThrowOnCooldown;
+
+    /// <summary>
+    /// Whether this item has hit anyone while it was thrown.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadOnly)]
+    public bool HitWhileThrown;
 }
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
index 3add18365a..562e006a92 100644
--- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -48,17 +48,17 @@ public sealed class MeleeSoundSystem : EntitySystem
         {
             if (damageType == null && damageSoundComp.NoDamageSound != null)
             {
-                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, damageSoundComp.NoDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundTypes?.TryGetValue(damageType, out var damageSoundType) == true)
             {
-                _audio.PlayPredicted(damageSoundType, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundType, coords, userUid, damageSoundType.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundGroups?.TryGetValue(damageType, out var damageSoundGroup) == true)
             {
-                _audio.PlayPredicted(damageSoundGroup, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundGroup, coords, userUid, damageSoundGroup.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
@@ -68,17 +68,17 @@ public sealed class MeleeSoundSystem : EntitySystem
         {
             if (hitSoundOverride != null)
             {
-                _audio.PlayPredicted(hitSoundOverride, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSoundOverride, coords, userUid, hitSoundOverride.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (hitSound != null)
             {
-                _audio.PlayPredicted(hitSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSound, coords, userUid, hitSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else
             {
-                _audio.PlayPredicted(noDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(noDamageSound, coords, userUid, noDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 035432ef85..f1f9a19a75 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -22,6 +22,29 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
     {
         SubscribeLocalEvent<MeleeThrowOnHitComponent, MeleeHitEvent>(OnMeleeHit);
         SubscribeLocalEvent<MeleeThrowOnHitComponent, ThrowDoHitEvent>(OnThrowHit);
+        SubscribeLocalEvent<MeleeThrowOnHitComponent, ThrownEvent>(OnThrow);
+        SubscribeLocalEvent<MeleeThrowOnHitComponent, LandEvent>(OnLand);
+    }
+
+    private void OnThrow(Entity<MeleeThrowOnHitComponent> ent, ref ThrownEvent args)
+    {
+        if (_delay.IsDelayed(ent.Owner))
+            return;
+
+        ent.Comp.HitWhileThrown = false;
+        ent.Comp.ThrowOnCooldown = false;
+
+        DirtyField(ent, ent.Comp, nameof(MeleeThrowOnHitComponent.HitWhileThrown));
+        DirtyField(ent, ent.Comp, nameof(MeleeThrowOnHitComponent.ThrowOnCooldown));
+    }
+
+    private void OnLand(Entity<MeleeThrowOnHitComponent> ent, ref LandEvent args)
+    {
+        if (ent.Comp.HitWhileThrown && !_delay.IsDelayed(ent.Owner))
+            _delay.TryResetDelay(ent.Owner);
+
+        ent.Comp.ThrowOnCooldown = true;
+        DirtyField(ent, ent.Comp, nameof(MeleeThrowOnHitComponent.ThrowOnCooldown));
     }
 
     private void OnMeleeHit(Entity<MeleeThrowOnHitComponent> weapon, ref MeleeHitEvent args)
@@ -50,9 +73,15 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
         if (!weapon.Comp.ActivateOnThrown)
             return;
 
+        if (weapon.Comp.ThrowOnCooldown)
+            return;
+
         if (!TryComp<PhysicsComponent>(args.Thrown, out var weaponPhysics))
             return;
 
+        weapon.Comp.HitWhileThrown = true;
+        DirtyField(weapon, weapon.Comp, nameof(MeleeThrowOnHitComponent.HitWhileThrown));
+
         ThrowOnHitHelper(weapon, args.Component.Thrower, args.Target, weaponPhysics.LinearVelocity);
     }
 
@@ -68,7 +97,7 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
         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/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 08dfca7f25..d5bbf8552a 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -12,6 +12,7 @@ using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
@@ -53,6 +54,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
     [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
     [Dependency] protected readonly DamageableSystem Damageable = default!;
+    [Dependency] private   readonly SharedHandsSystem _hands = default!;
     [Dependency] private   readonly InventorySystem _inventory = default!;
     [Dependency] private   readonly MeleeSoundSystem _meleeSound = default!;
     [Dependency] protected readonly MobStateSystem MobState = default!;
@@ -290,15 +292,14 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         }
 
         // Use inhands entity if we got one.
-        if (EntityManager.TryGetComponent(entity, out HandsComponent? hands) &&
-            hands.ActiveHandEntity is { } held)
+        if (_hands.TryGetActiveItem(entity, out var held))
         {
             // Make sure the entity is a weapon AND it doesn't need
             // to be equipped to be used (E.g boxing gloves).
-            if (EntityManager.TryGetComponent(held, out melee) &&
+            if (TryComp(held, out melee) &&
                 !melee.MustBeEquippedToUse)
             {
-                weaponUid = held;
+                weaponUid = held.Value;
                 return true;
             }
 
@@ -579,6 +580,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         var distance = Math.Min(component.Range, direction.Length());
 
         var damage = GetDamage(meleeUid, user, component);
+        var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
         var entities = GetEntityList(ev.Entities);
 
         entities = entities.Where(e => !_tagSystem.HasTag(e, "IgnoreMelee")).ToList(); //Sunrise-edit
@@ -690,10 +692,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             RaiseLocalEvent(entity, attackedEvent);
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
 
-            // Sunrise start
-            var resistanceBypass = component.ResistanceBypassOnWide;
             var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, ignoreResistances: resistanceBypass);
-            // Sunrise End
 
             if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
             {
@@ -869,9 +868,9 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
 
         EntityUid? inTargetHand = null;
 
-        if (targetHandsComponent?.ActiveHand is { IsEmpty: false })
+        if (_hands.TryGetActiveItem(target.Value, out var activeHeldEntity))
         {
-            inTargetHand = targetHandsComponent.ActiveHand.HeldEntity!.Value;
+            inTargetHand = activeHeldEntity.Value;
         }
 
         var attemptEvent = new DisarmAttemptEvent(target.Value, user, inTargetHand);
diff --git a/Content.Shared/Weapons/Misc/ForceGunComponent.cs b/Content.Shared/Weapons/Misc/ForceGunComponent.cs
index f3aca0d4d0..dc2481cb62 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/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index e790973538..d27efa4d76 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 using Content.Shared.CombatMode;
 using Content.Shared.Hands;
-using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Movement.Events;
 using Content.Shared.Physics;
@@ -25,6 +25,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedJointSystem _joints = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
@@ -80,9 +81,11 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
 
     private void OnGrapplingReel(RequestGrapplingReelMessage msg, EntitySessionEventArgs args)
     {
-        var player = args.SenderSession.AttachedEntity;
-        if (!TryComp<HandsComponent>(player, out var hands) ||
-            !TryComp<GrapplingGunComponent>(hands.ActiveHandEntity, out var grappling))
+        if (args.SenderSession.AttachedEntity is not { } player)
+            return;
+
+        if (!_hands.TryGetActiveItem(player, out var activeItem) ||
+            !TryComp<GrapplingGunComponent>(activeItem, out var grappling))
         {
             return;
         }
@@ -94,7 +97,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             return;
         }
 
-        SetReeling(hands.ActiveHandEntity.Value, grappling, msg.Reeling, player.Value);
+        SetReeling(activeItem.Value, grappling, msg.Reeling, player);
     }
 
     private void OnWeightlessMove(ref CanWeightlessMoveEvent ev)
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index f6702569bf..0f6baf06f2 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
@@ -23,6 +24,7 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
 {
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly MobStateSystem _mob = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -139,14 +141,14 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
         gunUid = null;
         gun = null;
 
-        if (!TryComp<HandsComponent>(user, out var hands) ||
-            !TryComp(hands.ActiveHandEntity, out gun) ||
+        if (!_hands.TryGetActiveItem(user, out var activeItem) ||
+            !TryComp(activeItem, out gun) ||
             _container.IsEntityInContainer(user))
         {
             return false;
         }
 
-        gunUid = hands.ActiveHandEntity.Value;
+        gunUid = activeItem.Value;
         return true;
     }
 
diff --git a/Content.Shared/Weapons/Misc/TetherGunComponent.cs b/Content.Shared/Weapons/Misc/TetherGunComponent.cs
index fcc5494154..bb9ebd4e43 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/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 13cee5bad6..0ba8a5faee 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
@@ -23,11 +22,16 @@ public partial class AmmoComponent : Component, IShootable
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
 public sealed partial class CartridgeAmmoComponent : AmmoComponent
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("proto", required: true)]
+    /// <summary>
+    /// Prototype of the ammo to be shot.
+    /// </summary>
+    [DataField("proto", required: true)]
     public EntProtoId Prototype;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    /// <summary>
+    /// Is this cartridge spent?
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public bool Spent;
 
     /// <summary>
@@ -36,6 +40,9 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [DataField]
     public bool DeleteOnSpawn;
 
+    /// <summary>
+    /// Sound the case makes when it leaves the weapon.
+    /// </summary>
     [DataField("soundEject")]
     public SoundSpecifier? EjectSound = new SoundCollectionSpecifier("CasingEject");
 }
diff --git a/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs
index efae42952b..998fa8f0eb 100644
--- a/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs
@@ -4,4 +4,4 @@ namespace Content.Shared.Weapons.Ranged.Events;
 /// Raised directed on the gun when trying to fire it while it's out of ammo
 /// </summary>
 [ByRefEvent]
-public record struct OnEmptyGunShotEvent(EntityUid EmptyGun);
+public record struct OnEmptyGunShotEvent(EntityUid User);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
index b28b4b7508..dcc9a5689a 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
@@ -1,13 +1,52 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Components;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem
 {
+    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
+
     // needed for server system
     protected virtual void InitializeCartridge()
     {
+        SubscribeLocalEvent<CartridgeAmmoComponent, ExaminedEvent>(OnCartridgeExamine);
+        SubscribeLocalEvent<CartridgeAmmoComponent, DamageExamineEvent>(OnCartridgeDamageExamine);
+    }
+
+    private void OnCartridgeExamine(Entity<CartridgeAmmoComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(ent.Comp.Spent
+            ? Loc.GetString("gun-cartridge-spent")
+            : Loc.GetString("gun-cartridge-unspent"));
+    }
+
+    private void OnCartridgeDamageExamine(EntityUid uid, CartridgeAmmoComponent component, ref DamageExamineEvent args)
+    {
+        var damageSpec = GetProjectileDamage(component.Prototype);
+
+        if (damageSpec == null)
+            return;
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-projectile"));
+    }
+
+    private DamageSpecifier? GetProjectileDamage(EntProtoId proto)
+    {
+        if (!ProtoManager.TryIndex(proto, out var entityProto))
+            return null;
+
+        if (!entityProto.TryGetComponent<ProjectileComponent>(out var projectile, Factory))
+            return null;
+
+        if (!projectile.Damage.Empty)
+            return projectile.Damage * Damageable.UniversalProjectileDamageModifier;
+
+        return null;
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index a30651e1c8..99af845146 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -101,7 +101,7 @@ public partial class SharedGunSystem
             return false;
 
         // If it's a speedloader try to get ammo from it.
-        if (EntityManager.HasComponent<SpeedLoaderComponent>(uid))
+        if (HasComp<SpeedLoaderComponent>(uid))
         {
             var freeSlots = 0;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 567c13d25a..3a0c4d255e 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -11,6 +11,7 @@ using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.Gravity;
 using Content.Shared.Hands;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
@@ -56,6 +57,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] protected readonly ISharedAdminLogManager Logs = default!;
     [Dependency] protected readonly DamageableSystem Damageable = default!;
     [Dependency] protected readonly ExamineSystemShared Examine = default!;
+    [Dependency] private   readonly SharedHandsSystem _hands = default!;
     [Dependency] private   readonly ItemSlotsSystem _slots = default!;
     [Dependency] private   readonly RechargeBasicEntityAmmoSystem _recharge = default!;
     [Dependency] protected readonly SharedActionsSystem Actions = default!;
@@ -155,7 +157,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         if (melee.NextAttack > component.NextFire)
         {
             component.NextFire = melee.NextAttack;
-            EntityManager.DirtyField(uid, component, nameof(GunComponent.NextFire));
+            DirtyField(uid, component, nameof(GunComponent.NextFire));
         }
     }
 
@@ -245,8 +247,7 @@ public abstract partial class SharedGunSystem : EntitySystem
             return true;
         }
 
-        if (EntityManager.TryGetComponent(entity, out HandsComponent? hands) &&
-            hands.ActiveHandEntity is { } held &&
+        if (_hands.GetActiveItem(entity) is { } held &&
             TryComp(held, out GunComponent? gun))
         {
             gunEntity = held;
@@ -273,7 +274,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         gun.ShotCounter = 0;
         gun.ShootCoordinates = null;
         gun.Targets.Clear();
-        EntityManager.DirtyField(uid, gun, nameof(GunComponent.ShotCounter));
+        DirtyField(uid, gun, nameof(GunComponent.ShotCounter));
     }
 
     public void SetTarget(GunComponent gun, EntityUid target)
@@ -285,12 +286,13 @@ public abstract partial class SharedGunSystem : EntitySystem
     /// <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;
-        EntityManager.DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
+        gun.Target = target;
+        DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
     }
 
     /// <summary>
@@ -362,7 +364,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         }
 
         // NextFire has been touched regardless so need to dirty the gun.
-        EntityManager.DirtyField(gunUid, gun, nameof(GunComponent.NextFire));
+        DirtyField(gunUid, gun, nameof(GunComponent.NextFire));
 
         // Get how many shots we're actually allowed to make, due to clip size or otherwise.
         // Don't do this in the loop so we still reset NextFire.
@@ -418,12 +420,12 @@ public abstract partial class SharedGunSystem : EntitySystem
         // Even if we don't actually shoot update the ShotCounter. This is to avoid spamming empty sounds
         // where the gun may be SemiAuto or Burst.
         gun.ShotCounter += shots;
-        EntityManager.DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
+        DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
 
         if (ev.Ammo.Count <= 0)
         {
             // triggers effects on the gun if it's empty
-            var emptyGunShotEvent = new OnEmptyGunShotEvent();
+            var emptyGunShotEvent = new OnEmptyGunShotEvent(user);
             RaiseLocalEvent(gunUid, ref emptyGunShotEvent);
 
             gun.BurstActivated = false;
@@ -476,7 +478,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         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);
     }
 
@@ -673,7 +675,7 @@ public abstract partial class SharedGunSystem : EntitySystem
             DirtyField(gun, nameof(GunComponent.AngleDecayModified));
         }
 
-        if (!comp.MaxAngleModified.EqualsApprox(ev.MinAngle))
+        if (!comp.MaxAngleModified.EqualsApprox(ev.MaxAngle))
         {
             comp.MaxAngleModified = ev.MaxAngle;
             DirtyField(gun, nameof(GunComponent.MaxAngleModified));
@@ -751,6 +753,11 @@ public record struct GunShotEvent(EntityUid User, List<(EntityUid? Uid, IShootab
 [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/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 5e242f01de..149e5f8fb3 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -16,6 +16,8 @@ using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Random;
+using Content.Shared.Examine;
+using Content.Shared.Localizations;
 
 namespace Content.Shared.Weapons.Reflect;
 
@@ -46,6 +48,7 @@ public sealed class ReflectSystem : EntitySystem
         SubscribeLocalEvent<ReflectComponent, GotUnequippedEvent>(OnReflectUnequipped);
         SubscribeLocalEvent<ReflectComponent, GotEquippedHandEvent>(OnReflectHandEquipped);
         SubscribeLocalEvent<ReflectComponent, GotUnequippedHandEvent>(OnReflectHandUnequipped);
+        SubscribeLocalEvent<ReflectComponent, ExaminedEvent>(OnExamine);
     }
 
     private void OnReflectUserCollide(Entity<ReflectComponent> ent, ref ProjectileReflectAttemptEvent args)
@@ -234,4 +237,30 @@ public sealed class ReflectSystem : EntitySystem
         ent.Comp.InRightPlace = false;
         Dirty(ent);
     }
+
+    #region Examine
+    private void OnExamine(Entity<ReflectComponent> ent, ref ExaminedEvent args)
+    {
+        // This isn't examine verb or something just because it looks too much bad.
+        // Trust me, universal verb for the potential weapons, armor and walls looks awful.
+        var value = MathF.Round(ent.Comp.ReflectProb * 100, 1);
+
+        if (!_toggle.IsActivated(ent.Owner) || value == 0 || ent.Comp.Reflects == ReflectType.None)
+            return;
+
+        var compTypes = ent.Comp.Reflects.ToString().Split(", ");
+
+        List<string> typeList = new(compTypes.Length);
+
+        for (var i = 0; i < compTypes.Length; i++)
+        {
+            var type = Loc.GetString(("reflect-component-" + compTypes[i]).ToLower());
+            typeList.Add(type);
+        }
+
+        var msg = ContentLocalizationManager.FormatList(typeList);
+
+        args.PushMarkup(Loc.GetString("reflect-component-examine", ("value", value), ("type", msg)));
+    }
+    #endregion
 }
diff --git a/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs b/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
index 86afe1897b..52b087c5b9 100644
--- a/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
+++ b/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
@@ -6,5 +6,6 @@ namespace Content.Shared.Wieldable.Components;
 public sealed partial class IncreaseDamageOnWieldComponent : Component
 {
     [DataField("damage", required: true)]
+    [Access(Other = AccessPermissions.ReadExecute)]
     public DamageSpecifier BonusDamage = default!;
 }
diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
index 8607b9b0fe..ea54294239 100644
--- a/Content.Shared/Wieldable/SharedWieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -117,7 +117,7 @@ public abstract class SharedWieldableSystem : EntitySystem
 
     private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, HandDeselectedEvent args)
     {
-        if (_hands.EnumerateHands(args.User).Count() > 2)
+        if (_hands.GetHandCount(args.User) > 2)
             return;
 
         TryUnwield(uid, component, args.User);
@@ -181,7 +181,7 @@ public abstract class SharedWieldableSystem : EntitySystem
         }
         // Sunrise-End
 
-        if (!_hands.IsHolding(args.User, uid, out _, args.Hands))
+        if (!_hands.IsHolding((args.User, args.Hands), uid, out _))
             return;
 
         // TODO VERB TOOLTIPS Make CanWield or some other function return string, set as verb tooltip and disable
@@ -273,7 +273,7 @@ public abstract class SharedWieldableSystem : EntitySystem
         }
 
         // Is it.. actually in one of their hands?
-        if (!_hands.IsHolding(user, uid, out _, hands))
+        if (!_hands.IsHolding((user, hands), uid, out _))
         {
             if (!quiet)
                 _popup.PopupClient(Loc.GetString("wieldable-component-not-in-hands", ("item", uid)), user, user);
@@ -394,7 +394,7 @@ public abstract class SharedWieldableSystem : EntitySystem
     /// <param name="force">If this is true we will bypass UnwieldAttemptEvent.</param>
     public void UnwieldAll(Entity<HandsComponent?> wielder, bool force = false)
     {
-        foreach (var held in _hands.EnumerateHeld(wielder.Owner, wielder.Comp))
+        foreach (var held in _hands.EnumerateHeld(wielder))
         {
             if (TryComp<WieldableComponent>(held, out var wieldable))
                 TryUnwield(held, wieldable, wielder, force);
diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs
index 89a3fe5dac..f53bbc71e6 100644
--- a/Content.Shared/Wires/SharedWiresComponent.cs
+++ b/Content.Shared/Wires/SharedWiresComponent.cs
@@ -209,22 +209,8 @@ namespace Content.Shared.Wires
     {
         public static string Name(this WireColor color)
         {
-            return Loc.GetString(color switch
-            {
-                WireColor.Red => "Red",
-                WireColor.Blue => "Blue",
-                WireColor.Green => "Green",
-                WireColor.Orange => "Orange",
-                WireColor.Brown => "Brown",
-                WireColor.Gold => "Gold",
-                WireColor.Gray => "Gray",
-                WireColor.Cyan => "Cyan",
-                WireColor.Navy => "Navy",
-                WireColor.Purple => "Purple",
-                WireColor.Pink => "Pink",
-                WireColor.Fuchsia => "Fuchsia",
-                _ => throw new InvalidOperationException()
-            });
+            var colorName = Enum.GetName(color) ?? throw new InvalidOperationException();
+            return Loc.GetString($"wire-name-color-{colorName.ToLower()}");
         }
 
         public static Color ColorValue(this WireColor color)
@@ -251,30 +237,30 @@ namespace Content.Shared.Wires
         {
             return Loc.GetString(letter switch
             {
-                WireLetter.α => "Alpha",
-                WireLetter.β => "Beta",
-                WireLetter.γ => "Gamma",
-                WireLetter.δ => "Delta",
-                WireLetter.ε => "Epsilon",
-                WireLetter.ζ => "Zeta",
-                WireLetter.η => "Eta",
-                WireLetter.θ => "Theta",
-                WireLetter.ι => "Iota",
-                WireLetter.κ => "Kappa",
-                WireLetter.λ => "Lambda",
-                WireLetter.μ => "Mu",
-                WireLetter.ν => "Nu",
-                WireLetter.ξ => "Xi",
-                WireLetter.ο => "Omicron",
-                WireLetter.π => "Pi",
-                WireLetter.ρ => "Rho",
-                WireLetter.σ => "Sigma",
-                WireLetter.τ => "Tau",
-                WireLetter.υ => "Upsilon",
-                WireLetter.φ => "Phi",
-                WireLetter.χ => "Chi",
-                WireLetter.ψ => "Psi",
-                WireLetter.ω => "Omega",
+                WireLetter.α => "wire-letter-name-alpha",
+                WireLetter.β => "wire-letter-name-beta",
+                WireLetter.γ => "wire-letter-name-gamma",
+                WireLetter.δ => "wire-letter-name-delta",
+                WireLetter.ε => "wire-letter-name-epsilon",
+                WireLetter.ζ => "wire-letter-name-zeta ",
+                WireLetter.η => "wire-letter-name-eta",
+                WireLetter.θ => "wire-letter-name-theta",
+                WireLetter.ι => "wire-letter-name-iota",
+                WireLetter.κ => "wire-letter-name-kappa",
+                WireLetter.λ => "wire-letter-name-lambda",
+                WireLetter.μ => "wire-letter-name-mu",
+                WireLetter.ν => "wire-letter-name-nu",
+                WireLetter.ξ => "wire-letter-name-xi",
+                WireLetter.ο => "wire-letter-name-omicron",
+                WireLetter.π => "wire-letter-name-pi",
+                WireLetter.ρ => "wire-letter-name-rho",
+                WireLetter.σ => "wire-letter-name-sigma",
+                WireLetter.τ => "wire-letter-name-tau",
+                WireLetter.υ => "wire-letter-name-upsilon",
+                WireLetter.φ => "wire-letter-name-phi",
+                WireLetter.χ => "wire-letter-name-chi",
+                WireLetter.ψ => "wire-letter-name-psi",
+                WireLetter.ω => "wire-letter-name-omega",
                 _ => throw new InvalidOperationException()
             });
         }
diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs
index e5bd33f581..e36729851f 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs
@@ -21,18 +21,18 @@ public sealed class XAEApplyComponentsSystem : BaseXAESystem<XAEApplyComponentsC
         foreach (var registry in ent.Comp.Components)
         {
             var componentType = registry.Value.Component.GetType();
-            if (!ent.Comp.ApplyIfAlreadyHave && EntityManager.HasComponent(artifact, componentType))
+            if (!ent.Comp.ApplyIfAlreadyHave && HasComp(artifact, componentType))
             {
                 continue;
             }
 
             if (ent.Comp.RefreshOnReactivate)
             {
-                EntityManager.RemoveComponent(artifact, componentType);
+                RemComp(artifact, componentType);
             }
 
             var clone = EntityManager.ComponentFactory.GetComponent(registry.Value);
-            EntityManager.AddComponent(artifact, clone);
+            AddComp(artifact, clone);
         }
     }
 }
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index cb25f9b3b1..9fe7378b5a 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -93,10 +93,8 @@ public sealed partial class ZombieComponent : Component
     [DataField("beforeZombifiedEyeColor")]
     public Color BeforeZombifiedEyeColor;
 
-    [DataField("emoteId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
-    public string? EmoteSoundsId = "Zombie";
-
-    public EmoteSoundsPrototype? EmoteSounds;
+    [DataField("emoteId")]
+    public ProtoId<EmoteSoundsPrototype>? EmoteSoundsId = "Zombie";
 
     [DataField("nextTick", customTypeSerializer:typeof(TimeOffsetSerializer))]
     public TimeSpan NextTick;
diff --git a/Content.Tests/Shared/DamageTest.cs b/Content.Tests/Shared/DamageTest.cs
index 88beca8841..27543e6533 100644
--- a/Content.Tests/Shared/DamageTest.cs
+++ b/Content.Tests/Shared/DamageTest.cs
@@ -4,7 +4,6 @@ using NUnit.Framework;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
-using System.Collections.Generic;
 using Content.Shared.FixedPoint;
 
 namespace Content.Tests.Shared
@@ -16,22 +15,10 @@ namespace Content.Tests.Shared
     [TestOf(typeof(DamageGroupPrototype))]
     public sealed class DamageTest : ContentUnitTest
     {
-
-        private static Dictionary<string, float> _resistanceCoefficientDict = new()
-        {
-            // "missing" blunt entry
-            { "Piercing", -2 },// Turn Piercing into Healing
-            { "Slash", 3 },
-            { "Radiation", 1.5f },
-        };
-
-        private static Dictionary<string, float> _resistanceReductionDict = new()
-        {
-            { "Blunt", - 5 },
-            // "missing" piercing entry
-            { "Slash", 8 },
-            { "Radiation", 0.5f },  // Fractional adjustment
-        };
+        private static readonly ProtoId<DamageGroupPrototype> BruteDamageGroup = "Brute";
+        private static readonly ProtoId<DamageTypePrototype> RadiationDamageType = "Radiation";
+        private static readonly ProtoId<DamageTypePrototype> SlashDamageType = "Slash";
+        private static readonly ProtoId<DamageTypePrototype> PiercingDamageType = "Piercing";
 
         private IPrototypeManager _prototypeManager;
 
@@ -47,9 +34,9 @@ namespace Content.Tests.Shared
             _prototypeManager.ResolveResults();
 
             // Create a damage data set
-            _damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 6);
-            _damageSpec += new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Radiation"), 3);
-            _damageSpec += new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Slash"), -1); // already exists in brute
+            _damageSpec = new(_prototypeManager.Index(BruteDamageGroup), 6);
+            _damageSpec += new DamageSpecifier(_prototypeManager.Index(RadiationDamageType), 3);
+            _damageSpec += new DamageSpecifier(_prototypeManager.Index(SlashDamageType), -1); // already exists in brute
         }
 
         //Check that DamageSpecifier will split groups and can do arithmetic operations
@@ -118,7 +105,7 @@ namespace Content.Tests.Shared
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(3)));
 
             // Lets also test the constructor with damage types and damage groups works properly.
-            damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 4);
+            damageSpec = new(_prototypeManager.Index(BruteDamageGroup), 4);
             Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
             Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
@@ -126,7 +113,7 @@ namespace Content.Tests.Shared
             Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.34))); // doesn't divide evenly, so the 0.01 goes to the last one
 
-            damageSpec = new(_prototypeManager.Index<DamageTypePrototype>("Piercing"), 4);
+            damageSpec = new(_prototypeManager.Index(PiercingDamageType), 4);
             Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(4)));
         }
@@ -139,11 +126,7 @@ namespace Content.Tests.Shared
             DamageSpecifier damageSpec = 10 * new DamageSpecifier(_damageSpec);
 
             // Create a modifier set
-            DamageModifierSetPrototype modifierSet = new()
-            {
-                Coefficients = _resistanceCoefficientDict,
-                FlatReduction = _resistanceReductionDict
-            };
+            var modifierSet = _prototypeManager.Index<DamageModifierSetPrototype>(ModifierTestSetId);
 
             //damage is initially   20 / 20 / 10 / 30
             //Each time we subtract -5 /  0 /  8 /  0.5
@@ -164,8 +147,10 @@ namespace Content.Tests.Shared
             Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.62)));
         }
 
+        private const string ModifierTestSetId = "ModifierTestSet";
+
         // Default damage Yaml
-        private string _damagePrototypes = @"
+        private readonly string _damagePrototypes = $@"
 - type: damageType
   id: Blunt
   name: damage-type-blunt
@@ -289,6 +274,17 @@ namespace Content.Tests.Shared
   flatReductions:
     Blunt: 5
 
+- type: damageModifierSet
+  id: {ModifierTestSetId}
+  coefficients:
+    Piercing: -2
+    Slash: 3
+    Radiation: 1.5
+  flatReductions:
+    Blunt: -5
+    Slash: 8
+    Radiation: 0.5
+
 - type: damageContainer
   id: Biological
   supportedGroups:
diff --git a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
index b07b18efa0..77f001bfe1 100644
--- a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
+++ b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
@@ -12,6 +12,8 @@ namespace Content.Tests.Shared;
 [TestOf(typeof(LocalizedDatasetPrototype))]
 public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
 {
+    private const string TestDatasetId = "Test";
+
     private IPrototypeManager _prototypeManager;
 
     [OneTimeSetUp]
@@ -24,9 +26,9 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
         _prototypeManager.ResolveResults();
     }
 
-    private const string TestPrototypes = @"
+    private const string TestPrototypes = $@"
 - type: localizedDataset
-  id: Test
+  id: {TestDatasetId}
   values:
     prefix: test-dataset-
     count: 4
@@ -35,7 +37,7 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
     [Test]
     public void LocalizedDatasetTest()
     {
-        var testPrototype = _prototypeManager.Index<LocalizedDatasetPrototype>("Test");
+        var testPrototype = _prototypeManager.Index<LocalizedDatasetPrototype>(TestDatasetId);
         var values = new ValueList<string>();
         foreach (var value in testPrototype.Values)
         {
diff --git a/Content.YAMLLinter/Program.cs b/Content.YAMLLinter/Program.cs
index 32078faeef..d37acff8e0 100644
--- a/Content.YAMLLinter/Program.cs
+++ b/Content.YAMLLinter/Program.cs
@@ -36,7 +36,9 @@ namespace Content.YAMLLinter
             {
                 foreach (var errorNode in errorHashset)
                 {
-                    Console.WriteLine($"::error file={file},line={errorNode.Node.Start.Line},col={errorNode.Node.Start.Column}::{file}({errorNode.Node.Start.Line},{errorNode.Node.Start.Column})  {errorNode.ErrorReason}");
+                    // TODO YAML LINTER Fix inheritance
+                    // If a parent/abstract prototype has na error, this will misreport the file name (but with the correct line/column).
+                    Console.WriteLine($"::error in {file}({errorNode.Node.Start.Line},{errorNode.Node.Start.Column})  {errorNode.ErrorReason}");
                 }
             }
 
@@ -143,22 +145,24 @@ namespace Content.YAMLLinter
             foreach (var (key, val) in clientErrors.YamlErrors)
             {
                 var newErrors = val.Where(n => n.AlwaysRelevant).ToHashSet();
-                if (newErrors.Count == 0)
-                    continue;
-
-                if (yamlErrors.TryGetValue(key, out var errors))
-                    errors.UnionWith(val.Where(n => n.AlwaysRelevant));
-                else
-                    yamlErrors[key] = newErrors;
 
                 // Include any errors that relate to client-only types
                 foreach (var errorNode in val)
                 {
-                    if (errorNode is FieldNotFoundErrorNode fieldNotFoundNode && !serverTypes.Contains(fieldNotFoundNode.FieldType.Name))
+                    if (errorNode is FieldNotFoundErrorNode fieldNotFoundNode
+                        && !serverTypes.Contains(fieldNotFoundNode.FieldType.Name))
                     {
                         newErrors.Add(errorNode);
                     }
                 }
+
+                if (newErrors.Count == 0)
+                    continue;
+
+                if (yamlErrors.TryGetValue(key, out var errors))
+                    errors.UnionWith(newErrors);
+                else
+                    yamlErrors[key] = newErrors;
             }
 
             // Finally, combine the prototype ID field errors.
diff --git a/Directory.Packages.props b/Directory.Packages.props
index d18f894bf7..b2f8d0d844 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,16 +7,16 @@
     <PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
     <PackageVersion Include="CsvHelper" Version="33.0.1" />
-    <PackageVersion Include="Discord.Net" Version="3.16.0" />
     <PackageVersion Include="ImGui.NET" Version="1.87.3" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.1" />
+    <PackageVersion Include="NetCord" Version="1.0.0-alpha.388" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
     <PackageVersion Include="OpenTK" Version="4.7.2" />
     <PackageVersion Include="Veldrid" Version="4.8.0" />
     <PackageVersion Include="Veldrid.SPIRV" Version="1.0.15" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Resources/Audio/Ambience/Antag/traitor_wawa.ogg b/Resources/Audio/Ambience/Antag/traitor_wawa.ogg
new file mode 100644
index 0000000000..7134be84cc
Binary files /dev/null and b/Resources/Audio/Ambience/Antag/traitor_wawa.ogg differ
diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml
index 7fd7e8b2e7..f91d98b974 100644
--- a/Resources/Audio/Animals/attributions.yml
+++ b/Resources/Audio/Animals/attributions.yml
@@ -139,20 +139,37 @@
   source: "https://github.com/ParadiseSS13/Paradise/commit/a34f1054cef5a44a67fdac3b67b811137c6071dd"
 
 - files:
-    - fox1.ogg
-    - fox2.ogg
-    - fox3.ogg
-    - fox4.ogg
-    - fox5.ogg
-    - fox6.ogg
-    - fox7.ogg
-    - fox8.ogg
-    - fox9.ogg
-    - fox10.ogg
-    - fox11.ogg
-    - fox12.ogg
-    - fox13.ogg
-    - fox14.ogg
+  - fox1.ogg
+  - fox2.ogg
+  - fox3.ogg
+  - fox4.ogg
+  - fox5.ogg
+  - fox6.ogg
+  - fox7.ogg
+  - fox8.ogg
+  - fox9.ogg
+  - fox10.ogg
+  - fox11.ogg
+  - fox12.ogg
+  - fox13.ogg
+  - fox14.ogg
   copyright: "Created by fujiwaranao"
   license: "CC-BY-NC-SA-4.0"
   source: "https://github.com/space-wizards/space-station-14/pull/27578"
+
+- files:
+  - wawa_achoo.ogg
+  - wawa_chatter.ogg
+  - wawa_chillin.ogg
+  - wawa_depression.ogg
+  - wawa_despair.ogg
+  - wawa_exclaim.ogg
+  - wawa_mock.ogg
+  - wawa_protest.ogg
+  - wawa_question.ogg
+  - wawa_statement.ogg
+  - wawa_the_end.ogg
+  - wawa_yawn.ogg
+  copyright: "created by FairlySadPanda"
+  license: "CC-BY-4.0"
+  source: "https://github.com/space-wizards/space-station-14/pull/37936"
diff --git a/Resources/Audio/Animals/wawa_achoo.ogg b/Resources/Audio/Animals/wawa_achoo.ogg
new file mode 100644
index 0000000000..411c4b5b0a
Binary files /dev/null and b/Resources/Audio/Animals/wawa_achoo.ogg differ
diff --git a/Resources/Audio/Animals/wawa_chatter.ogg b/Resources/Audio/Animals/wawa_chatter.ogg
new file mode 100644
index 0000000000..5537611307
Binary files /dev/null and b/Resources/Audio/Animals/wawa_chatter.ogg differ
diff --git a/Resources/Audio/Animals/wawa_chillin.ogg b/Resources/Audio/Animals/wawa_chillin.ogg
new file mode 100644
index 0000000000..d548f6a26f
Binary files /dev/null and b/Resources/Audio/Animals/wawa_chillin.ogg differ
diff --git a/Resources/Audio/Animals/wawa_depression.ogg b/Resources/Audio/Animals/wawa_depression.ogg
new file mode 100644
index 0000000000..d592654a07
Binary files /dev/null and b/Resources/Audio/Animals/wawa_depression.ogg differ
diff --git a/Resources/Audio/Animals/wawa_despair.ogg b/Resources/Audio/Animals/wawa_despair.ogg
new file mode 100644
index 0000000000..ce4ecc4db2
Binary files /dev/null and b/Resources/Audio/Animals/wawa_despair.ogg differ
diff --git a/Resources/Audio/Animals/wawa_exclaim.ogg b/Resources/Audio/Animals/wawa_exclaim.ogg
new file mode 100644
index 0000000000..6c9d9dfcd0
Binary files /dev/null and b/Resources/Audio/Animals/wawa_exclaim.ogg differ
diff --git a/Resources/Audio/Animals/wawa_mock.ogg b/Resources/Audio/Animals/wawa_mock.ogg
new file mode 100644
index 0000000000..6d188ec054
Binary files /dev/null and b/Resources/Audio/Animals/wawa_mock.ogg differ
diff --git a/Resources/Audio/Animals/wawa_protest.ogg b/Resources/Audio/Animals/wawa_protest.ogg
new file mode 100644
index 0000000000..50d52ac27d
Binary files /dev/null and b/Resources/Audio/Animals/wawa_protest.ogg differ
diff --git a/Resources/Audio/Animals/wawa_question.ogg b/Resources/Audio/Animals/wawa_question.ogg
new file mode 100644
index 0000000000..757b86bdfd
Binary files /dev/null and b/Resources/Audio/Animals/wawa_question.ogg differ
diff --git a/Resources/Audio/Animals/wawa_statement.ogg b/Resources/Audio/Animals/wawa_statement.ogg
new file mode 100644
index 0000000000..560df24a80
Binary files /dev/null and b/Resources/Audio/Animals/wawa_statement.ogg differ
diff --git a/Resources/Audio/Animals/wawa_the_end.ogg b/Resources/Audio/Animals/wawa_the_end.ogg
new file mode 100644
index 0000000000..9350de1f7c
Binary files /dev/null and b/Resources/Audio/Animals/wawa_the_end.ogg differ
diff --git a/Resources/Audio/Animals/wawa_yawn.ogg b/Resources/Audio/Animals/wawa_yawn.ogg
new file mode 100644
index 0000000000..766c856ff4
Binary files /dev/null and b/Resources/Audio/Animals/wawa_yawn.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/attributions.yml b/Resources/Audio/Effects/Changeling/attributions.yml
new file mode 100644
index 0000000000..d7d7931cd6
--- /dev/null
+++ b/Resources/Audio/Effects/Changeling/attributions.yml
@@ -0,0 +1,19 @@
+- files: ["devour_suck.ogg"]
+  license: "CC0-1.0"
+  copyright: "4Cairnz on Freesound: June 5th 2023"
+  source: "https://freesound.org/people/4Cairnz/sounds/689640/"
+
+- files: ["devour_windup.ogg "]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by @DarkIcedCoffee on Discord for SS14, utilizing sounds from Caitlin_100, jedg and EricsSoundschmiede on freesound"
+  source: "https://youtu.be/iviCUO2xH_E"
+
+- files: ["devour_consume.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by @DarkIcedCoffee on Discord for SS14, utilizing sounds from jedg and reg7783 on freesound."
+  source: "https://youtu.be/iviCUO2xH_E"
+
+- files: ["changeling_transform.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by @DarkIcedCoffee on Discord for SS14"
+  source: "https://youtu.be/iviCUO2xH_E"
diff --git a/Resources/Audio/Effects/Changeling/changeling_transform.ogg b/Resources/Audio/Effects/Changeling/changeling_transform.ogg
new file mode 100644
index 0000000000..23379d246d
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/changeling_transform.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/devour_consume.ogg b/Resources/Audio/Effects/Changeling/devour_consume.ogg
new file mode 100644
index 0000000000..9d05c9f541
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/devour_consume.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/devour_suck.ogg b/Resources/Audio/Effects/Changeling/devour_suck.ogg
new file mode 100644
index 0000000000..d756b0a55d
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/devour_suck.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/devour_windup.ogg b/Resources/Audio/Effects/Changeling/devour_windup.ogg
new file mode 100644
index 0000000000..7c81d9a076
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/devour_windup.ogg differ
diff --git a/Resources/Audio/Effects/Lightning/attributions.yml b/Resources/Audio/Effects/Lightning/attributions.yml
index 0bd92af1bb..49778bbc61 100644
--- a/Resources/Audio/Effects/Lightning/attributions.yml
+++ b/Resources/Audio/Effects/Lightning/attributions.yml
@@ -1,7 +1,7 @@
-- files: [LightningShock.ogg]
-  license: CC-BY-NC-SA-3.0
-  copyright: Citadel Station 13
-  source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5
+- files: ["lightningshock.ogg", "lightningbolt.ogg"]
+  license: CC-BY-SA-3.0
+  copyright: "/tg/station"
+  source: "https://github.com/tgstation/tgstation/pull/9701/"
 
 - files: ["strobeepsilon.ogg"]
   license: "CC-BY-SA-3.0"
diff --git a/Resources/Audio/Effects/card_drag.ogg b/Resources/Audio/Effects/card_drag.ogg
new file mode 100644
index 0000000000..8ecf632e8a
Binary files /dev/null and b/Resources/Audio/Effects/card_drag.ogg differ
diff --git a/Resources/Audio/Effects/soft_thump.ogg b/Resources/Audio/Effects/soft_thump.ogg
new file mode 100644
index 0000000000..2284aad696
Binary files /dev/null and b/Resources/Audio/Effects/soft_thump.ogg differ
diff --git a/Resources/Audio/Effects/stealthoff.ogg b/Resources/Audio/Effects/stealthoff.ogg
new file mode 100644
index 0000000000..d78706e9cd
Binary files /dev/null and b/Resources/Audio/Effects/stealthoff.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/attributions.yml b/Resources/Audio/Items/Anomaly/attributions.yml
new file mode 100644
index 0000000000..27bf35d875
--- /dev/null
+++ b/Resources/Audio/Items/Anomaly/attributions.yml
@@ -0,0 +1,114 @@
+- files: ["flesh_crit.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Mashup by GonTar Quantumcross of malescream_1.ogg, malescream_2.ogg, femalescream_4.ogg, femalescream_5.ogg, alien_claw_flesh_2.ogg, alien_claw_flesh_3.ogg"
+  source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
+  # additional source for alien claw sounds:
+  # source: "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/sound/weapons"
+
+- files: ["shadow_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar and Quantumcross of sourced sound effect and anomaly_scary.ogg"
+  source: https://pixabay.com/sound-effects/psychedelic-144822/
+  # Additional sources:
+  # source: https://pixabay.com/sound-effects/boom-geomorphism-cinematic-trailer-sound-effects-123876/
+
+- files: ["tech_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by Gontar"
+  source: https://freesound.org/people/wtermini/sounds/546450/
+  # Additional sources:
+  # source: https://freesound.org/people/unfa/sounds/124547/
+  # source: https://pixabay.com/sound-effects/elemental-magic-spell-cast-d-228349/
+
+- files: ["present_crit.ogg"]
+  license: "CC0-1.0"
+  copyright: "richwise (Freesound), edited by Quantum-cross@github"
+  source: https://freesound.org/people/richwise/sounds/414374/
+
+- files: ["pyro_crit.ogg"]
+  license: "Custom"
+  copyright: "Multiple sounds, edited and layered by GonTar"
+  source: https://freesound.org/people/Robinhood76/sounds/612277/
+  # additional sources:
+  # source: https://freesound.org/people/Fission9/sounds/474850/
+  # source: https://pixabay.com/sound-effects/rubber-stretch-sound-effect-201310/ (Pixabay license)
+  # source: https://pixabay.com/sound-effects/fx-collection-of-flame-sword-swoosh-sound-design-elements-275902/ (Pixabay license)
+
+- files: ["grav_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: "https://freesound.org/people/Joao_Janz/sounds/478472/"
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/horror-metallic-screeches-183236/
+  # source: https://pixabay.com/sound-effects/dark-textures-sfx-001-322559/
+  # source: https://pixabay.com/sound-effects/dark-textures-sfx-014-322578/
+  # source: https://freesound.org/people/BlenderDiplom/sounds/201094/
+  # source: https://pixabay.com/sound-effects/metal-creaking-36742/
+  # source: https://pixabay.com/sound-effects/metal-container-rumble-325675/
+  # source: https://pixabay.com/sound-effects/metal-hit-10-193281/
+  # source: https://pixabay.com/sound-effects/closing-metal-container-for-garbage-303735/
+
+
+- files: ["electricity_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/sliding-discharge-160kv-71800/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/elemental-magic-spell-impact-outgoing-228342/
+  # source: https://pixabay.com/sound-effects/elemental-magic-spell-cast-d-228349/
+  # source: https://pixabay.com/sound-effects/electric-shock-short-circuit-1-204989/
+  # source: https://pixabay.com/sound-effects/electric-impact-37128/
+
+- files: ["bluespace_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/boom-geomorphism-cinematic-trailer-sound-effects-123876/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/riser-hit-sfx-001-289802/
+  # source: https://pixabay.com/sound-effects/pulse3d-106110/
+  # source: https://freesound.org/people/Soapuel/sounds/489442/
+
+- files: ["ice_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/ice-1-104148/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/ice-3-85025/
+  # source: https://pixabay.com/sound-effects/ice-4-104135/
+  # source: https://pixabay.com/sound-effects/ice-6-104141/
+  # source: https://pixabay.com/sound-effects/deep-bass-drone-31424/
+  # source: https://pixabay.com/sound-effects/cinematic-deep-tremor-6740/
+  # source: https://pixabay.com/sound-effects/cinematic-impact-boom-3-326123/
+  # source: https://pixabay.com/sound-effects/dark-textures-sfx-007-322567/
+  # source: https://pixabay.com/sound-effects/atmosphere-deep-amp-booming-256197/
+
+- files: ["fluid_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://freesound.org/people/unfa/sounds/504930/
+  # additional sources:
+  # source: https://freesound.org/people/DJT4NN3R/sounds/484158/
+  # source: https://freesound.org/people/klankbeeld/sounds/325537/
+  # source: https://github.com/ParadiseSS13/Paradise
+  # source: https://pixabay.com/sound-effects/water-flowing-2-327662/
+
+- files: ["flora_crit.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Clusman, hereforthebass, eyesplice, Clearwavsound (all Freesound), layered and edited by Quantum-cross@github"
+  source: https://freesound.org/people/Clusman/sounds/543508/
+  # additional sources:
+  # source: https://freesound.org/people/hereforthebass/sounds/733255/
+  # source: https://freesound.org/people/eyesplice/sounds/717773/
+  # source: https://freesound.org/people/Clearwavsound/sounds/541032/
+  # source: https://freesound.org/people/Stickinthemud/sounds/44162/
+
+- files: ["rock_crit.ogg"]
+  license: Custom
+  copyright: "Mashup by GonTar"
+  source: https://pixabay.com/sound-effects/cinematic-deep-rumble-6418/
+  # additional sources:
+  # source: https://pixabay.com/sound-effects/lowrumblesnd-77876/
+  # source: https://pixabay.com/sound-effects/077381-scraping-stone-83768/
+  # source: https://pixabay.com/sound-effects/stone-slide-sound-effects-322794/
+  # source: https://pixabay.com/sound-effects/falling-pebbles-rocks-and-boulders-168593/
+  # source: https://pixabay.com/sound-effects/small-rock-break-194553/
diff --git a/Resources/Audio/Items/Anomaly/bluespace_crit.ogg b/Resources/Audio/Items/Anomaly/bluespace_crit.ogg
new file mode 100644
index 0000000000..4e84ac278d
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/bluespace_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/electricity_crit.ogg b/Resources/Audio/Items/Anomaly/electricity_crit.ogg
new file mode 100644
index 0000000000..8649a92aeb
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/electricity_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/flesh_crit.ogg b/Resources/Audio/Items/Anomaly/flesh_crit.ogg
new file mode 100644
index 0000000000..1a429d876b
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/flesh_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/flora_crit.ogg b/Resources/Audio/Items/Anomaly/flora_crit.ogg
new file mode 100644
index 0000000000..f098b6c8f5
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/flora_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/fluid_crit.ogg b/Resources/Audio/Items/Anomaly/fluid_crit.ogg
new file mode 100644
index 0000000000..c672e09b55
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/fluid_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/grav_crit.ogg b/Resources/Audio/Items/Anomaly/grav_crit.ogg
new file mode 100644
index 0000000000..f4fd579fe5
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/grav_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/ice_crit.ogg b/Resources/Audio/Items/Anomaly/ice_crit.ogg
new file mode 100644
index 0000000000..010cb38fce
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/ice_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/present_crit.ogg b/Resources/Audio/Items/Anomaly/present_crit.ogg
new file mode 100644
index 0000000000..1e2ddebc28
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/present_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/pyro_crit.ogg b/Resources/Audio/Items/Anomaly/pyro_crit.ogg
new file mode 100644
index 0000000000..3e07ecd270
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/pyro_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/rock_crit.ogg b/Resources/Audio/Items/Anomaly/rock_crit.ogg
new file mode 100644
index 0000000000..e32be2fa0e
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/rock_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/shadow_crit.ogg b/Resources/Audio/Items/Anomaly/shadow_crit.ogg
new file mode 100644
index 0000000000..d5b7cf7f4c
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/shadow_crit.ogg differ
diff --git a/Resources/Audio/Items/Anomaly/tech_crit.ogg b/Resources/Audio/Items/Anomaly/tech_crit.ogg
new file mode 100644
index 0000000000..50c11ed921
Binary files /dev/null and b/Resources/Audio/Items/Anomaly/tech_crit.ogg differ
diff --git a/Resources/Audio/Items/Toys/card_tube_bonk.ogg b/Resources/Audio/Items/Toys/card_tube_bonk.ogg
new file mode 100644
index 0000000000..b300702c25
Binary files /dev/null and b/Resources/Audio/Items/Toys/card_tube_bonk.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 2dfdcb0555..5a5927c878 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -55,12 +55,12 @@
 
 - files: ["bottle_clunk.ogg"]
   license: "CC-BY-4.0"
-  copyright: "User volivieri on freesound.org. Modified by Velcroboy on github."
+  copyright: "User volivieri on freesound.org. Modified by Velcroboy on github. Made mono by perryprog."
   source: "https://freesound.org/people/volivieri/sounds/37190/"
 
 - files: ["bottle_clunk_2.ogg"]
   license: "CC-BY-4.0"
-  copyright: "User volivieri on freesound.org. Modified by Velcroboy on github."
+  copyright: "User volivieri on freesound.org. Modified by Velcroboy on github. Silence trimmed + made mono by perryprog."
   source: "https://freesound.org/people/volivieri/sounds/37190/"
 
 - files: ["bottle_close1.ogg"]
@@ -149,13 +149,28 @@
   license: "CC0-1.0"
   copyright: "Original sound by Nox_Sound on freesound.org. Converted to ogg and edited by themias."
   source: "https://freesound.org/people/Nox_Sound/sounds/556648/"
-  
+
 - files: [ "toolbox_insert.ogg" ]
   license: "CC0-1.0"
   copyright: "Original sound by j1987 on freesound.org. Converted to ogg and edited by themias."
   source: "https://freesound.org/people/j1987/sounds/532137/"
-  
+
 - files: [ "toolbox_remove.ogg" ]
   license: "CC0-1.0"
   copyright: "Original sound by kooust on freesound.org. Converted to ogg and edited by themias."
-  source: "https://freesound.org/people/kooust/sounds/452712/"
\ No newline at end of file
+  source: "https://freesound.org/people/kooust/sounds/452712/"
+
+- files: [ "flask_open1.ogg" ]
+  license: "CC-BY-3.0"
+  copyright: "Original sound by kwahmah_02 on freesound.org. Converted to ogg and edited by Prole0 (GitHub)"
+  source: "https://freesound.org/s/277503/"
+
+- files: [ "flask_close1.ogg" ]
+  license: "CC-BY-NC-4.0"
+  copyright: "Original sound by QEDionium on freesound.org. Coverted to ogg and edited by Prole0 (GitHub)"
+  source: "https://freesound.org/s/489803/"
+
+- files: ["wirebrushing.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by romulofs, converted to OGG, and edited by TiniestShark (Github)"
+  source: "https://freesound.org/s/127541/"
diff --git a/Resources/Audio/Items/bottle_clunk.ogg b/Resources/Audio/Items/bottle_clunk.ogg
index 1c6b435f3f..f9fd65ed20 100644
Binary files a/Resources/Audio/Items/bottle_clunk.ogg and b/Resources/Audio/Items/bottle_clunk.ogg differ
diff --git a/Resources/Audio/Items/bottle_clunk_2.ogg b/Resources/Audio/Items/bottle_clunk_2.ogg
index 81afc70a7d..16219bdf3b 100644
Binary files a/Resources/Audio/Items/bottle_clunk_2.ogg and b/Resources/Audio/Items/bottle_clunk_2.ogg differ
diff --git a/Resources/Audio/Items/flask_close1.ogg b/Resources/Audio/Items/flask_close1.ogg
new file mode 100644
index 0000000000..5458762821
Binary files /dev/null and b/Resources/Audio/Items/flask_close1.ogg differ
diff --git a/Resources/Audio/Items/flask_open1.ogg b/Resources/Audio/Items/flask_open1.ogg
new file mode 100644
index 0000000000..7e766d465f
Binary files /dev/null and b/Resources/Audio/Items/flask_open1.ogg differ
diff --git a/Resources/Audio/Items/wirebrushing.ogg b/Resources/Audio/Items/wirebrushing.ogg
new file mode 100644
index 0000000000..4e54033b4c
Binary files /dev/null and b/Resources/Audio/Items/wirebrushing.ogg differ
diff --git a/Resources/Audio/Machines/warning_buzzer_xenoborg.ogg b/Resources/Audio/Machines/warning_buzzer_xenoborg.ogg
new file mode 100644
index 0000000000..fad2ca2229
Binary files /dev/null and b/Resources/Audio/Machines/warning_buzzer_xenoborg.ogg differ
diff --git a/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2 b/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2
new file mode 100644
index 0000000000..a7eefb3df5
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 0000000000..273d5cc6bf
--- /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/Audio/Voice/Human/female_cough_1.ogg b/Resources/Audio/Voice/Human/female_cough_1.ogg
index 3509dcb0ac..6a82af0ace 100644
Binary files a/Resources/Audio/Voice/Human/female_cough_1.ogg and b/Resources/Audio/Voice/Human/female_cough_1.ogg differ
diff --git a/Resources/Audio/Voice/Human/female_cough_2.ogg b/Resources/Audio/Voice/Human/female_cough_2.ogg
index 32b2372a78..ec1e32ea60 100644
Binary files a/Resources/Audio/Voice/Human/female_cough_2.ogg and b/Resources/Audio/Voice/Human/female_cough_2.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/attributions.yml b/Resources/Audio/Voice/Xenoborg/attributions.yml
index 7a08f127d3..775cc731be 100644
--- a/Resources/Audio/Voice/Xenoborg/attributions.yml
+++ b/Resources/Audio/Voice/Xenoborg/attributions.yml
@@ -10,6 +10,7 @@
   - xenoborg_laugh_3.ogg
   - xenoborg_laugh_4.ogg
   - xenoborg_ping.ogg
+  - xenoborg_scream.ogg
   - xenoborg_talk.ogg
   - xenoborg_twobeep.ogg
   license: "CC-BY-SA-4.0"
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg
index c40c08d830..69c4e06b6c 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_ask.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg
index a9309f7d8a..a9f36bdf6f 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_bikehorn.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg
index 7879ec485c..c3a72ea807 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-sigh.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg
index d62e674f30..09e0c7c64a 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_buzz-two.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg
index 91aed63ca9..5216f3d28b 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_chime.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg
index 7c23477b01..2afe7d560d 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_exclaim.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg
index ab585237b0..a2748478a0 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_1.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg
index b03c8df226..5ea6813064 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_2.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg
index 4d094c77ec..d6a9162c5e 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_3.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg
index db66c8a92e..c4a4629d97 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_laugh_4.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg
index 6bd5cc3591..40e1ec0e62 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_ping.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_scream.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_scream.ogg
new file mode 100644
index 0000000000..bc83ec46ff
Binary files /dev/null and b/Resources/Audio/Voice/Xenoborg/xenoborg_scream.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg
index 4b54caaa38..aa54adb017 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_talk.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg
index dfe0d0d55c..0ccdf2f465 100644
Binary files a/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg and b/Resources/Audio/Voice/Xenoborg/xenoborg_twobeep.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg b/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg
new file mode 100644
index 0000000000..231080beaa
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 4609c0e893..988b9038a7 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1171,5 +1171,164 @@ Entries:
   id: 141
   time: '2025-06-08T03:47:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38134
+- author: ScarKy0
+  changes:
+  - message: 'addaction/rmaction commands. NOTE: Addaction will not work correctly
+      if the action requires the entity to have a component (such as Dragon''s Devour).'
+    type: Add
+  id: 142
+  time: '2025-06-16T10:25:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38317
+- author: Errant, crazybrain
+  changes:
+  - message: The admin player and object tabs now show entries in the correct visual
+      style.
+    type: Fix
+  id: 143
+  time: '2025-06-21T01:13:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38261
+- author: SlamBamActionman
+  changes:
+  - message: customvote and cancelvote command permission has been moved from Moderator
+      to Round.
+    type: Tweak
+  id: 144
+  time: '2025-06-21T16:34:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38385
+- author: beck-thompson
+  changes:
+  - message: Role ban panel is now prettier!
+    type: Tweak
+  id: 145
+  time: '2025-06-21T17:54:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37952
+- author: beck-thompson
+  changes:
+  - message: You can now export round logs to CSV files
+    type: Add
+  id: 146
+  time: '2025-06-22T19:28:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38206
+- author: perryprog
+  changes:
+  - message: The /showaccessreaders command is now usable by those with +MAPPING or
+      +DEBUG, instead of being +HOST only.
+    type: Tweak
+  id: 147
+  time: '2025-06-26T10:43:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38593
+- author: VerinSenpai
+  changes:
+  - message: The addbodypart command no longer incorrectly errors out when you try
+      to pass the required number of arguments.
+    type: Fix
+  id: 148
+  time: '2025-06-28T11:11:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38612
+- author: BramvanZijp
+  changes:
+  - message: The Super Door Remote can now effect doors that the user's ID card has
+      access to, even if the remote itself somehow cannot access them.
+    type: Tweak
+  id: 149
+  time: '2025-06-29T16:21:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35536
+- author: Kowlin
+  changes:
+  - message: Changed the way CSVs are exported
+    type: Tweak
+  id: 150
+  time: '2025-06-30T21:09:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38531
+- author: Smugman
+  changes:
+  - message: Added the ID locked CentComm flippo for admeme use
+    type: Add
+  id: 151
+  time: '2025-07-07T18:53:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35514
+- author: perryprog
+  changes:
+  - message: Admin ghosts can now interact with things beneath subfloors, such as
+      disposal routers.
+    type: Tweak
+  id: 152
+  time: '2025-07-10T11:14:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38813
+- author: VerinSenpai
+  changes:
+  - message: The showrules command now has autocomplete.
+    type: Tweak
+  id: 153
+  time: '2025-07-11T17:48:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38855
+- author: perryprog
+  changes:
+  - message: The runverbas command should now work better with other toolshed commands.
+    type: Fix
+  id: 154
+  time: '2025-07-14T15:45:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38155
+- author: slarticodefast
+  changes:
+  - message: The aghost's satchel of holding is now explosion resistant. Same for
+      the aghost themselves, so held explosives no longer chain react.
+    type: Tweak
+  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
+- author: perryprog
+  changes:
+  - message: savegrid and savemap will no longer fail to save unpaused grids with
+      vending machines on them.
+    type: Fix
+  id: 158
+  time: '2025-07-31T18:34:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38406
+- author: PJB3005
+  changes:
+  - message: The "scale" console command was replaced with a toolshed command.
+    type: Tweak
+  id: 159
+  time: '2025-08-06T15:09:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39421
+- author: slarticodefast
+  changes:
+  - message: Added the "scale:multiplyvector" toolshed command.
+    type: Add
+  id: 160
+  time: '2025-08-06T17:23:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39424
+- author: slarticodefast
+  changes:
+  - message: Paused maps from cryostorage and polymorphing are now named to make them
+      easier to find when debugging.
+    type: Tweak
+  id: 161
+  time: '2025-08-07T14:55:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39453
+- author: K-Dynamic
+  changes:
+  - message: Centcomm Official now starts with administration glasses.
+    type: Tweak
+  id: 162
+  time: '2025-08-08T19:00:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35531
 Name: Admin
 Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f2c34c199c..718d0605c9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,1259 +1,4 @@
 Entries:
-- author: K-Dynamic
-  changes:
-  - message: Stinger grenades no longer flash on detonation.
-    type: Tweak
-  id: 8167
-  time: '2025-04-13T17:23:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36394
-- author: Unisol
-  changes:
-  - message: added deathmatch map DM01 Entryway
-    type: Add
-  id: 8168
-  time: '2025-04-14T01:21:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31533
-- author: TeenSarlacc
-  changes:
-  - message: You can now purchase shark plushies from Cargo.
-    type: Add
-  id: 8169
-  time: '2025-04-14T01:33:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36338
-- author: K-Dynamic
-  changes:
-  - message: Syndicate commander hardsuit now slows movement by 10%.
-    type: Tweak
-  id: 8170
-  time: '2025-04-14T05:37:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35805
-- author: YoungThugSS14
-  changes:
-  - message: Binoculars can now be worn on the neck.
-    type: Tweak
-  id: 8171
-  time: '2025-04-14T06:34:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35759
-- author: K-Dynamic
-  changes:
-  - message: Drawings from blue and green crayons now match their colours.
-    type: Tweak
-  id: 8172
-  time: '2025-04-14T08:58:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36532
-- author: PJB3005
-  changes:
-  - message: Fire extinguishers can now extinguish things like candles and cigarettes.
-    type: Add
-  - message: You can even use them to extinguish items that are held/worn!
-    type: Add
-  id: 8173
-  time: '2025-04-14T09:00:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36267
-- author: metalgearsloth
-  changes:
-  - message: Fix shuttle arrivals visualizer not updating with the target coordinates
-      updating.
-    type: Fix
-  id: 8174
-  time: '2025-04-14T14:34:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35772
-- author: CheesePlated
-  changes:
-  - message: The ID card console now works properly when setting job presets for replacement
-      IDs
-    type: Fix
-  id: 8175
-  time: '2025-04-14T15:02:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34921
-- author: BramvanZijp
-  changes:
-  - message: Deathsquad Hardsuit now provides 85% stamina damage resistance.
-    type: Add
-  id: 8176
-  time: '2025-04-14T15:27:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35580
-- author: benev0
-  changes:
-  - message: Stopped climbing movent while in containers
-    type: Fix
-  id: 8177
-  time: '2025-04-14T15:56:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32033
-- author: SlamBamActionman
-  changes:
-  - message: Hyposprays now shows contained chemicals in the sprite.
-    type: Tweak
-  id: 8178
-  time: '2025-04-14T15:58:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30703
-- author: SlamBamActionman
-  changes:
-  - message: Implanters are now named after the implant they contained, even after
-      the implanter has been used.
-    type: Tweak
-  - message: Syndicate implanters now remind you to scrub them in the item description.
-    type: Add
-  id: 8179
-  time: '2025-04-14T16:50:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36555
-- author: Golub
-  changes:
-  - message: Added the Knock spell to the wizard's grimoire
-    type: Add
-  id: 8180
-  time: '2025-04-14T18:57:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36562
-- author: metalgearsloth
-  changes:
-  - message: DamagePopups such as target dummies are now predicted.
-    type: Fix
-  id: 8181
-  time: '2025-04-14T19:10:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36547
-- author: SlamBamActionman
-  changes:
-  - message: Tracking implants no longer announce on radio when someone goes into
-      critical health.
-    type: Remove
-  id: 8182
-  time: '2025-04-14T20:23:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35995
-- author: SlamBamActionman
-  changes:
-  - message: Chest rig explosive resistance is increased from 50% to 90%.
-    type: Tweak
-  id: 8183
-  time: '2025-04-14T20:45:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35889
-- author: ArtisticRoomba
-  changes:
-  - message: Certain randomly filled bags will now have the correct number of contents
-      inside of them.
-    type: Fix
-  id: 8184
-  time: '2025-04-14T21:02:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36155
-- author: Will-Oliver-Br
-  changes:
-  - message: Now you can see if there's a beaker in the chemmaster.
-    type: Tweak
-  id: 8185
-  time: '2025-04-14T23:27:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36472
-- author: EmoGarbage404, Fildrance
-  changes:
-  - message: new ui for analysis console, new ui for node scanner. Artifact node activation
-      is now different.
-    type: Add
-  - message: artifacts cannot create massive distruction events, become guns or music
-      instruments. Sentient artifacts cannot activate nodes.
-    type: Remove
-  id: 8186
-  time: '2025-04-15T00:34:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33370
-- author: EmoGarbage404
-  changes:
-  - message: Skeletons once again become living skulls on death.
-    type: Fix
-  id: 8187
-  time: '2025-04-15T03:38:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36571
-- author: Crazydave91920
-  changes:
-  - message: Fixed Zookeeper not being on the double barrel shotgun contraband list
-    type: Fix
-  id: 8188
-  time: '2025-04-15T18:27:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36583
-- author: Minemoder5000
-  changes:
-  - message: The Syndicate Elite Hardsuit and Cybersun Juggernaut Suit have been restricted
-      to Nuclear Operative uplinks.
-    type: Tweak
-  - message: The Elite Web Vest has been added to the uplink for 5 tc. It has reduced
-      pierce resistance, but increased heat, radiation, blunt, slash, and caustic
-      resistance compared to the normal web vest.
-    type: Add
-  id: 8189
-  time: '2025-04-15T21:39:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36225
-- author: EmoGarbage404
-  changes:
-  - message: Sentient artifacts can once again activate themselves.
-    type: Tweak
-  - message: Increased sentient artifact self activation cooldown.
-    type: Tweak
-  id: 8190
-  time: '2025-04-15T22:24:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36598
-- author: EmoGarbage404
-  changes:
-  - message: When an artifact's node is unlocked, the effect will now also occur.
-      Effects can still be triggered manually through interaction.
-    type: Add
-  - message: Artifacts will now have more nodes on average.
-    type: Tweak
-  - message: Higher-class artifact nodes now grant significantly more points.
-    type: Tweak
-  id: 8191
-  time: '2025-04-15T22:38:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36604
-- author: EmoGarbage404
-  changes:
-  - message: Restored Artifexium's interaction with artifacts. Now, a single spray
-      will randomly activate one of the triggers for a node, allowing you to subvert
-      puzzling artifacts.
-    type: Add
-  id: 8192
-  time: '2025-04-15T22:49:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36595
-- author: slarticodefast, Flareguy
-  changes:
-  - message: Added the Desynchronizer, an experimental device that allows the user
-      to temporarily make themselves invincible, invisible, & immobile. Unlock it
-      through experimental science today!
-    type: Add
-  - message: Gravity Manipulation technology is now a tier 2 technology.
-    type: Tweak
-  id: 8193
-  time: '2025-04-16T01:33:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35752
-- author: RedBookcase
-  changes:
-  - message: Minor blueprint tweaks and a new stored sprite for blueprints.
-    type: Tweak
-  id: 8194
-  time: '2025-04-16T10:12:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36609
-- author: SlamBamActionman
-  changes:
-  - message: Unfolded bandanas/lab coats now fit in crates again.
-    type: Fix
-  id: 8195
-  time: '2025-04-16T11:54:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36625
-- author: metalgearsloth
-  changes:
-  - message: Fixes tippy messages being too sh-
-    type: Fix
-  id: 8196
-  time: '2025-04-16T12:23:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36616
-- author: SlamBamActionman
-  changes:
-  - message: Closed pet carriers no longer push players or lockers.
-    type: Fix
-  id: 8197
-  time: '2025-04-16T14:12:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36627
-- author: Flareguy, ArtisticRoomba
-  changes:
-  - message: Added the Temperature Gun. It can shoot body-temperature-changing bolts.
-      Unlock them through arsenal science today!
-    type: Add
-  - message: Experimental Battery Ammo technology is no longer available to research..
-    type: Remove
-  id: 8198
-  time: '2025-04-16T17:58:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35447
-- author: UpAndLeaves
-  changes:
-  - message: Most clothing will no longer provide protection against zombification
-    type: Tweak
-  - message: Blunt/Slash/Piercing resistance will now provide weak protection against
-      zombification.
-    type: Tweak
-  - message: Winter coats are now moderately effective against zombification.
-    type: Tweak
-  - message: Bio suits are now very effective against zombification.
-    type: Tweak
-  - message: Security bio suits are now lightly armored.
-    type: Tweak
-  - message: Bio suits now only have 5% slowdown.
-    type: Tweak
-  id: 8199
-  time: '2025-04-16T18:21:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36485
-- author: ScarKy0
-  changes:
-  - message: A basic sheet crate can now be ordered for 1660 spesos. It contains 30
-      steel, glass and plastic.
-    type: Add
-  id: 8200
-  time: '2025-04-16T19:20:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36419
-- author: sowelipililimute
-  changes:
-  - message: The medical and security techfabs now announce new recipes that they
-      can fabricate as they are researched
-    type: Add
-  id: 8201
-  time: '2025-04-16T19:29:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34959
-- author: Linkbro1
-  changes:
-  - message: changed MV and HV cable item sprites, changed MV cable structure sprites
-    type: Tweak
-  id: 8202
-  time: '2025-04-16T20:26:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34955
-- author: ciaran
-  changes:
-  - message: Fixed duplicate crew monitor console entries for crew with tracking implants
-    type: Fix
-  id: 8203
-  time: '2025-04-16T21:14:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35918
-- author: Seam_Less
-  changes:
-  - message: Standardized the In-Hand Sprites for all gloves
-    type: Tweak
-  id: 8204
-  time: '2025-04-16T22:15:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35997
-- author: DissidentBullet
-  changes:
-  - message: Monkeys can now wear juggernaut suits
-    type: Add
-  id: 8205
-  time: '2025-04-16T23:14:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34121
-- author: SpaceRox1244
-  changes:
-  - message: Cargo can now order handheld artifact containers for transporting small
-      artifacts.
-    type: Add
-  id: 8206
-  time: '2025-04-16T23:35:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33327
-- author: ScarKy0
-  changes:
-  - message: Hydroponics tray flatpacks can now be bought for 750 spesos.
-    type: Add
-  id: 8207
-  time: '2025-04-16T23:51:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36630
-- author: EmoGarbage404
-  changes:
-  - message: Fixed artifacts sometimes having negative research values.
-    type: Fix
-  id: 8208
-  time: '2025-04-17T03:14:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36642
-- author: VerinSenpai
-  changes:
-  - message: You can now use actions within the action window.
-    type: Add
-  id: 8209
-  time: '2025-04-17T10:08:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35642
-- author: ElectroJr
-  changes:
-  - message: Fixed some intense explosion types using incorrect overlay sprites.
-    type: Fix
-  id: 8210
-  time: '2025-04-17T10:12:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36644
-- author: Beck Thompson, SlamBamActionman
-  changes:
-  - message: Fixed trash bag visuals. The appearance will now update correctly depending
-      on how many items it contains!
-    type: Fix
-  id: 8211
-  time: '2025-04-17T10:36:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32386
-- author: Callmore
-  changes:
-  - message: Cyborgs now require being pryed to open/close the panel instead of screwed.
-    type: Tweak
-  id: 8212
-  time: '2025-04-17T10:38:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32796
-- author: Errant
-  changes:
-  - message: Handheld geiger counters can now by heard by everyone nearby.
-    type: Tweak
-  id: 8213
-  time: '2025-04-17T11:24:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30463
-- author: Centronias
-  changes:
-  - message: Tank harnesses can be made at lathes, similar to utility belts.
-    type: Add
-  - message: Tank harnesses take up a 1x2 space in inventories, half of their previous
-      2x2.
-    type: Tweak
-  id: 8214
-  time: '2025-04-17T12:33:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35590
-- author: Jacktastic09
-  changes:
-  - message: Added the Solid Headband, available via hacked ClothesMate vending machines
-    type: Add
-  id: 8215
-  time: '2025-04-17T13:43:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36650
-- author: Hoodie42
-  changes:
-  - message: The banjo can now be worn on the back or suit storage slots.
-    type: Tweak
-  id: 8216
-  time: '2025-04-17T14:05:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34057
-- author: muburu
-  changes:
-  - message: Space Dragons now have randomly generated names.
-    type: Add
-  id: 8217
-  time: '2025-04-17T21:05:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36656
-- author: archee1
-  changes:
-  - message: Cats can walk slowly to avoid slipping on puddles.
-    type: Tweak
-  - message: Cak's (cake cats) previously incorrect sprinting and walking speeds have
-      been corrected
-    type: Fix
-  id: 8218
-  time: '2025-04-18T01:15:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36542
-- author: Killerqu00
-  changes:
-  - message: Contraband examine icon now shows whether or not you are allowed to possess
-      the item.
-    type: Add
-  - message: Contraband examine activates by hovering instead of clicking.
-    type: Tweak
-  id: 8219
-  time: '2025-04-18T01:23:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36032
-- author: mjarduk
-  changes:
-  - message: Torches can now be refueled.
-    type: Tweak
-  - message: Burnt torches/glowsticks names' can now display if they're glued, cluwnified,
-      etc.
-    type: Fix
-  id: 8220
-  time: '2025-04-18T01:59:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36209
-- author: lzk228
-  changes:
-  - message: Borgs, clowns and mimes now can choose a custom name in loadouts.
-    type: Tweak
-  id: 8222
-  time: '2025-04-18T02:32:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35170
-- author: DogZeroX
-  changes:
-  - message: Added Experiment plushie from the game Scav Prototype!
-    type: Add
-  id: 8223
-  time: '2025-04-18T02:38:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36663
-- author: slarticodefast
-  changes:
-  - message: Fire extinguishers and sprays now allow you to push the grids you are
-      standing on when you have magboots on.
-    type: Add
-  id: 8224
-  time: '2025-04-18T03:41:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31754
-- author: aada
-  changes:
-  - message: Filter categories added to the security techfab.
-    type: Add
-  id: 8225
-  time: '2025-04-18T03:52:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35594
-- author: Fildrance
-  changes:
-  - message: returned deconstruct to the top level option on RCD
-    type: Fix
-  id: 8226
-  time: '2025-04-18T04:50:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36486
-- author: ciaran
-  changes:
-  - message: Added a button to scroll back to the bottom of the chat box
-    type: Add
-  id: 8227
-  time: '2025-04-18T07:43:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35913
-- author: Tayrtahn
-  changes:
-  - message: The popup when pointing at an item in a character's inventory now mentions
-      that character.
-    type: Tweak
-  id: 8228
-  time: '2025-04-18T12:09:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36252
-- author: slarticodefast
-  changes:
-  - message: Punching lights while wearing insulated gloves will no longer electrocute
-      you.
-    type: Fix
-  id: 8229
-  time: '2025-04-18T12:26:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36686
-- author: Minemoder
-  changes:
-  - message: Rainbow Cannabis Leaves no longer emit light due to a renderer limitation.
-    type: Remove
-  id: 8230
-  time: '2025-04-18T14:12:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36479
-- author: IProduceWidgets
-  changes:
-  - message: Holobarrier projectors are now more power efficient.
-    type: Tweak
-  id: 8231
-  time: '2025-04-18T16:10:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34473
-- author: K-Dynamic
-  changes:
-  - message: Removed egg-plant from MegaSeed Servitor. (Egg-plant seeds can still
-      be obtained by mutation or exotic seed crate.)
-    type: Remove
-  id: 8232
-  time: '2025-04-18T16:42:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36579
-- author: Failed, Centronias
-  changes:
-  - message: The drink shaker now has in-hand sprites
-    type: Tweak
-  id: 8233
-  time: '2025-04-18T17:12:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36382
-- author: IProduceWidgets
-  changes:
-  - message: filing cabinets no longer have whitelists.
-    type: Tweak
-  id: 8234
-  time: '2025-04-18T17:37:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36185
-- author: aada
-  changes:
-  - message: Egg-plants now have 6 reagent per egg at 20 potency, up from 3.
-    type: Tweak
-  id: 8235
-  time: '2025-04-18T19:52:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36693
-- author: Nox38
-  changes:
-  - message: Nuclear operative agent is renamed to nuclear operative corpsman.
-    type: Tweak
-  id: 8236
-  time: '2025-04-18T19:56:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34627
-- author: Ilya246
-  changes:
-  - message: The actions hotbar now has up to 10 more hotkeys accessible through the
-      shift key.
-    type: Add
-  id: 8237
-  time: '2025-04-18T22:45:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33872
-- author: lzk228
-  changes:
-  - message: Fixed breaking small mobs (e.g. mice) mask after getting into an air
-      flow.
-    type: Fix
-  id: 8238
-  time: '2025-04-18T22:52:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33888
-- author: YoungThugSS14
-  changes:
-  - message: The Diona and Gingerbread species now get unique typing indicators
-    type: Add
-  id: 8239
-  time: '2025-04-18T23:19:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36126
-- author: Rainbeon
-  changes:
-  - message: Fixed Revolvers not correctly reloading from Speedloaders when the Revolver
-      is partially loaded.
-    type: Fix
-  - message: Speedloaders will now prioritize loading the active and upcoming chambers
-      in a Revolver when the Speedloader is only partially filled, rather than the
-      ones farthest away.
-    type: Fix
-  id: 8240
-  time: '2025-04-18T23:26:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32396
-- author: ScarKy0
-  changes:
-  - message: Changed the air vent and scrubber sprites.
-    type: Tweak
-  id: 8241
-  time: '2025-04-18T23:34:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34223
-- author: EmoGarbage404
-  changes:
-  - message: Added the material silo. This machine allows nearby machines to share
-      a pool of resources, cutting down on micromanagement.
-    type: Add
-  id: 8242
-  time: '2025-04-18T23:43:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36492
-- author: Onezero0
-  changes:
-  - message: Modular Grenades can now fit inside Security belts and carriers.
-    type: Tweak
-  id: 8243
-  time: '2025-04-19T00:04:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34169
-- author: Alpaccalypse
-  changes:
-  - message: The cocktail "Irish slammer" has been renamed to "Grenade Penguin".
-    type: Tweak
-  id: 8244
-  time: '2025-04-19T00:24:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34181
-- author: ScarKy0
-  changes:
-  - message: Added a couple more tools to the artifact borg module.
-    type: Tweak
-  id: 8245
-  time: '2025-04-19T00:25:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33338
-- author: august-sun
-  changes:
-  - message: Resprited the Chief Engineer's mantle.
-    type: Tweak
-  id: 8246
-  time: '2025-04-19T00:26:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36697
-- author: IProduceWidgets
-  changes:
-  - message: Vox are no longer immune to the zombie virus under certain circumstances
-    type: Fix
-  - message: The zombie virus no longer provides non-Initial Infected an undue grace
-      period before poisoning them.
-    type: Fix
-  id: 8247
-  time: '2025-04-19T00:38:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34472
-- author: Booblesnoot42
-  changes:
-  - message: Airlocks will now animate properly after crushing someone.
-    type: Fix
-  id: 8248
-  time: '2025-04-19T00:57:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34523
-- author: SlamBamActionman
-  changes:
-  - message: Fingerprints and fibers are now always applied to items being held, regardless
-      of how they got into your hands.
-    type: Fix
-  - message: Changing gloves now correctly applies new fibers/fingerprints on held
-      items.
-    type: Fix
-  id: 8249
-  time: '2025-04-19T01:02:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30609
-- author: Coolsurf6
-  changes:
-  - message: Attachbodypart command now functions as intended.
-    type: Fix
-  id: 8250
-  time: '2025-04-19T01:23:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34577
-- author: metalgearsloth
-  changes:
-  - message: Fix disarm swing sound even if a disarm isn't possible on the target.
-    type: Fix
-  id: 8251
-  time: '2025-04-19T01:38:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36546
-- author: metalgearsloth
-  changes:
-  - message: Predict gas volume pumps.
-    type: Tweak
-  id: 8252
-  time: '2025-04-19T01:48:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33835
-- author: SharkSnake98
-  changes:
-  - message: Added 12 new, varied drinks for the bartender to mix during shifts.
-    type: Add
-  id: 8253
-  time: '2025-04-19T05:12:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36287
-- author: Ko4erga
-  changes:
-  - message: Added new color turtlenecks in WinterDrobe.
-    type: Add
-  id: 8254
-  time: '2025-04-19T05:14:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32920
-- author: metalgearsloth
-  changes:
-  - message: Virtual items (e.g. wielding) are now predicted.
-    type: Add
-  id: 8255
-  time: '2025-04-19T06:51:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36617
-- author: metalgearsloth
-  changes:
-  - message: Fix charges sometimes breaking for auto-recharge devices such as RCDs.
-    type: Fix
-  id: 8256
-  time: '2025-04-19T08:49:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36714
-- author: Boaz1111
-  changes:
-  - message: Reduced the range at which security radios pick up noise from 4 tiles
-      to 1 tile.
-    type: Tweak
-  id: 8257
-  time: '2025-04-19T13:10:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34878
-- author: Quantus
-  changes:
-  - message: Fixed the unusual delay in production after de-aging a plant with cryoxadone.
-    type: Fix
-  id: 8258
-  time: '2025-04-19T13:43:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34668
-- author: ArtisticRoomba
-  changes:
-  - message: The Go Go Hat now checks if your message matches either the name of the
-      item or the label of the item. This allows people with accents to name their
-      items according to how their character would say the item, or for a faster retrieval
-      without having to type out the full name.
-    type: Tweak
-  id: 8259
-  time: '2025-04-19T14:11:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35658
-- author: GrownSamoyedDog
-  changes:
-  - message: Pineapple Juice Cartons are new and added to Booze-O-Mat.
-    type: Add
-  id: 8260
-  time: '2025-04-19T14:25:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34769
-- author: claustro305
-  changes:
-  - message: Fixed a bug where dragged objects would collide with wall mounted lights
-      and cameras.
-    type: Fix
-  id: 8261
-  time: '2025-04-19T14:29:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35908
-- author: metalgearsloth
-  changes:
-  - message: Fix detailed examine buttons sometimes showing up incorrectly.
-    type: Fix
-  id: 8262
-  time: '2025-04-19T14:37:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33814
-- author: sowelipililimute
-  changes:
-  - message: Servers with the number of open inventories set to two have a new alignment
-      that doesn't shift as much when opening and closing multiple inventories
-    type: Tweak
-  id: 8263
-  time: '2025-04-19T14:40:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35041
-- author: ps3moira
-  changes:
-  - message: Removed interior shuttle walls
-    type: Remove
-  id: 8264
-  time: '2025-04-19T14:41:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34261
-- author: Minemoder
-  changes:
-  - message: Most roles on the station now require significantly less playtime playtime
-      to unlock.
-    type: Tweak
-  id: 8265
-  time: '2025-04-19T15:31:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36666
-- author: Fildrance
-  changes:
-  - message: fixed spessman getting stuck after unlocking portal node
-    type: Fix
-  id: 8266
-  time: '2025-04-19T17:07:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36719
-- author: VlaDOS1408
-  changes:
-  - message: Fixed Gravity gen menu resizing! Now it looks like it should.
-    type: Fix
-  id: 8267
-  time: '2025-04-19T20:20:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34036
-- author: coffeeware, MilenVolf
-  changes:
-  - message: Most common mobs without hands now can't dump containers wtih solution
-      by drag and dropping.
-    type: Tweak
-  id: 8268
-  time: '2025-04-19T20:32:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33350
-- 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
-    type: Tweak
-  - message: Made Warden/HoS coats slightly more protective to better fit their position
-    type: Tweak
-  id: 8310
-  time: '2025-04-22T03:22:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30212
-- author: K-Dynamic
-  changes:
-  - message: Changed instances of 3.5 second grenade timers to 3 seconds, including
-      clusterbangs and atmos metal foam grenades.
-    type: Tweak
-  - message: Atmos metal foam grenades have been reworked to disperse foam in a 5x5
-      diamond pattern and harden within two seconds.
-    type: Tweak
-  - message: Reduced hardened metal foam health (breakable in 6 crowbar swings).
-    type: Tweak
-  - message: Changed syndicate trickbomb timer from 3.5 seconds to 5 seconds to match
-      minibombs.
-    type: Tweak
-  id: 8311
-  time: '2025-04-22T05:51:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34579
-- author: muburu
-  changes:
-  - message: Dragons can now pry open doors, including firelocks.
-    type: Tweak
-  id: 8312
-  time: '2025-04-22T06:33:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36811
-- author: sowelipililimute
-  changes:
-  - message: The Funding Allocation Computer can now adjust the cut Cargo takes from
-      lockbox sales
-    type: Add
-  - message: The Funding Allocation Computer doesn't show Cargo separately from its
-      75% cut
-    type: Tweak
-  id: 8313
-  time: '2025-04-22T12:34:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36790
-- author: yuitop
-  changes:
-  - message: Fingerless gloves no more blocking taking the fingerprint.
-    type: Tweak
-  id: 8314
-  time: '2025-04-22T18:15:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31864
-- author: GoldenCan
-  changes:
-  - message: Heads of Personnel can now fabricate generic command-themed clothes using
-      their uniform printer.
-    type: Add
-  id: 8315
-  time: '2025-04-22T18:35:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32103
-- author: Ilya246
-  changes:
-  - message: Numerous cargo orders have been made cheaper.
-    type: Tweak
-  id: 8316
-  time: '2025-04-22T18:38:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32375
-- author: Southbridge
-  changes:
-  - message: Solar Panels can now be randomly damaged or unfinished at the beginning
-      of the round.
-    type: Add
-  id: 8317
-  time: '2025-04-22T19:46:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36825
-- author: Kickguy223
-  changes:
-  - message: Reduced the price of firelock electronics to half the price of the input
-      materials
-    type: Tweak
-  id: 8318
-  time: '2025-04-22T23:53:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33469
-- author: murolem
-  changes:
-  - message: Building orientation on fences, diagonal grilles and the diagonal shuttle
-      wall is now respected.
-    type: Fix
-  id: 8319
-  time: '2025-04-23T01:58:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36488
-- author: kosticia
-  changes:
-  - message: Added analog of donk-pockets for moth - moth-pockets
-    type: Add
-  id: 8320
-  time: '2025-04-23T05:36:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34517
-- author: AgentSmithRadio
-  changes:
-  - message: New food crates are now available for purchase from the automated trade
-      station!
-    type: Add
-  - message: You can no longer use Sweetie's Pistachios to fulfill cargo's generic
-      fruit bounty.
-    type: Remove
-  id: 8321
-  time: '2025-04-23T05:37:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33286
-- author: SaphireLattice
-  changes:
-  - message: Steel sheets no longer have unintuitively wasteful plating placement
-      that can be done with steel tiles instead
-    type: Remove
-  id: 8322
-  time: '2025-04-23T11:08:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33443
-- author: ArchRBX
-  changes:
-  - message: pAI's can now install a variety of useful software through their new
-      Software Catalog.
-    type: Add
-  - message: pAI's no longer start with a Station Map or MIDI Player, and must purchase
-      these through the shop.
-    type: Tweak
-  id: 8323
-  time: '2025-04-23T23:55:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36857
-- author: NoElkaTheGod
-  changes:
-  - message: Toysword now actually looks almost like the real thing, as advertised
-      in the description
-    type: Tweak
-  id: 8324
-  time: '2025-04-24T01:21:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34199
-- author: Pronana
-  changes:
-  - message: Moths can now eat pills
-    type: Tweak
-  id: 8325
-  time: '2025-04-24T02:28:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35609
-- author: Coolsurf6
-  changes:
-  - message: Updated more contraband items for Syndicate and Security.
-    type: Tweak
-  id: 8326
-  time: '2025-04-24T02:57:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35102
-- author: Beck Thompson
-  changes:
-  - message: You can how hide items inside cake by using a knife! Eating a cake with
-      an item inside will do minor damage.
-    type: Add
-  id: 8327
-  time: '2025-04-24T03:00:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31015
 - author: RedBookcase
   changes:
   - message: Added Advanced Circular Saw as a Medical Doctor specific uplink item.
@@ -3902,3 +2647,1256 @@
   id: 8679
   time: '2025-06-15T21:11:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34765
+- author: qrwas
+  changes:
+  - message: Grouping for Loadouts
+    type: Add
+  - message: '3 new pin to loadout: aroace pin, plural pin and genderfluid pin'
+    type: Add
+  - message: smoking, pins, towels and jumpsuit for HoS are now grouped in loadouts
+      menu
+    type: Tweak
+  id: 8680
+  time: '2025-06-16T09:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36951
+- author: Sparlight
+  changes:
+  - message: Smart corgis are now targeted by hostile mobs like the rest of the crew.
+    type: Tweak
+  id: 8681
+  time: '2025-06-16T15:39:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38349
+- author: ArtisticRoomba
+  changes:
+  - message: Thieves now have an innate stealth steal ability (thieving gloves) that
+      can be toggled on/off.
+    type: Add
+  - message: The Thief no longer spawns with thieving gloves.
+    type: Remove
+  - message: Thieving gloves have been removed from the Traitor store.
+    type: Remove
+  id: 8682
+  time: '2025-06-16T22:47:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38123
+- author: kosticia
+  changes:
+  - message: Hyposprays are now predicted.
+    type: Tweak
+  id: 8683
+  time: '2025-06-17T00:08:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38046
+- author: august-sun
+  changes:
+  - message: Added the Estoc DMR, a burst-fire marksman rifle with an optic. Available
+      for syndicate operatives at 18 TC.
+    type: Add
+  id: 8684
+  time: '2025-06-17T00:20:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38122
+- author: Citrea-Lingua
+  changes:
+  - message: Handheld artifact containers can now properly store handheld artifacts.
+    type: Fix
+  id: 8685
+  time: '2025-06-17T08:53:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38383
+- author: hoshizora-sayo
+  changes:
+  - message: Fixed oddities with the memory cell, APC, and black curtains crafting
+      menu entries.
+    type: Fix
+  id: 8686
+  time: '2025-06-17T09:22:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38372
+- author: KamTheSythe
+  changes:
+  - message: Explosive payloads no longer explode. Modular grenades with explosive
+      payloads remain unchanged, and can still be used to stack explosions.
+    type: Tweak
+  id: 8687
+  time: '2025-06-17T09:46:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38049
+- author: Kittygyat
+  changes:
+  - message: Increased borg drag speed, equivalent to Diona speeds.
+    type: Tweak
+  id: 8688
+  time: '2025-06-17T10:41:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38232
+- author: TheFlyingSentry
+  changes:
+  - message: Animal stealing thief objectives now actually check for the objective's
+      existence.
+    type: Tweak
+  id: 8689
+  time: '2025-06-17T11:06:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38332
+- author: kosticia
+  changes:
+  - message: Reflection chances are examinable now.
+    type: Add
+  id: 8690
+  time: '2025-06-18T00:50:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38199
+- author: Kittygyat
+  changes:
+  - message: Fixed vapes dealing unintended damage types to you when used.
+    type: Fix
+  id: 8691
+  time: '2025-06-18T12:06:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38423
+- author: beck-thompson
+  changes:
+  - message: Recycler now properly recycles item stacks.
+    type: Fix
+  id: 8692
+  time: '2025-06-18T21:14:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38433
+- author: Bhijn and Myr
+  changes:
+  - message: In interest of raising awareness of addiction to the game, the lobby
+      will now display your current playtime on a given day once it exceeds a threshold.
+    type: Add
+  id: 8693
+  time: '2025-06-19T01:06:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36483
+- author: ScarKy0
+  changes:
+  - message: APCs now have a wirepanel. It can be used to disallow the AI from accessing
+      it.
+    type: Add
+  id: 8694
+  time: '2025-06-19T15:06:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38443
+- author: Sparlight
+  changes:
+  - message: Smart corgis can now wear various hardsuits, armors, and glasses items.
+    type: Add
+  id: 8695
+  time: '2025-06-19T19:49:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36875
+- author: VerinSenpai
+  changes:
+  - message: Handcuffs no longer interfere with your daily tail wagging activities.
+    type: Fix
+  id: 8696
+  time: '2025-06-19T22:42:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38454
+- author: BigfootBravo
+  changes:
+  - message: Chameleon Controller Implants can be deimplanted.
+    type: Fix
+  id: 8697
+  time: '2025-06-20T22:41:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38439
+- author: FairlySadPanda
+  changes:
+  - message: A new poster.
+    type: Add
+  - message: A new (very expensive) crate to order from cargo, worth 25,000 spesos
+      and containing a hydrated scurret. The hydrated scurret is a ghost role - a
+      non-antagonistic emotional support scurret.
+    type: Add
+  id: 8698
+  time: '2025-06-20T23:39:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38218
+- author: Tayrtahn
+  changes:
+  - message: Sloths... now... speak... slowly...
+    type: Add
+  id: 8699
+  time: '2025-06-21T06:32:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38142
+- author: whatston3
+  changes:
+  - message: Locked buttons must now be unlocked to trigger.
+    type: Fix
+  id: 8700
+  time: '2025-06-21T09:41:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38474
+- author: slarticodefast
+  changes:
+  - message: Fixed wallmount interaction rotation.
+    type: Fix
+  id: 8701
+  time: '2025-06-21T13:11:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38111
+- author: Prole0
+  changes:
+  - message: Flask Visuals & Sounds!
+    type: Add
+  - message: Flasks now need to be opened to be drunk from.
+    type: Tweak
+  id: 8702
+  time: '2025-06-21T14:52:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38032
+- author: qrwas
+  changes:
+  - message: Loadout item group UI improvements
+    type: Tweak
+  id: 8703
+  time: '2025-06-21T22:20:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38488
+- author: perryprog
+  changes:
+  - message: Wet mops no longer have zero melee damage.
+    type: Fix
+  id: 8704
+  time: '2025-06-21T22:23:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38486
+- author: Cojoke-dot
+  changes:
+  - message: Pacifists can now use the Staff of Healing
+    type: Tweak
+  id: 8706
+  time: '2025-06-22T19:38:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38509
+- author: slarticodefast
+  changes:
+  - message: The interrogator lamp and flash lantern now properly flash when toggled
+      on.
+    type: Fix
+  id: 8707
+  time: '2025-06-23T11:32:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37640
+- author: metalgearsloth
+  changes:
+  - message: Added ambient occlusion to walls so they have shadows around them.
+    type: Add
+  id: 8708
+  time: '2025-06-24T07:56:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38276
+- author: BramvanZijp
+  changes:
+  - message: Added Stamina Damage resistance to the raid/hard-suits used by Nuclear
+      Operatives and Emergency Response Teams.
+    type: Tweak
+  id: 8709
+  time: '2025-06-24T13:04:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38526
+- author: Kittygyat
+  changes:
+  - message: Added a handheld station map to the borg thruster module!
+    type: Add
+  id: 8710
+  time: '2025-06-24T15:35:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38541
+- author: PJB3005
+  changes:
+  - message: Fixed various worn clothing items being invisible when seen through UI,
+      such as the examine popups.
+    type: Fix
+  id: 8711
+  time: '2025-06-24T20:47:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38042
+- author: AreYouConfused
+  changes:
+  - message: Bulldog bundle now accurately says what is included
+    type: Fix
+  id: 8712
+  time: '2025-06-24T21:58:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38558
+- author: Dragonjspider
+  changes:
+  - message: The Cutter Machine no longer makes Dark Techmaints floor tiles for free
+    type: Fix
+  id: 8713
+  time: '2025-06-25T01:46:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38557
+- author: rumaks-xyz
+  changes:
+  - message: The action of reverting from a polymorph now has to be confirmed.
+    type: Tweak
+  id: 8714
+  time: '2025-06-25T17:52:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38570
+- author: Lukasz825700516
+  changes:
+  - message: Closed eyes and binoculars no longer allow you to see through walls.
+    type: Fix
+  id: 8715
+  time: '2025-06-25T20:22:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38534
+- author: Hitlinemoss
+  changes:
+  - message: Various hats have had their descriptions updated.
+    type: Tweak
+  id: 8716
+  time: '2025-06-25T20:27:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38156
+- author: slarticodefast
+  changes:
+  - message: Multi-handed items can be picked up again.
+    type: Fix
+  id: 8717
+  time: '2025-06-26T15:29:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38603
+- author: slarticodefast
+  changes:
+  - message: Fixed smart equip not retrieving items.
+    type: Fix
+  id: 8718
+  time: '2025-06-26T16:17:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38605
+- author: Hitlinemoss
+  changes:
+  - message: The Quartermaster's PDA now comes with AstroNav preinstalled.
+    type: Tweak
+  id: 8719
+  time: '2025-06-26T22:09:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38445
+- author: BigfootBravo
+  changes:
+  - message: Bladed flatcaps are now minor contraband.
+    type: Tweak
+  id: 8720
+  time: '2025-06-26T22:57:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38597
+- author: TiniestShark
+  changes:
+  - message: Added inhand sprites to all plushies/toys and the ability to wear (most)
+      of them in either your head or neck slot.
+    type: Add
+  - message: Nar'sie, Ratvar and Revenant plushies now require two hands to hold.
+    type: Tweak
+  id: 8721
+  time: '2025-06-27T01:07:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38514
+- author: maland1
+  changes:
+  - message: Updating Thief guidebook page including making guidebook and thieving
+      satchel images more consistent
+    type: Tweak
+  id: 8722
+  time: '2025-06-27T02:03:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38586
+- author: slarticodefast
+  changes:
+  - message: Fixed RCD ghosts not disappearing when dropping the RCD.
+    type: Fix
+  id: 8723
+  time: '2025-06-27T16:39:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38622
+- author: Tayrtahn
+  changes:
+  - message: Solution containers (beakers, glasses, etc) no longer rapidly flicker
+      through different fill level visuals when transferring their contents.
+    type: Fix
+  id: 8724
+  time: '2025-06-28T00:13:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34838
+- author: Boaz1111
+  changes:
+  - message: Headphone sprites have been changed a bit, and they are now wearable
+      on the head, ears and neck.
+    type: Tweak
+  id: 8725
+  time: '2025-06-28T14:01:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38479
+- author: slarticodefast
+  changes:
+  - message: Fixed smart equip not being able to insert items into item slots (for
+      example for the sabre sheath).
+    type: Fix
+  id: 8726
+  time: '2025-06-29T14:33:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38655
+- author: BramvanZijp
+  changes:
+  - message: Added the custom door remote, it does not have any built-in access, instead
+      inheriting the ID access that the user has.
+    type: Add
+  - message: The captain's locker now comes with a custom door remote instead of a
+      command door remote.
+    type: Tweak
+  id: 8727
+  time: '2025-06-29T16:21:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35536
+- author: slarticodefast
+  changes:
+  - message: Fixed water cups not being able to be picked up from water coolers.
+    type: Fix
+  id: 8728
+  time: '2025-07-01T10:25:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38681
+- author: maland1
+  changes:
+  - message: Fixed Wizard recalling nuke disk from inside an armed nuke making it
+      impossible to defuse
+    type: Fix
+  id: 8729
+  time: '2025-07-02T20:50:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38661
+- author: Blackern5000
+  changes:
+  - message: Most salvage enemies have had their HP reduced
+    type: Tweak
+  - message: Most salvage weapons have had their damage reduced
+    type: Tweak
+  id: 8730
+  time: '2025-07-03T00:54:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38131
+- author: TrixxedHeart
+  changes:
+  - message: Made HSV the default color selector for character customization.
+    type: Tweak
+  id: 8731
+  time: '2025-07-03T01:08:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38434
+- author: ArtisticRoomba
+  changes:
+  - message: A new atmospherics valve has been added, the Inlet Pressure Regulator!
+      You can learn more about its behavior and potential uses in the Engineering
+      Guidebook.
+    type: Add
+  id: 8732
+  time: '2025-07-03T16:00:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36708
+- author: SlamBamActionman
+  changes:
+  - message: Xeno tables can now be dismantled.
+    type: Fix
+  - message: Broken cryo pods can now be unanchored, allowing them to be scrapped.
+    type: Fix
+  id: 8733
+  time: '2025-07-03T18:51:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38689
+- author: TrixxedHeart
+  changes:
+  - message: Moved Syndicate Uplink TC purchase button beneath the respective item's
+      icon.
+    type: Tweak
+  id: 8734
+  time: '2025-07-03T23:49:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38596
+- author: maland1
+  changes:
+  - message: Updating a number of guidebook pages to be more easily readable and accurate
+    type: Tweak
+  id: 8735
+  time: '2025-07-04T00:04:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38699
+- author: TiniestShark
+  changes:
+  - message: Added a Wire Brush to the Janitor's tool kit for scrubbing unsightly
+      rust off of the station's walls!
+    type: Add
+  id: 8736
+  time: '2025-07-04T02:02:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38667
+- author: Velken
+  changes:
+  - message: Revenants' malfunction ability now properly works on MediBots and Stasis
+      Beds again.
+    type: Fix
+  id: 8737
+  time: '2025-07-04T05:08:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38664
+- author: perryprog
+  changes:
+  - message: You can now mop space lube, letting it evaporate faster than it would
+      on its own.
+    type: Tweak
+  id: 8738
+  time: '2025-07-04T21:50:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38743
+- author: TrixxedHeart
+  changes:
+  - message: Vox now have scar markings.
+    type: Add
+  id: 8739
+  time: '2025-07-04T23:06:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38592
+- author: perryprog
+  changes:
+  - message: Spellbooks with infinite charges work again.
+    type: Fix
+  id: 8740
+  time: '2025-07-05T06:28:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38376
+- author: beck-thompson
+  changes:
+  - message: The escape menu ui has been updated slightly.
+    type: Tweak
+  id: 8741
+  time: '2025-07-05T09:28:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38650
+- author: EmoGarbage404
+  changes:
+  - message: Fixed people asphyxiating if left on a stasis bed.
+    type: Fix
+  id: 8742
+  time: '2025-07-06T00:59:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38762
+- author: slarticodefast
+  changes:
+  - message: You can now catch basketballs, footballs and beach balls that are thrown
+      at you!
+    type: Add
+  id: 8743
+  time: '2025-07-06T16:54:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37702
+- author: ArtisticRoomba
+  changes:
+  - message: The Go Go Hat now correctly retrieves and deposits items again.
+    type: Fix
+  id: 8744
+  time: '2025-07-06T23:42:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38810
+- author: maland1
+  changes:
+  - message: Reduced the size of the go go hat inventory
+    type: Tweak
+  id: 8745
+  time: '2025-07-06T23:50:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38808
+- author: AsnDen
+  changes:
+  - message: Golden PAI was added. It is extremely rare and expensive. This PAI can
+      be found in maint lockers
+    type: Add
+  id: 8746
+  time: '2025-07-07T05:07:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38549
+- author: Smugman
+  changes:
+  - message: Many new lighters can now be found in both Maints loot and the Syndicate
+      Uplink.
+    type: Add
+  id: 8747
+  time: '2025-07-07T18:53:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35514
+- author: Jopaglazik, Golub
+  changes:
+  - message: Added Jump Boots In T1 "Salvage Equipment" technology.
+    type: Add
+  id: 8748
+  time: '2025-07-07T19:19:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36862
+- author: slarticodefast, EmoGarbage404
+  changes:
+  - message: 'Added a new science gadget: The H.A.R.M.P.A.C.K., a backpack that gives
+      you two extra hands when worn. Unlocked with a T2 arsenal research and printable
+      at the protolathe and secfab.'
+    type: Fix
+  id: 8749
+  time: '2025-07-07T21:43:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38824
+- author: kosticia
+  changes:
+  - message: Added new reagent for artifact researching - artifact glue! Use it on
+      the artefact with active node for repair its durability.
+    type: Add
+  id: 8750
+  time: '2025-07-08T01:45:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38670
+- author: maland1
+  changes:
+  - message: Updated contraband tags on pulse weapons, temp gun, portable particle
+      decelerator, tesla gun and makeshift laser pistol to be more consistent with
+      their intended owners and legality
+    type: Tweak
+  id: 8751
+  time: '2025-07-08T11:55:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38698
+- author: TrixxedHeart
+  changes:
+  - message: Vox can now have heterochromia in the overlays category under markings.
+    type: Add
+  id: 8752
+  time: '2025-07-08T23:22:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38595
+- author: Quantum-cross
+  changes:
+  - message: Fix lingering ghost entities after taking ghost roles.
+    type: Fix
+  id: 8753
+  time: '2025-07-09T11:07:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38788
+- author: Sparlight
+  changes:
+  - message: Dragons no longer destroy non-humanoid mobs upon eating them.
+    type: Tweak
+  id: 8754
+  time: '2025-07-09T12:43:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38087
+- author: Crude Oil
+  changes:
+  - message: Parrots now parrot nearby speech, sometimes even using the radio if they
+      have one equipped
+    type: Add
+  - message: Polly the Parrot, CE's pet parrot, may be found on some maps parroting
+      things into an engineering headset.
+    type: Add
+  id: 8755
+  time: '2025-07-09T19:04:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38243
+- author: slarticodefast
+  changes:
+  - message: Added VV buttons to the solution editor.
+    type: Add
+  id: 8756
+  time: '2025-07-10T06:31:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38889
+- author: Toby222
+  changes:
+  - message: pAIs can emote like borgs now
+    type: Add
+  id: 8757
+  time: '2025-07-10T07:56:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38425
+- author: Quantum-cross, slarticodefast
+  changes:
+  - message: The flash effect is now replaced with a reduced motion variant if the
+      accessibility setting is enabled in the game options.
+    type: Add
+  id: 8758
+  time: '2025-07-10T09:30:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37824
+- author: K-Dynamic
+  changes:
+  - message: Minigun now has inhand sprites.
+    type: Add
+  - message: Miniguns and other HMGs now require two hands to pick up and slows you
+      by 20%.
+    type: Tweak
+  id: 8759
+  time: '2025-07-10T12:42:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35344
+- author: ScarKy0
+  changes:
+  - message: SecTech vendor now starts with a few bolas.
+    type: Add
+  id: 8760
+  time: '2025-07-10T14:47:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38902
+- author: Hitlinemoss
+  changes:
+  - message: The station AI can now pick kobold/monkey holograms as customization
+      options.
+    type: Add
+  id: 8761
+  time: '2025-07-10T17:11:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38888
+- author: slarticodefast
+  changes:
+  - message: Fixed clones not getting the thieving skill.
+    type: Fix
+  id: 8762
+  time: '2025-07-10T21:37:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38914
+- author: Ertanic and whatston3
+  changes:
+  - message: The spray painter can now paint gas canisters, crates, lockers, and floor
+      decals.
+    type: Add
+  - message: The spray painter now consumes compressed paint, available from the YouTool
+      or printable in the autolathe.
+    type: Tweak
+  id: 8763
+  time: '2025-07-11T00:36:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37341
+- author: Princess-Cheeseballs
+  changes:
+  - message: Added Stamina and Stun animations
+    type: Add
+  id: 8764
+  time: '2025-07-11T12:13:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37196
+- author: Centronias
+  changes:
+  - message: Muzzles now prevent wearers from screaming and suppress sounds on audio
+      emotes.
+    type: Tweak
+  id: 8765
+  time: '2025-07-11T17:18:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32588
+- author: TiniestShark
+  changes:
+  - message: Added inhand sprites to all bottled drinks.
+    type: Add
+  id: 8766
+  time: '2025-07-12T14:28:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38937
+- author: Velken
+  changes:
+  - message: Ian and McGriff are more fashionable by letting them wear hats and glasses.
+    type: Add
+  id: 8767
+  time: '2025-07-13T16:11:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38634
+- author: Toast_Enjoyer, huaqas
+  changes:
+  - message: The Purchaseable Scurret now comes in a livestock crate instead of a
+      plastic one. Wawa!
+    type: Fix
+  id: 8768
+  time: '2025-07-13T16:48:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38951
+- author: lzk228
+  changes:
+  - message: Changed ocarina's size from Normal to Small
+    type: Tweak
+  id: 8769
+  time: '2025-07-13T19:31:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38971
+- author: ToastEnjoyer
+  changes:
+  - message: The nukeop war declarator is now syndicate contraband.
+    type: Tweak
+  id: 8770
+  time: '2025-07-13T20:50:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38972
+- author: Flareguy
+  changes:
+  - message: Added several new vox customization options, including additional tails,
+      hairstyles, and tattoos.
+    type: Add
+  - message: Added eyeshadow markings. They're available on every species except for
+      Moth and Arachnid.
+    type: Add
+  id: 8771
+  time: '2025-07-14T02:49:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38906
+- author: Trosling
+  changes:
+  - message: Moved Bible/Holy Book choice to loadout options for chaplain.
+    type: Tweak
+  - message: Implemented new holy book sprites, as well as one existing one (space
+      quran).
+    type: Add
+  id: 8772
+  time: '2025-07-15T00:49:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38986
+- author: RedBookcase
+  changes:
+  - message: The Kardashev-Mosin's bayonet can now be used while the weapon is wielded.
+      Tally ho!
+    type: Add
+  id: 8773
+  time: '2025-07-15T00:49:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38295
+- author: SlamBamActionman
+  changes:
+  - message: Throwable item hitboxes have been updated to better reflect their sprites.
+    type: Tweak
+  id: 8774
+  time: '2025-07-15T00:51:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38985
+- author: Velken
+  changes:
+  - message: Moproaches have been added to the game.
+    type: Add
+  - message: Moproaches can sometimes appear from the station's sewage system.
+    type: Add
+  id: 8775
+  time: '2025-07-15T02:47:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38700
+- author: nabegator
+  changes:
+  - message: You can now put remote signallers into utility belts.
+    type: Tweak
+  id: 8776
+  time: '2025-07-16T00:43:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35212
+- author: ArtisticRoomba
+  changes:
+  - message: Firelocks will now properly drop fast enough to prevent the spacing of
+      an entire atmos volume.
+    type: Fix
+  - message: Only the necessary firelocks required to stop a spacing will drop when
+      a spacing is triggered, instead of all firelocks in a spaced volume.
+    type: Fix
+  id: 8777
+  time: '2025-07-16T03:18:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38918
+- author: ScarKy0
+  changes:
+  - message: Wizard's Mjollnir can no longer stun when thrown off-cooldown.
+    type: Fix
+  id: 8778
+  time: '2025-07-16T20:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39018
+- author: SlamBamActionman
+  changes:
+  - message: Grilles under diagonal windows no longer electrocute you.
+    type: Fix
+  id: 8779
+  time: '2025-07-17T13:33:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39032
+- author: qwerltaz
+  changes:
+  - message: NPC spiders now spin webs sometimes!
+    type: Add
+  id: 8780
+  time: '2025-07-17T16:34:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38319
+- author: Quantum-cross
+  changes:
+  - message: Anomalies make anomalous noises if you let them go supercritical
+    type: Add
+  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
+- author: perryprog
+  changes:
+  - message: Fixed board game areas sometimes overlapping with those of other board
+      games.
+    type: Fix
+  id: 8822
+  time: '2025-08-01T21:48:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39327
+- author: Krosus
+  changes:
+  - message: Fixed crash when loading saved character profiles
+    type: Fix
+  id: 8823
+  time: '2025-08-02T15:14:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39333
+- author: FairlySadPanda
+  changes:
+  - message: A new cake, berry delight, that is made with a cake base, berries and
+      milk.
+    type: Add
+  id: 8824
+  time: '2025-08-02T18:35:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38881
+- author: DrSmugleaf
+  changes:
+  - message: Fixed rotate verbs being delayed when used, and your right click UI bounce
+      when they appear after a short delay.
+    type: Fix
+  id: 8825
+  time: '2025-08-03T00:34:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38165
+- author: alexalexmax
+  changes:
+  - message: Updated the syndicate throwing knives uplink entry to include the fact
+      that they ignore armor.
+    type: Tweak
+  id: 8826
+  time: '2025-08-04T19:19:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39374
+- author: TrixxedHeart
+  changes:
+  - message: Added canes to the trinkets loadout tab.
+    type: Add
+  - message: Added offset canes for roleplay flair. They can be crafted in the medical
+      lathe.
+    type: Add
+  id: 8827
+  time: '2025-08-04T23:39:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39272
+- author: qwerltaz
+  changes:
+  - message: The air alarm window scrubber controller now has buttons to select and
+      deselect all gases.
+    type: Add
+  id: 8828
+  time: '2025-08-05T00:34:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39296
+- author: perryprog
+  changes:
+  - message: Players no longer have the ability to cycle a timer in the verb menu
+      on a cyborg.
+    type: Fix
+  id: 8829
+  time: '2025-08-05T03:26:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39388
+- author: Luxeator
+  changes:
+  - message: Fixed error upon exploding buckled mobs (and other near instantaneous
+      changes)
+    type: Fix
+  id: 8830
+  time: '2025-08-05T23:15:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39410
+- author: ScarKy0, beck-thompson
+  changes:
+  - message: Various canines will now sometimes clumsily spill things they drink.
+    type: Add
+  id: 8831
+  time: '2025-08-06T13:00:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38852
+- author: aada
+  changes:
+  - message: You can examine fuel tanks to see how much they're filled.
+    type: Add
+  id: 8832
+  time: '2025-08-06T16:11:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39362
+- author: Tao7891
+  changes:
+  - message: Craftable cardboard structures and equipment.
+    type: Add
+  id: 8833
+  time: '2025-08-06T16:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37363
+- author: slarticodefast
+  changes:
+  - message: Fixed inventory sprites flickering when hovering over the slot with an
+      item.
+    type: Fix
+  id: 8834
+  time: '2025-08-06T20:14:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39379
+- author: Thinbug0
+  changes:
+  - message: New onion mutation, Bloonions! floating balloon-like onions.
+    type: Add
+  id: 8835
+  time: '2025-08-07T01:51:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33375
+- author: Kittygyat
+  changes:
+  - message: Made baseball bats 1x4 instead of 2x2
+    type: Tweak
+  - message: New baseball bat inventory icon sprites
+    type: Add
+  id: 8836
+  time: '2025-08-07T03:03:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38392
+- author: lolman360
+  changes:
+  - message: Fixed certain items (like pickaxes) failing to insert into containers
+      that have enough space to store them, sometimes.
+    type: Fix
+  id: 8837
+  time: '2025-08-07T16:01:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38896
+- author: chromiumboy
+  changes:
+  - message: The station AI will receive chat notifications when its sentry turrets
+      start firing upon hostile targets.
+    type: Add
+  id: 8838
+  time: '2025-08-08T18:56:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35277
+- author: K-Dynamic
+  changes:
+  - message: Captain and Head of Personnel starts with administration glasses and
+      hud respectively.
+    type: Add
+  id: 8839
+  time: '2025-08-08T19:00:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35531
+- author: perryprog
+  changes:
+  - message: The emote radial menu now shows the correct icons for its subcategories.
+    type: Fix
+  id: 8840
+  time: '2025-08-08T19:27:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39481
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 2a1f1ea096..b3e0833f7e 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -371,4 +371,136 @@
   id: 45
   time: '2025-06-13T19:17:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38259
+- author: SlamBamActionman
+  changes:
+  - message: Exo has received a "day 1 patch", fixing various incorrectly mapped features
+      and some smaller balance tweaks.
+    type: Fix
+  id: 46
+  time: '2025-06-16T16:43:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38348
+- author: SlamBamActionman
+  changes:
+  - message: Exo has received minor balance changes and fixes, along with having its
+      Atmos layout slightly modified.
+    type: Tweak
+  id: 47
+  time: '2025-06-19T04:06:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38435
+- author: UpAndLeaves
+  changes:
+  - message: CentComm security now uses a genpop system.
+    type: Add
+  id: 48
+  time: '2025-07-02T03:14:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37494
+- author: SlamBamActionman
+  changes:
+  - message: Exo station has had several minor changes and fixes, including a change
+      to the Nuke vault to allow it to be anchored in its center and its windows blocked
+      with blastdoors.
+    type: Fix
+  - message: Exo station's playercap has been increased from 30-70 to 40-80.
+    type: Tweak
+  id: 49
+  time: '2025-07-03T18:51:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38689
+- author: qwerltaz
+  changes:
+  - message: On Bagel, redesigned Security to have GenPop.
+    type: Tweak
+  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
+- author: SlamBamActionman
+  changes:
+  - message: Exo station has had a major Security department rework, along with the
+      eastern maintenance section of the station, as well as several other minor changes
+      across the station.
+    type: Tweak
+  id: 62
+  time: '2025-07-31T20:28:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39295
 Order: 1
diff --git a/Resources/ConfigPresets/WizardsDen/vulture.toml b/Resources/ConfigPresets/WizardsDen/vulture.toml
index 0e89f63741..8eccfa48e1 100644
--- a/Resources/ConfigPresets/WizardsDen/vulture.toml
+++ b/Resources/ConfigPresets/WizardsDen/vulture.toml
@@ -14,6 +14,3 @@ force_client_hud_version_watermark = true
 
 [chat]
 motd = "\n########################################################\n\n[font size=17]This is a test server. You can play with the newest changes to the game, but these [color=red]changes may not be final or stable[/color], and may be reverted. Please report bugs via our GitHub, forum, or community Discord.[/font]\n\n########################################################\n"
-
-[debug]
-pow3r_disable_parallel = false
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index e8bf94fb30..f1a069de14 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, 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, 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, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, trixxedbit, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, 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, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, WTCWR68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml
index 3423e797ab..fe313d4a8e 100644
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,322 +1,1417 @@
-- Name: "Daniel Thompson"
-  Tier: Revolutionary
-- Name: "Farewell Fire"
+- Name: Luaan
   Tier: Syndicate Agent
-- Name: "CPM311"
+- Name: Nugmania
   Tier: Revolutionary
-- Name: "vifs_vestige"
+- Name: Xoxeyos
+  Tier: Free
+- Name: CobaltCobra
   Tier: Syndicate Agent
-- Name: "Anthony Fleck"
+- Name: Train
+  Tier: Free
+- Name: ExclusiveWizard
+  Tier: Syndicate Agent
+- Name: Matthew Umney
+  Tier: Free
+- Name: Hat Kid
+  Tier: Revolutionary
+- Name: Ingvar Tornberg
+  Tier: Revolutionary
+- Name: Joshua Hines
   Tier: Nuclear Operative
-- Name: "Nico Thate"
+- Name: Ashley Parfitt
   Tier: Revolutionary
-- Name: "Zandario"
+- Name: thehomelessmanbehindthedumpster
+  Tier: Free
+- Name: VmasterVX
+  Tier: Revolutionary
+- Name: JenericJen
   Tier: Nuclear Operative
-- Name: "Darren Brady"
+- Name: Cosu
   Tier: Revolutionary
-- Name: "DramaBuns"
-  Tier: Revolutionary
-- Name: "Ethan Keller"
-  Tier: Revolutionary
-- Name: "Eric VW"
-  Tier: Revolutionary
-- Name: "Joshington Awesomahee"
-  Tier: Revolutionary
-- Name: "Altana"
-  Tier: Revolutionary
-- Name: "clyf"
+- Name: AileenOnline
+  Tier: Free
+- Name: Grotty Bepis
   Tier: Nuclear Operative
-- Name: "Will M."
-  Tier: Revolutionary
-- Name: "The Hateful Flesh"
-  Tier: Revolutionary
-- Name: "Viridian"
-  Tier: Revolutionary
-- Name: "Nicholas Hillblom"
-  Tier: Revolutionary
-- Name: "Austin Nelson"
+- Name: Dizzy_Eevee
   Tier: Syndicate Agent
-- Name: "Cormos Lemming"
+- Name: Lizard
+  Tier: Free
+- Name: Michael Van Gaasbeck
+  Tier: Revolutionary
+- Name: Statix AraAra
+  Tier: Revolutionary
+- Name: WWII Kitsune
   Tier: Nuclear Operative
-- Name: "Hamcha"
+- Name: Bruno Bigras
   Tier: Revolutionary
-- Name: "Peter \"Azmond\" Newhouse"
-  Tier: Revolutionary
-- Name: "Zakanater 19"
-  Tier: Revolutionary
-- Name: "Kris Piper"
-  Tier: Revolutionary
-- Name: "Mikhail"
-  Tier: Revolutionary
-- Name: "Ramiro Agis"
-  Tier: Revolutionary
-- Name: "osborn"
-  Tier: Syndicate Agent
-- Name: "Uinseann"
-  Tier: Revolutionary
-- Name: "Brandon Campbell"
+- Name: TheLocalTryHard
+  Tier: Free
+- Name: Sufary
   Tier: Nuclear Operative
-- Name: "Jacob Schramm"
-  Tier: Revolutionary
-- Name: "Matouš Hrdlička"
+- Name: taydeo
   Tier: Nuclear Operative
-- Name: "Pasemi"
-  Tier: Revolutionary
-- Name: "Dan"
+- Name: dubdubchan
   Tier: Syndicate Agent
-- Name: "Scott MacCombie"
+- Name: tremors08
+  Tier: Syndicate Agent
+- Name: Jan Gocník
+  Tier: Free
+- Name: Tret Mekiao
+  Tier: Free
+- Name: Ben Joja Hotop
+  Tier: Free
+- Name: Sean Lenin
+  Tier: Free
+- Name: KiddoTBH
+  Tier: Free
+- Name: Kubakura
+  Tier: Syndicate Agent
+- Name: Bullet Kin
+  Tier: Free
+- Name: Abby Eveland
+  Tier: Revolutionary
+- Name: Zoe
+  Tier: Free
+- Name: ghost--page
   Tier: Nuclear Operative
-- Name: "Tamora Droppa"
+- Name: MechaKitty
   Tier: Revolutionary
-- Name: "Gavin Simmons"
-  Tier: Syndicate Agent
-- Name: "Saphire"
-  Tier: Revolutionary
-- Name: "Never Solus"
-  Tier: Syndicate Agent
-- Name: "Gnomo"
+- Name: BlueNexa
+  Tier: Free
+- Name: Noah Heaverin
+  Tier: Free
+- Name: jamozen
+  Tier: Free
+- Name: SireHambone
   Tier: Nuclear Operative
-- Name: "TheGoldElite"
+- Name: Blair Cyprus
+  Tier: Free
+- Name: Ryan Hanson
   Tier: Revolutionary
-- Name: "JhenMaster"
+- Name: Heinrick Archsider
+  Tier: Free
+- Name: Arsalan Sarwari
+  Tier: Free
+- Name: Scardy
+  Tier: Free
+- Name: Nagano
   Tier: Revolutionary
-- Name: "Akira"
+- Name: Aridia
+  Tier: Free
+- Name: illpala
   Tier: Revolutionary
-- Name: "Dave"
+- Name: kayo josé
+  Tier: Free
+- Name: Tymon Tymek
+  Tier: Free
+- Name: AlexDragoon
   Tier: Revolutionary
-- Name: "Александр Белошапка"
-  Tier: Revolutionary
-- Name: "tomhendo"
+- Name: Henrik Møller
   Tier: Syndicate Agent
-- Name: "Odin7heWanderer"
+- Name: Mythtic B
   Tier: Revolutionary
-- Name: "tokie"
+- Name: zedd
   Tier: Nuclear Operative
-- Name: "Enricoc3l"
+- Name: Penguin Commoner
   Tier: Revolutionary
-- Name: "DadNotTheBelt"
+- Name: Davyei
+  Tier: Free
+- Name: Akaelik
   Tier: Nuclear Operative
-- Name: "David"
+- Name: Kyle Tyo
   Tier: Revolutionary
-- Name: "Watson Whittington"
+- Name: Rhys Williams
+  Tier: Free
+- Name: Drakkenlupen
+  Tier: Revolutionary
+- Name: Randomposter
+  Tier: Free
+- Name: Justin White
+  Tier: Free
+- Name: Ty Ashley
+  Tier: Revolutionary
+- Name: Scorching Rae
+  Tier: Nuclear Operative
+- Name: Cindy Sampaga
+  Tier: Free
+- Name: Plague
+  Tier: Free
+- Name: dude
+  Tier: Free
+- Name: NIACO
+  Tier: Free
+- Name: Tee The Kobold
+  Tier: Revolutionary
+- Name: Redstones563
+  Tier: Free
+- Name: Celestrogen
   Tier: Syndicate Agent
-- Name: "Tim Foley"
+- Name: SotetSotetSotetSotetSotet
   Tier: Syndicate Agent
-- Name: "Katarn"
-  Tier: Revolutionary
-- Name: "eric156"
-  Tier: Revolutionary
-- Name: "Glenn Olsen"
+- Name: Guffin
+  Tier: Free
+- Name: Southbridge
+  Tier: Nuclear Operative
+- Name: ZazaRyn
   Tier: Syndicate Agent
-- Name: "Constellations"
+- Name: Magic Crystal Radio
+  Tier: Free
+- Name: Sam Sullins
+  Tier: Free
+- Name: Widoux 341
+  Tier: Free
+- Name: spookerton
   Tier: Syndicate Agent
-- Name: "Shaina Gibson"
+- Name: Tom Goodman (TauOmicronMu#2500)
   Tier: Revolutionary
-- Name: "Wolfie"
+- Name: Robbie Me
+  Tier: Free
+- Name: momochitters
+  Tier: Free
+- Name: Raspberry1111
   Tier: Revolutionary
-- Name: "Alexandre Courtin"
+- Name: flipways
+  Tier: Nuclear Operative
+- Name: Nictis
   Tier: Revolutionary
-- Name: "Geekyhobo2"
+- Name: crazybrain
+  Tier: Free
+- Name: peanut
+  Tier: Nuclear Operative
+- Name: Lewis McCalmont
+  Tier: Free
+- Name: T.P_Gaming
   Tier: Revolutionary
-- Name: "HCG"
+- Name: A Patreon of the Ahts
+  Tier: Free
+- Name: brbrbrbrbr brbrbr
   Tier: Revolutionary
-- Name: "ShaunTexas"
+- Name: Shadcake
+  Tier: Free
+- Name: kristopher arnott
   Tier: Syndicate Agent
-- Name: "Malachi Housewright"
+- Name: Reebe
+  Tier: Free
+- Name: blossom
   Tier: Revolutionary
-- Name: "Petalmeat"
+- Name: ml726
+  Tier: Free
+- Name: Logan Splett
+  Tier: Free
+- Name: Patrick Mitchell
+  Tier: Free
+- Name: Semiotics
+  Tier: Syndicate Agent
+- Name: Snowlili
   Tier: Revolutionary
-- Name: "Adam Smedstad"
+- Name: Hyeronimus Bosch
+  Tier: Free
+- Name: S1rFl0
   Tier: Revolutionary
-- Name: "DireBoar"
+- Name: Gavin
+  Tier: Free
+- Name: Faust Statler
+  Tier: Syndicate Agent
+- Name: the good king wompicus
+  Tier: Syndicate Agent
+- Name: DerBall
   Tier: Revolutionary
-- Name: "Ignoramis"
+- Name: Gallagin
+  Tier: Revolutionary
+- Name: Edward Doyle
+  Tier: Revolutionary
+- Name: Preston Pickering
+  Tier: Revolutionary
+- Name: Andrew Danke
+  Tier: Syndicate Agent
+- Name: Alexis
+  Tier: Nuclear Operative
+- Name: Saphinara
+  Tier: Free
+- Name: Random Person
+  Tier: Syndicate Agent
+- Name: mage_period
+  Tier: Syndicate Agent
+- Name: piras314
+  Tier: Free
+- Name: Mark Khudaev
+  Tier: Free
+- Name: Saver
+  Tier: Free
+- Name: Snilo Black
+  Tier: Free
+- Name: CptFalcon
+  Tier: Revolutionary
+- Name: Daxx (Justin Winningham)
+  Tier: Syndicate Agent
+- Name: Posters Union Australia (Shlee)
+  Tier: Free
+- Name: nathan
+  Tier: Free
+- Name: funnylookingwolf
+  Tier: Revolutionary
+- Name: Sporkyz
+  Tier: Revolutionary
+- Name: SarahRaven
+  Tier: Revolutionary
+- Name: Da Skolin
+  Tier: Free
+- Name: Joshua Meyer
+  Tier: Free
+- Name: BUMBLE
+  Tier: Free
+- Name: Lily Roche
+  Tier: Free
+- Name: Klive McToaster
+  Tier: Free
+- Name: CasuallyAPerson
+  Tier: Free
+- Name: Powder
+  Tier: Revolutionary
+- Name: Noah Heaverin
+  Tier: Free
+- Name: Violette
+  Tier: Revolutionary
+- Name: Amble
+  Tier: Nuclear Operative
+- Name: James Sanders
+  Tier: Free
+- Name: Susaniel
+  Tier: Free
+- Name: Eve Holly
+  Tier: Free
+- Name: Superscope
+  Tier: Free
+- Name: Nyxilath
+  Tier: Nuclear Operative
+- Name: RedChair368
+  Tier: Revolutionary
+- Name: Blumbee
+  Tier: Revolutionary
+- Name: Mason Fawcett
+  Tier: Revolutionary
+- Name: Cerzix
+  Tier: Revolutionary
+- Name: Aeris Ophelia
+  Tier: Free
+- Name: Troll_King_907
+  Tier: Nuclear Operative
+- Name: Certified Hood Classic
+  Tier: Free
+- Name: Hydraliks
+  Tier: Free
+- Name: Meguneri
+  Tier: Free
+- Name: hyphenation
+  Tier: Nuclear Operative
+- Name: Psy
+  Tier: Revolutionary
+- Name: Pinet
+  Tier: Nuclear Operative
+- Name: Vivi Bunny
+  Tier: Free
+- Name: James Stevens
+  Tier: Revolutionary
+- Name: anharmlessguest
+  Tier: Syndicate Agent
+- Name: Outlier
+  Tier: Free
+- Name: Brandon Hackney
+  Tier: Free
+- Name: eleanor nora
+  Tier: Free
+- Name: starch
+  Tier: Syndicate Agent
+- Name: Jacob Watson
+  Tier: Syndicate Agent
+- Name: Seinfeld
+  Tier: Revolutionary
+- Name: Prime!
+  Tier: Free
+- Name: John
+  Tier: Free
+- Name: FauxParadox
+  Tier: Revolutionary
+- Name: Mr_Clank
+  Tier: Revolutionary
+- Name: rafael rabelo
+  Tier: Free
+- Name: TBF_Jack
+  Tier: Free
+- Name: StaceyBalcom
+  Tier: Revolutionary
+- Name: guh
+  Tier: Revolutionary
+- Name: Fran Picek
+  Tier: Free
+- Name: Austenn
+  Tier: Revolutionary
+- Name: Flayn
+  Tier: Free
+- Name: Nye
+  Tier: Free
+- Name: Phycoweirdo
+  Tier: Nuclear Operative
+- Name: Madeleine LeFleur
+  Tier: Syndicate Agent
+- Name: Anton
+  Tier: Revolutionary
+- Name: That Furry Fuck
+  Tier: Free
+- Name: sat
+  Tier: Free
+- Name: goober
+  Tier: Free
+- Name: Boogerfoot
+  Tier: Nuclear Operative
+- Name: Raiden Johnson
+  Tier: Revolutionary
+- Name: Talbot
+  Tier: Revolutionary
+- Name: Alen Kadric
+  Tier: Free
+- Name: pogcat
+  Tier: Free
+- Name: Dave
+  Tier: Free
+- Name: Nathaniel Taylor
+  Tier: Revolutionary
+- Name: Z4NEER
+  Tier: Nuclear Operative
+- Name: Laying on my penis until it falls asleep, so it feels like I'm giving someone else a hando
+  Tier: Revolutionary
+- Name: Sam Caesar
+  Tier: Revolutionary
+- Name: Lykan
+  Tier: Free
+- Name: tarna41
+  Tier: Free
+- Name: Ryan Johnson
+  Tier: Free
+- Name: Andrew Montagne
+  Tier: Syndicate Agent
+- Name: yakub mobutu
+  Tier: Free
+- Name: Michael Krebs
+  Tier: Free
+- Name: mr funny swag
+  Tier: Free
+- Name: Crazyeyes24
+  Tier: Syndicate Agent
+- Name: Zylo
+  Tier: Free
+- Name: ScarKy0
+  Tier: Revolutionary
+- Name: Randall Hudson
+  Tier: Free
+- Name: FaberTheCatboy
+  Tier: Free
+- Name: IamOzyman
+  Tier: Revolutionary
+- Name: Jado0213
+  Tier: Revolutionary
+- Name: StaticeStorm
+  Tier: Syndicate Agent
+- Name: Baron Mathot
+  Tier: Free
+- Name: CrudeOil
+  Tier: Nuclear Operative
+- Name: Sartec
+  Tier: Revolutionary
+- Name: Mathew McGuire
+  Tier: Revolutionary
+- Name: Jelloterd2
+  Tier: Free
+- Name: Commissar Fox
+  Tier: Syndicate Agent
+- Name: tyler adams
+  Tier: Revolutionary
+- Name: Logan Britt
+  Tier: Free
+- Name: Joshua A.
+  Tier: Free
+- Name: ya boi darth Vader
+  Tier: Free
+- Name: Syndlkat
+  Tier: Free
+- Name: Zyleak
+  Tier: Revolutionary
+- Name: Hunter
+  Tier: Free
+- Name: Killerqu00
+  Tier: Free
+- Name: lzk
+  Tier: Free
+- Name: Cai Williamson
+  Tier: Syndicate Agent
+- Name: Arykh
+  Tier: Nuclear Operative
+- Name: Pallastovid
+  Tier: Free
+- Name: Rome
+  Tier: Revolutionary
+- Name: mawrk
+  Tier: Free
+- Name: Jack
+  Tier: Revolutionary
+- Name: stikfigz
+  Tier: Revolutionary
+- Name: RyanTuek
+  Tier: Revolutionary
+- Name: David N
+  Tier: Syndicate Agent
+- Name: Panzer IV
+  Tier: Free
+- Name: Novaq
+  Tier: Revolutionary
+- Name: Trevor Doyle
+  Tier: Free
+- Name: Borna Punda
+  Tier: Revolutionary
+- Name: Patrick Long
+  Tier: Free
+- Name: Alpha
+  Tier: Nuclear Operative
+- Name: Gaëtan GOUSSEAUD
+  Tier: Revolutionary
+- Name: Hayden Wessing
+  Tier: Revolutionary
+- Name: Noodle is me
+  Tier: Syndicate Agent
+- Name: snakebb
+  Tier: Revolutionary
+- Name: Patrick
+  Tier: Revolutionary
+- Name: Väinö Kontinen
+  Tier: Free
+- Name: Devin Nelson
+  Tier: Revolutionary
+- Name: Rat Man
+  Tier: Revolutionary
+- Name: Christopher Day
+  Tier: Free
+- Name: Wilhelm 17
+  Tier: Free
+- Name: Kieue Caprie
+  Tier: Revolutionary
+- Name: RamenZorn
+  Tier: Syndicate Agent
+- Name: Swix Swix
+  Tier: Revolutionary
+- Name: Katharina
+  Tier: Free
+- Name: Blackmare
+  Tier: Syndicate Agent
+- Name: lukiw
+  Tier: Revolutionary
+- Name: Magelfik
+  Tier: Revolutionary
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: Tomáš Sitarčík
+  Tier: Syndicate Agent
+- Name: Coolsurf6
+  Tier: Revolutionary
+- Name: Neexdle
+  Tier: Free
+- Name: Lucid
+  Tier: Free
+- Name: MissKay1994
+  Tier: Syndicate Agent
+- Name: Raccoononi
+  Tier: Revolutionary
+- Name: Avocado999
+  Tier: Free
+- Name: Invisorum
+  Tier: Nuclear Operative
+- Name: Hannah
+  Tier: Nuclear Operative
+- Name: Thomas
+  Tier: Revolutionary
+- Name: Cozmicc
+  Tier: Free
+- Name: Unalterableness Happiness
+  Tier: Free
+- Name: Sparlight
+  Tier: Nuclear Operative
+- Name: MAILS ADVISORY
+  Tier: Free
+- Name: Rq52
+  Tier: Free
+- Name: Ben Wahba
+  Tier: Free
+- Name: North
+  Tier: Free
+- Name: Tyran
+  Tier: Free
+- Name: TheSimpleTime
+  Tier: Free
+- Name: Minemoder
+  Tier: Syndicate Agent
+- Name: Richard "Rei" Weeks
+  Tier: Syndicate Agent
+- Name: Sika-Voi
+  Tier: Free
+- Name: Dumbdestroyer2
+  Tier: Free
+- Name: Ferox Heist
+  Tier: Free
+- Name: Ryan Vieira
+  Tier: Free
+- Name: kithri
+  Tier: Nuclear Operative
+- Name: Luzurper
+  Tier: Revolutionary
+- Name: Rainy
+  Tier: Revolutionary
+- Name: Dusk
+  Tier: Revolutionary
+- Name: Apocist
+  Tier: Revolutionary
+- Name: Yukari_TK
+  Tier: Free
+- Name: Iris
+  Tier: Free
+- Name: Jamie Forkner
+  Tier: Free
+- Name: rokudara
+  Tier: Free
+- Name: Xionwalker
+  Tier: Free
+- Name: Michael Schrader
+  Tier: Free
+- Name: JT Billings
+  Tier: Revolutionary
+- Name: Stedar
+  Tier: Syndicate Agent
+- Name: Alex Burd
+  Tier: Nuclear Operative
+- Name: Vasilis The Pikachu
+  Tier: Free
+- Name: Erik Meinke
+  Tier: Revolutionary
+- Name: Sleeepz
+  Tier: Syndicate Agent
+- Name: Jonathan
+  Tier: Free
+- Name: Trent Warfel
+  Tier: Nuclear Operative
+- Name: Fritz Vohlkson
+  Tier: Free
+- Name: Гоша Ушаров
+  Tier: Free
+- Name: Cpt Blastahoe
+  Tier: Free
+- Name: dedomena
+  Tier: Free
+- Name: Nolan Downing
+  Tier: Free
+- Name: Seth Morron
+  Tier: Revolutionary
+- Name: Fumo Legionnaire
+  Tier: Free
+- Name: obama
+  Tier: Free
+- Name: Daniel Megiddo
+  Tier: Free
+- Name: Денис
+  Tier: Free
+- Name: Ubaser
+  Tier: Revolutionary
+- Name: Catdere
+  Tier: Syndicate Agent
+- Name: valery xolstov
+  Tier: Free
+- Name: Marios Sardis
+  Tier: Revolutionary
+- Name: Constrife
+  Tier: Free
+- Name: TINYANGRYWOMAN
+  Tier: Free
+- Name: Kerensky
+  Tier: Revolutionary
+- Name: DEATHB4DEFEAT
+  Tier: Free
+- Name: Kristy Denniss
+  Tier: Free
+- Name: orange color
+  Tier: Revolutionary
+- Name: Hectik
+  Tier: Free
+- Name: SomeDogo
+  Tier: Free
+- Name: Joshua Meyer
+  Tier: Nuclear Operative
+- Name: Matthias Bechtold
+  Tier: Revolutionary
+- Name: Serafim
+  Tier: Free
+- Name: Cindy Xiao
+  Tier: Free
+- Name: SmokingKilz
+  Tier: Free
+- Name: Jacob Scott
+  Tier: Free
+- Name: Ryan Kelly
+  Tier: Revolutionary
+- Name: mikiju
+  Tier: Syndicate Agent
+- Name: TheGungeonologist
+  Tier: Revolutionary
+- Name: Tia
+  Tier: Revolutionary
+- Name: yeoshua
+  Tier: Syndicate Agent
+- Name: David Ilina
+  Tier: Free
+- Name: Robyn Pothagan
+  Tier: Free
+- Name: chomp
+  Tier: Free
+- Name: Maksym Aleinikov
+  Tier: Free
+- Name: Chase M.
+  Tier: Free
+- Name: Ethan Maria
+  Tier: Free
+- Name: Luna Rose
+  Tier: Free
+- Name: Jordon
+  Tier: Revolutionary
+- Name: Godfiend
+  Tier: Revolutionary
+- Name: Jake Huxell
+  Tier: Free
+- Name: Alexander Simakov
+  Tier: Free
+- Name: Hannah Dawson
+  Tier: Syndicate Agent
+- Name: Dieselmohawk D.
+  Tier: Revolutionary
+- Name: Sean Lilly
+  Tier: Syndicate Agent
+- Name: Brandon Roughley
+  Tier: Syndicate Agent
+- Name: Jack
+  Tier: Free
+- Name: Cooliano Rizzo
+  Tier: Free
+- Name: North Star
+  Tier: Free
+- Name: Flamebrain
+  Tier: Free
+- Name: Andrew
+  Tier: Revolutionary
+- Name: Ostoja
+  Tier: Free
+- Name: Russian TS
+  Tier: Nuclear Operative
+- Name: Kyu, The Meme Fairy
+  Tier: Free
+- Name: LIMIT_bro .
+  Tier: Free
+- Name: Kim
+  Tier: Revolutionary
+- Name: Dourbii
+  Tier: Revolutionary
+- Name: Autistic Dog
+  Tier: Free
+- Name: Black Rose
+  Tier: Free
+- Name: rose soul
+  Tier: Free
+- Name: Toast
+  Tier: Free
+- Name: Jiangshi Luvr
+  Tier: Free
+- Name: OllyTheFoxcoon
+  Tier: Free
+- Name: Christopher Peltola
+  Tier: Revolutionary
+- Name: Bonefan223
+  Tier: Nuclear Operative
+- Name: Fie
+  Tier: Free
+- Name: DuskyJay
+  Tier: Free
+- Name: Zella Zane
+  Tier: Revolutionary
+- Name: Pixel Realms
+  Tier: Free
+- Name: ConcaveGnome
+  Tier: Syndicate Agent
+- Name: Ростислав Мірошніченко
+  Tier: Free
+- Name: Hunter Tew
+  Tier: Syndicate Agent
+- Name: Daniel D
+  Tier: Syndicate Agent
+- Name: Kick Buttowski
+  Tier: Free
+- Name: Eggexe
+  Tier: Free
+- Name: Lv
+  Tier: Free
+- Name: Ali Alashar
+  Tier: Free
+- Name: Nathaniel Joseph Hurd
+  Tier: Revolutionary
+- Name: sk3iron
+  Tier: Revolutionary
+- Name: Dax XZ
+  Tier: Free
+- Name: debelizm
+  Tier: Free
+- Name: Kaisering
+  Tier: Revolutionary
+- Name: VividWisp
+  Tier: Syndicate Agent
+- Name: Alex Mercer
+  Tier: Free
+- Name: AmalgoMyte
+  Tier: Revolutionary
+- Name: SeanKim
+  Tier: Free
+- Name: Siegorvus
+  Tier: Free
+- Name: вася васильев
+  Tier: Free
+- Name: Mci
+  Tier: Revolutionary
+- Name: KateSlime206
+  Tier: Nuclear Operative
+- Name: Robert
+  Tier: Free
+- Name: Ben Z'
+  Tier: Revolutionary
+- Name: Luke
+  Tier: Free
+- Name: Tyler Putnam
+  Tier: Free
+- Name: Ville Sarmiola
+  Tier: Free
+- Name: kelaclone
+  Tier: Free
+- Name: Archmonarch
+  Tier: Syndicate Agent
+- Name: Brett
+  Tier: Free
+- Name: Hanzdegloker
+  Tier: Syndicate Agent
+- Name: Piotr
+  Tier: Revolutionary
+- Name: CloudyClover
+  Tier: Revolutionary
+- Name: Jim Masterson
+  Tier: Free
+- Name: kenneth heller
+  Tier: Syndicate Agent
+- Name: Gosera -
+  Tier: Syndicate Agent
+- Name: Asaf Ataş
+  Tier: Free
+- Name: DeckDevilYGO
+  Tier: Free
+- Name: nokko
+  Tier: Free
+- Name: Krokodiel89
+  Tier: Free
+- Name: Nojan Niaki
+  Tier: Revolutionary
+- Name: YuNii
+  Tier: Nuclear Operative
+- Name: Georgia Partyka
+  Tier: Syndicate Agent
+- Name: Teeth
+  Tier: Free
+- Name: DrMelon
+  Tier: Revolutionary
+- Name: Molly the Bully
+  Tier: Nuclear Operative
+- Name: An Evil Eel
+  Tier: Free
+- Name: Hasan al-Binabi
+  Tier: Free
+- Name: franz photos
+  Tier: Free
+- Name: Milkshake45752
+  Tier: Free
+- Name: Bru Tal
+  Tier: Free
+- Name: krberryy
+  Tier: Revolutionary
+- Name: Thomas Mcintosh
+  Tier: Free
+- Name: Alex Nordlund
+  Tier: Syndicate Agent
+- Name: Swindel_
+  Tier: Syndicate Agent
+- Name: MrGloopy
+  Tier: Revolutionary
+- Name: blitz gaming
+  Tier: Free
+- Name: Nicholi
+  Tier: Syndicate Agent
+- Name: Taber
+  Tier: Revolutionary
+- Name: 以迪 黃
+  Tier: Free
+- Name: W Geertsma
+  Tier: Free
+- Name: BloodyJMary
+  Tier: Free
+- Name: quri1q
+  Tier: Free
+- Name: SleepyBody91
+  Tier: Free
+- Name: David Gee
+  Tier: Free
+- Name: ThoranTW
+  Tier: Free
+- Name: pigeopeas
+  Tier: Free
+- Name: Zakory L Holbrook
+  Tier: Revolutionary
+- Name: Aiden
+  Tier: Revolutionary
+- Name: Pangaron
+  Tier: Syndicate Agent
+- Name: NeatVisor
+  Tier: Free
+- Name: Solidus Snake
+  Tier: Nuclear Operative
+- Name: Oliver Skyler
+  Tier: Free
+- Name: mustafa kılıç
+  Tier: Free
+- Name: IceStorm theDragon
+  Tier: Revolutionary
+- Name: Indri
+  Tier: Revolutionary
+- Name: Graded
+  Tier: Free
+- Name: tunnp0
+  Tier: Free
+- Name: Vexxtraordinary
+  Tier: Revolutionary
+- Name: Sam Hediger
+  Tier: Free
+- Name: Aldi Abduali
+  Tier: Free
+- Name: Adam Clarke
+  Tier: Free
+- Name: Munt
+  Tier: Free
+- Name: Obspogon
+  Tier: Free
+- Name: Adrian Thompson
+  Tier: Free
+- Name: albatrossMonarch
+  Tier: Free
+- Name: JaQal
+  Tier: Free
+- Name: Simofie
+  Tier: Free
+- Name: redgunny
+  Tier: Free
+- Name: Kevin Chapman
+  Tier: Free
+- Name: Sjevi Aardvark
+  Tier: Free
+- Name: Chris Walter
+  Tier: Free
+- Name: David Sterling
+  Tier: Free
+- Name: Zcore
+  Tier: Free
+- Name: tapohuy
+  Tier: Free
+- Name: MasterFurret
+  Tier: Revolutionary
+- Name: Christian Hicks
+  Tier: Syndicate Agent
+- Name: François Desautels
+  Tier: Revolutionary
+- Name: awndrssk
+  Tier: Free
+- Name: Vice Emargo
+  Tier: Syndicate Agent
+- Name: Mihailo Trickovic
+  Tier: Syndicate Agent
+- Name: Sandvich enjoyer
+  Tier: Revolutionary
+- Name: Higgtastic
   Tier: Revolutionary
 - Name: "612"
   Tier: Revolutionary
-- Name: "Higgtastic"
+- Name: AlecRazec
   Tier: Revolutionary
-- Name: "Sandvich enjoyer"
-  Tier: Revolutionary
-- Name: "Mihailo Trickovic"
-  Tier: Syndicate Agent
-- Name: "Vice Emargo"
-  Tier: Revolutionary
-- Name: "François Desautels"
-  Tier: Revolutionary
-- Name: "MasterFurret"
-  Tier: Revolutionary
-- Name: "Sam Hediger"
-  Tier: Syndicate Agent
-- Name: "Vexxtraordinary"
-  Tier: Revolutionary
-- Name: "Graded"
-  Tier: Syndicate Agent
-- Name: "Indri"
-  Tier: Revolutionary
-- Name: "Solidus Snake"
+- Name: Repo
   Tier: Nuclear Operative
-- Name: "Pangaron"
+- Name: Ignoramis
+  Tier: Free
+- Name: Jeffery Pointer
   Tier: Syndicate Agent
-- Name: "Sed"
+- Name: DireBoar
+  Tier: Free
+- Name: oBerry
+  Tier: Free
+- Name: Adam Smedstad
+  Tier: Free
+- Name: Superglue
+  Tier: Syndicate Agent
+- Name: DrIvoPotato
   Tier: Nuclear Operative
-- Name: "Aiden Baker"
+- Name: Petalmeat
+  Tier: Free
+- Name: Malachi Housewright
   Tier: Revolutionary
-- Name: "Beans"
-  Tier: Revolutionary
-- Name: "ThoranTW"
-  Tier: Revolutionary
-- Name: "Crabby Arts"
-  Tier: Revolutionary
-- Name: "以迪 黃"
-  Tier: Syndicate Agent
-- Name: "Taber"
-  Tier: Revolutionary
-- Name: "Nicholi"
-  Tier: Syndicate Agent
-- Name: "blitz gaming"
-  Tier: Revolutionary
-- Name: "MrGloopy"
-  Tier: Revolutionary
-- Name: "Swindel_"
-  Tier: Syndicate Agent
-- Name: "Alex Nordlund"
-  Tier: Revolutionary
-- Name: "Thomas Mcintosh"
-  Tier: Revolutionary
-- Name: "krberryy"
-  Tier: Revolutionary
-- Name: "Hasan al-Binabi"
+- Name: Fallcon
+  Tier: Free
+- Name: ShaunTexas
+  Tier: Free
+- Name: HCG
+  Tier: Free
+- Name: GeneralMarty
+  Tier: Free
+- Name: Nicholas
   Tier: Nuclear Operative
-- Name: "Molly the Bully"
+- Name: Geekyhobo2
+  Tier: Revolutionary
+- Name: Alexandre Courtin
+  Tier: Revolutionary
+- Name: Wolfie
+  Tier: Revolutionary
+- Name: Shaina Gibson
+  Tier: Free
+- Name: Charles Baron
+  Tier: Free
+- Name: Constellations
+  Tier: Free
+- Name: tynobeard 123
+  Tier: Revolutionary
+- Name: Lyndomen
+  Tier: Revolutionary
+- Name: Glenn Olsen
+  Tier: Syndicate Agent
+- Name: Wiliam
   Tier: Nuclear Operative
-- Name: "DrMelon"
-  Tier: Revolutionary
-- Name: "Georgia Partyka"
-  Tier: Syndicate Agent
-- Name: "Nojan Niaki"
-  Tier: Revolutionary
-- Name: "nokko"
-  Tier: Revolutionary
-- Name: "DeckDevilYGO"
-  Tier: Syndicate Agent
-- Name: "Gosera -"
-  Tier: Syndicate Agent
-- Name: "kenneth heller"
-  Tier: Syndicate Agent
-- Name: "Piotr"
+- Name: SHANE ALAN ZINDA
+  Tier: Free
+- Name: Saiiryn
+  Tier: Free
+- Name: AC Computing
   Tier: Nuclear Operative
-- Name: "Hanzdegloker"
+- Name: eric156
+  Tier: Free
+- Name: Katarn
+  Tier: Free
+- Name: Blight
   Tier: Syndicate Agent
-- Name: "Archmonarch"
+- Name: Tim Foley
+  Tier: Free
+- Name: Sven Tammerijn
+  Tier: Revolutionary
+- Name: Raw Toast
+  Tier: Free
+- Name: Watson Whittington
   Tier: Syndicate Agent
-- Name: "Ville Sarmiola"
+- Name: David
+  Tier: Revolutionary
+- Name: DadNotTheBelt
+  Tier: Free
+- Name: Enricoc3l
+  Tier: Revolutionary
+- Name: Vandell
+  Tier: Free
+- Name: BlueisDumb
   Tier: Nuclear Operative
-- Name: "Tyler Putnam"
-  Tier: Revolutionary
-- Name: "Luke"
-  Tier: Revolutionary
-- Name: "Robert"
+- Name: Buldinn Girshovich
   Tier: Nuclear Operative
-- Name: "Zombine"
+- Name: Whistling Jake
+  Tier: Revolutionary
+- Name: Wallace Megas
+  Tier: Free
+- Name: Samtaro
   Tier: Nuclear Operative
-- Name: "Mci"
+- Name: Aexxie
   Tier: Revolutionary
-- Name: "The Silent Occupant"
+- Name: Fiebertraum Illhead
   Tier: Syndicate Agent
-- Name: "AmalgoMyte"
-  Tier: Syndicate Agent
-- Name: "VividWisp"
-  Tier: Syndicate Agent
-- Name: "Kaisering"
-  Tier: Revolutionary
-- Name: "Dax XZ"
-  Tier: Syndicate Agent
-- Name: "sk3iron"
-  Tier: Revolutionary
-- Name: "Nathaniel Joseph Hurd"
-  Tier: Revolutionary
-- Name: "Ali Alashar"
-  Tier: Syndicate Agent
-- Name: "Lv"
-  Tier: Revolutionary
-- Name: "Eggexe"
-  Tier: Revolutionary
-- Name: "Kick Buttowski"
-  Tier: Syndicate Agent
-- Name: "Daniel D"
-  Tier: Syndicate Agent
-- Name: "Hunter Tew"
-  Tier: Syndicate Agent
-- Name: "ConcaveGnome"
-  Tier: Syndicate Agent
-- Name: "Pixel Realms"
+- Name: tokie
   Tier: Nuclear Operative
-- Name: "Zella Zane"
-  Tier: Revolutionary
-- Name: "DuskyJay"
-  Tier: Revolutionary
-- Name: "HogWithGreatArmpitHair"
-  Tier: Revolutionary
-- Name: "Bonefan223"
+- Name: Odin7heWanderer
+  Tier: Free
+- Name: Jeff Tatem
   Tier: Nuclear Operative
-- Name: "Christopher Peltola"
-  Tier: Nuclear Operative
-- Name: "OllyTheFoxcoon"
-  Tier: Revolutionary
-- Name: "Cherchar"
-  Tier: Revolutionary
-- Name: "Black Rose"
-  Tier: Revolutionary
-- Name: "Kim"
-  Tier: Nuclear Operative
-- Name: "Kyu, The Meme Fairy"
+- Name: M4shr00m
+  Tier: Free
+- Name: Gordod
   Tier: Syndicate Agent
-- Name: "Russian TS"
-  Tier: Nuclear Operative
-- Name: "Andrew"
-  Tier: Revolutionary
-- Name: "Cooliano Rizzo"
-  Tier: Nuclear Operative
-- Name: "Brandon Roughley"
+- Name: Skarlet
+  Tier: Free
+- Name: March
   Tier: Syndicate Agent
-- Name: "Sean Lilly"
-  Tier: Syndicate Agent
-- Name: "Dieselmohawk D."
+- Name: Александр Белошапка
   Tier: Revolutionary
-- Name: "Hannah Dawson"
-  Tier: Syndicate Agent
-- Name: "Jake Huxell"
-  Tier: Syndicate Agent
-- Name: "Godfiend"
+- Name: Dave
   Tier: Revolutionary
-- Name: "Jordon"
+- Name: Akira
   Tier: Revolutionary
-- Name: "Luna Rose"
-  Tier: Revolutionary
-- Name: "Ethan Maria"
-  Tier: Revolutionary
-- Name: "Robyn Pothagan"
-  Tier: Revolutionary
-- Name: "TheGungeonologist"
-  Tier: Revolutionary
-- Name: "Ryan Kelly"
-  Tier: Revolutionary
-- Name: "Jacob Scott"
-  Tier: Revolutionary
-- Name: "Matthias Bechtold"
-  Tier: Revolutionary
-- Name: "Joshua Meyer"
+- Name: Alix Shepard
   Tier: Nuclear Operative
-- Name: "Roxy Rirumi"
+- Name: JhenMaster
+  Tier: Free
+- Name: Lieutenant Colonel Orangejuice
+  Tier: Syndicate Agent
+- Name: TheGoldElite
   Tier: Revolutionary
-- Name: "Zero To template"
+- Name: Gnomo
   Tier: Nuclear Operative
-- Name: "Hectik"
+- Name: Never Solus
+  Tier: Free
+- Name: Ari.
   Tier: Revolutionary
-- Name: "orange color"
-  Tier: Revolutionary
-- Name: "Kristy Denniss"
+- Name: Kevin
   Tier: Nuclear Operative
-- Name: "Kerensky"
+- Name: DubzyVEVO
   Tier: Revolutionary
+- Name: ikamuse johnson
+  Tier: Revolutionary
+- Name: Saphire
+  Tier: Revolutionary
+- Name: Gavin Simmons
+  Tier: Syndicate Agent
+- Name: Tamora Droppa
+  Tier: Revolutionary
+- Name: Gaxeer
+  Tier: Syndicate Agent
+- Name: rosysyn
+  Tier: Revolutionary
+- Name: Scott MacCombie
+  Tier: Free
+- Name: Jeremy Hernandez
+  Tier: Syndicate Agent
+- Name: Kai
+  Tier: Nuclear Operative
+- Name: Victoly
+  Tier: Free
+- Name: chilicheesecat
+  Tier: Free
+- Name: Arthur Norris
+  Tier: Syndicate Agent
+- Name: Carbonhell
+  Tier: Syndicate Agent
+- Name: BrittaBee93
+  Tier: Free
+- Name: Rasmus Cedergren
+  Tier: Revolutionary
+- Name: Greggo
+  Tier: Syndicate Agent
+- Name: Pasemi
+  Tier: Revolutionary
+- Name: Unknown Kiwi
+  Tier: Revolutionary
+- Name: Mitchell Marry
+  Tier: Revolutionary
+- Name: Matouš Hrdlička
+  Tier: Revolutionary
+- Name: Roman
+  Tier: Syndicate Agent
+- Name: Jacob Schramm
+  Tier: Free
+- Name: Nathan Zaldivar
+  Tier: Nuclear Operative
+- Name: SpydAxe
+  Tier: Revolutionary
+- Name: BokChoy
+  Tier: Nuclear Operative
+- Name: Nicholas Williamson
+  Tier: Nuclear Operative
+- Name: William Grondin
+  Tier: Revolutionary
+- Name: KevKev
+  Tier: Free
+- Name: Gothryd
+  Tier: Revolutionary
+- Name: Brandon Campbell
+  Tier: Free
+- Name: Matthew C Miklaucic
+  Tier: Revolutionary
+- Name: Serianas
+  Tier: Nuclear Operative
+- Name: lapatison
+  Tier: Revolutionary
+- Name: Uinseann
+  Tier: Revolutionary
+- Name: osborn
+  Tier: Syndicate Agent
+- Name: LPGaming
+  Tier: Free
+- Name: Alex Fry
+  Tier: Nuclear Operative
+- Name: Ramiro Agis
+  Tier: Revolutionary
+- Name: Mikhail
+  Tier: Revolutionary
+- Name: SnapKick
+  Tier: Revolutionary
+- Name: liltenhead
+  Tier: Revolutionary
+- Name: James Andrew Peoples Jr
+  Tier: Revolutionary
+- Name: Serathis
+  Tier: Revolutionary
+- Name: Joel
+  Tier: Revolutionary
+- Name: Rafał Kowalewski
+  Tier: Revolutionary
+- Name: Kris Piper
+  Tier: Free
+- Name: Anthony Chicko
+  Tier: Revolutionary
+- Name: Taylor
+  Tier: Revolutionary
+- Name: Phillip Inman
+  Tier: Revolutionary
+- Name: Zakanater 19
+  Tier: Revolutionary
+- Name: Molon
+  Tier: Syndicate Agent
+- Name: Peter "Azmond" Newhouse
+  Tier: Free
+- Name: Snowni
+  Tier: Nuclear Operative
+- Name: Tom Cruize
+  Tier: Syndicate Agent
+- Name: Corpus Inc.
+  Tier: Revolutionary
+- Name: BlastWind
+  Tier: Free
+- Name: Echinodermata
+  Tier: Revolutionary
+- Name: Hamcha
+  Tier: Revolutionary
+- Name: Kaitlynn Brennan
+  Tier: Syndicate Agent
+- Name: Oxyclean114
+  Tier: Revolutionary
+- Name: JustanAnus
+  Tier: Nuclear Operative
+- Name: wtcwr68
+  Tier: Nuclear Operative
+- Name: Azmith Blackheart
+  Tier: Revolutionary
+- Name: Collin R Terrell
+  Tier: Revolutionary
+- Name: Cormos Lemming
+  Tier: Nuclear Operative
+- Name: grhmhome
+  Tier: Revolutionary
+- Name: SpiffyNnemonic
+  Tier: Revolutionary
+- Name: Callum Tubrett
+  Tier: Nuclear Operative
+- Name: Hydration
+  Tier: Revolutionary
+- Name: Morty
+  Tier: Free
+- Name: Dylan Roberts
+  Tier: Syndicate Agent
+- Name: mrniceguy0o0
+  Tier: Free
+- Name: Wrexbe
+  Tier: Revolutionary
+- Name: Frege Beach
+  Tier: Revolutionary
+- Name: DBF
+  Tier: Syndicate Agent
+- Name: Kesiath
+  Tier: Nuclear Operative
+- Name: Voltinho
+  Tier: Revolutionary
+- Name: AquaDraco
+  Tier: Revolutionary
+- Name: A Yaj
+  Tier: Revolutionary
+- Name: Miniwoffer
+  Tier: Revolutionary
+- Name: hh
+  Tier: Syndicate Agent
+- Name: Chase Trotter
+  Tier: Nuclear Operative
+- Name: Skifan180
+  Tier: Free
+- Name: Florian
+  Tier: Revolutionary
+- Name: Hoplophobia
+  Tier: Revolutionary
+- Name: Viridian
+  Tier: Free
+- Name: Daskata
+  Tier: Nuclear Operative
+- Name: TacoCub
+  Tier: Revolutionary
+- Name: Jack Rose
+  Tier: Revolutionary
+- Name: Chem_Inventory
+  Tier: Nuclear Operative
+- Name: Jax
+  Tier: Nuclear Operative
+- Name: The Hateful Flesh
+  Tier: Revolutionary
+- Name: Gavin Jones
+  Tier: Nuclear Operative
+- Name: Prof. Omii
+  Tier: Nuclear Operative
+- Name: mksky
+  Tier: Revolutionary
+- Name: Greyhound Connect
+  Tier: Revolutionary
+- Name: Alex Tempest
+  Tier: Revolutionary
+- Name: Rat Fungus
+  Tier: Nuclear Operative
+- Name: Will M.
+  Tier: Revolutionary
+- Name: spinnermaster
+  Tier: Free
+- Name: Koyki
+  Tier: Revolutionary
+- Name: Hunter James
+  Tier: Nuclear Operative
+- Name: Valinov
+  Tier: Nuclear Operative
+- Name: Nemmay
+  Tier: Revolutionary
+- Name: Dylan Hull
+  Tier: Revolutionary
+- Name: FungiFog
+  Tier: Revolutionary
+- Name: S.C.
+  Tier: Syndicate Agent
+- Name: "'-Y-"
+  Tier: Syndicate Agent
+- Name: pooba
+  Tier: Revolutionary
+- Name: evilJenny
+  Tier: Revolutionary
+- Name: clyf
+  Tier: Free
+- Name: Kerb
+  Tier: Revolutionary
+- Name: queednyeb
+  Tier: Revolutionary
+- Name: Robin Rottstock
+  Tier: Revolutionary
+- Name: Third
+  Tier: Revolutionary
+- Name: Altana
+  Tier: Revolutionary
+- Name: showgun117
+  Tier: Syndicate Agent
+- Name: Durp
+  Tier: Revolutionary
+- Name: Joshington Awesomahee
+  Tier: Revolutionary
+- Name: Diklyquill
+  Tier: Revolutionary
+- Name: Eric VW
+  Tier: Revolutionary
+- Name: Nat
+  Tier: Revolutionary
+- Name: Evan Armstrong
+  Tier: Revolutionary
+- Name: Citizen Battle
+  Tier: Nuclear Operative
+- Name: Cyberate
+  Tier: Revolutionary
+- Name: Enzoman12
+  Tier: Nuclear Operative
+- Name: Curtis Pearson
+  Tier: Revolutionary
+- Name: Mono
+  Tier: Revolutionary
+- Name: Xenon Dragon
+  Tier: Syndicate Agent
+- Name: Jerg Jerginson
+  Tier: Nuclear Operative
+- Name: kik
+  Tier: Revolutionary
+- Name: Star Lord
+  Tier: Syndicate Agent
+- Name: kannthus
+  Tier: Syndicate Agent
+- Name: Ethan Keller
+  Tier: Revolutionary
+- Name: John Doe
+  Tier: Nuclear Operative
+- Name: Robert Reed
+  Tier: Nuclear Operative
+- Name: DramaBuns
+  Tier: Revolutionary
+- Name: Bush Boy
+  Tier: Nuclear Operative
+- Name: Quonn
+  Tier: Syndicate Agent
+- Name: KrystalDisc
+  Tier: Revolutionary
+- Name: LeTobbs
+  Tier: Revolutionary
+- Name: Darren Brady
+  Tier: Free
+- Name: Zandario
+  Tier: Revolutionary
+- Name: Lucas Welsh
+  Tier: Revolutionary
+- Name: Nico Thate
+  Tier: Free
+- Name: Anthony Fleck
+  Tier: Nuclear Operative
+- Name: vifs_vestige
+  Tier: Syndicate Agent
+- Name: Bobberunio
+  Tier: Revolutionary
+- Name: Zadenae
+  Tier: Nuclear Operative
+- Name: Into the Stars - Community Host
+  Tier: Nuclear Operative
+- Name: arthropods
+  Tier: Revolutionary
+- Name: Jack Gardiner
+  Tier: Revolutionary
+- Name: BigMcLargeHuge
+  Tier: Free
+- Name: merklaw
+  Tier: Revolutionary
+- Name: CPM311
+  Tier: Revolutionary
+- Name: NetGlitch
+  Tier: Nuclear Operative
+- Name: Bahke
+  Tier: Nuclear Operative
+- Name: Prayer
+  Tier: Nuclear Operative
+- Name: Trevor McConnell
+  Tier: Nuclear Operative
+- Name: MetalClone
+  Tier: Free
+- Name: Farewell Fire
+  Tier: Syndicate Agent
+- Name: Ninja
+  Tier: Syndicate Agent
+- Name: all fields
+  Tier: Syndicate Agent
+- Name: Kyle Hipke
+  Tier: Nuclear Operative
+- Name: Daniel Thompson
+  Tier: Revolutionary
+- Name: Tyler Young
+  Tier: Nuclear Operative
+- Name: LeoZ
+  Tier: Revolutionary
+- Name: avcde
+  Tier: Nuclear Operative
+- Name: Tomeno
+  Tier: Revolutionary
+
diff --git a/Resources/Locale/en-US/_strings/abilities/mime.ftl b/Resources/Locale/en-US/_strings/abilities/mime.ftl
index 4fd960d89e..3957283f80 100644
--- a/Resources/Locale/en-US/_strings/abilities/mime.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/accent/accents.ftl b/Resources/Locale/en-US/_strings/accent/accents.ftl
index f54cecf714..75644c8b2e 100644
--- a/Resources/Locale/en-US/_strings/accent/accents.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/accessories/vox-hair.ftl b/Resources/Locale/en-US/_strings/accessories/vox-hair.ftl
index 0e11e1a9b8..e6e32e9c80 100644
--- a/Resources/Locale/en-US/_strings/accessories/vox-hair.ftl
+++ b/Resources/Locale/en-US/_strings/accessories/vox-hair.ftl
@@ -21,4 +21,8 @@ marking-VoxHairSurf = Vox Surf
 marking-VoxHairTielQuills = Vox Tiel Quills
 marking-VoxHairYasu = Vox Yasuhiro
 marking-VoxHairWiseBraid = Vox Wise Braids
-marking-VoxHairSpotty = Vox Spotty Hair
\ No newline at end of file
+marking-VoxHairSpotty = Vox Spotty Quills
+marking-VoxHairMadScientist = Vox Mad Scientist
+marking-VoxHairHedgehog = Vox Hedgehog
+marking-VoxHairBushy = Vox Bushy Quills
+marking-VoxHairSlick = Vox Slick Quills
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_strings/actions/actions/polymorph.ftl b/Resources/Locale/en-US/_strings/actions/actions/polymorph.ftl
index 4a65a60ecf..129d8995b5 100644
--- a/Resources/Locale/en-US/_strings/actions/actions/polymorph.ftl
+++ b/Resources/Locale/en-US/_strings/actions/actions/polymorph.ftl
@@ -1 +1 @@
-gera-transformation-popup = This action will transform you. Use it again to confirm.
+revert-polymorph-action-popup = This action is irreversible. Use it again to confirm.
diff --git a/Resources/Locale/en-US/_strings/administration/admin-verbs.ftl b/Resources/Locale/en-US/_strings/administration/admin-verbs.ftl
index a89397bd65..13be0a876d 100644
--- a/Resources/Locale/en-US/_strings/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/administration/antag.ftl b/Resources/Locale/en-US/_strings/administration/antag.ftl
index 6db1c1bc31..161054aca2 100644
--- a/Resources/Locale/en-US/_strings/administration/antag.ftl
+++ b/Resources/Locale/en-US/_strings/administration/antag.ftl
@@ -7,7 +7,8 @@ admin-verb-make-pirate = Make the target into a pirate. Note this doesn't config
 admin-verb-make-head-rev = Make the target into a Head Revolutionary.
 admin-verb-make-thief = Make the target into a thief.
 admin-verb-make-paradox-clone = Create a Paradox Clone ghost role of the target.
-admin-verb-make-changeling = Make the target into a changeling.
+admin-verb-make-changeling = Make the target into a Changeling.
+
 
 admin-verb-text-make-traitor = Make Traitor
 admin-verb-text-make-initial-infected = Make Initial Infected
@@ -17,7 +18,6 @@ admin-verb-text-make-pirate = Make Pirate
 admin-verb-text-make-head-rev = Make Head Rev
 admin-verb-text-make-thief = Make Thief
 admin-verb-text-make-paradox-clone = Create Paradox Clone
-admin-verb-text-make-changeling = Make Changeling
-
+admin-verb-text-make-changeling = Make Changeling (WIP)
 
 admin-overlay-antag-classic = ANTAG
diff --git a/Resources/Locale/en-US/_strings/administration/commands/add-uplink-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/add-uplink-command.ftl
index 1a721c93f3..40d0c5fa1b 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/add-uplink-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/add-uplink-command.ftl
@@ -1,5 +1,5 @@
-add-uplink-command-description = Creates uplink on selected item and link it to users account
-add-uplink-command-help = Usage: adduplink [username] [item-id]
+cmd-adduplink-desc = Creates uplink on selected item and link it to users account
+cmd-adduplink-help = Usage: adduplink [username] [item-id] [discountEnabled]
 
 add-uplink-command-completion-1 = Username (defaults to self)
 add-uplink-command-completion-2 = Uplink uid (default to PDA)
diff --git a/Resources/Locale/en-US/_strings/administration/commands/call-shuttle-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/call-shuttle-command.ftl
index 672c68fd7c..ceb7830047 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/call-shuttle-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/call-shuttle-command.ftl
@@ -1,4 +1,4 @@
-call-shuttle-command-description = Calls the emergency shuttle with an optionally provided arrival time.
-call-shuttle-command-help-text = Usage: {$command} [m:ss]
-recall-shuttle-command-description = Recalls the emergency shuttle.
-recall-shuttle-command-help-text = Usage: {$command}
+cmd-callshuttle-desc = Calls the emergency shuttle with an optionally provided arrival time.
+cmd-callshuttle-help = Usage: callshuttle [m:ss]
+cmd-recallshuttle-desc = Recalls the emergency shuttle.
+cmd-recallshuttle-help = Usage: recallshuttle
diff --git a/Resources/Locale/en-US/_strings/administration/commands/camera.ftl b/Resources/Locale/en-US/_strings/administration/commands/camera.ftl
new file mode 100644
index 0000000000..98839683e0
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/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/_strings/administration/commands/dsay-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/dsay-command.ftl
deleted file mode 100644
index 4f9a7cc221..0000000000
--- a/Resources/Locale/en-US/_strings/administration/commands/dsay-command.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-dsay-command-description = Sends a message to deadchat as an admin
-dsay-command-help-text = Usage: {$command} <message>
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_strings/administration/commands/follow-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/follow-command.ftl
deleted file mode 100644
index 3ef5fde075..0000000000
--- a/Resources/Locale/en-US/_strings/administration/commands/follow-command.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-follow-command-description = Makes you begin following an entity
-follow-command-help = Usage: follow [netEntity]
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_strings/administration/commands/set-admin-ooc-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/set-admin-ooc-command.ftl
index 6532483dc1..e0e56e346a 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/set-admin-ooc-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/set-admin-ooc-command.ftl
@@ -1,2 +1,2 @@
-set-admin-ooc-command-description = Sets the color of your OOC messages. Color must be in hex format, example: {$command} #c43b23
-set-admin-ooc-command-help-text = Usage: {$command} <color>
\ No newline at end of file
+cmd-setadminooc-desc = Sets the color of your OOC messages. Color must be in hex format, example: setadminooc #c43b23
+cmd-setadminooc-help = Usage: setadminooc <color>
diff --git a/Resources/Locale/en-US/_strings/administration/commands/set-looc-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/set-looc-command.ftl
index 2125939052..8d14ac8954 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/set-looc-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/set-looc-command.ftl
@@ -1,6 +1,4 @@
-set-looc-command-description = Allows you to enable or disable LOOC.
-set-looc-command-help = Usage: setlooc OR setlooc [value]
-set-looc-command-too-many-arguments-error = Too many arguments.
-set-looc-command-invalid-argument-error = Invalid argument.
-set-looc-command-looc-enabled = LOOC chat has been enabled.
-set-looc-command-looc-disabled = LOOC chat has been disabled.
+cmd-setlooc-description = Allows you to enable or disable LOOC.
+cmd-setlooc-help = Usage: setlooc OR setlooc [value]
+cmd-setlooc-looc-enabled = LOOC chat has been enabled.
+cmd-setlooc-looc-disabled = LOOC chat has been disabled.
diff --git a/Resources/Locale/en-US/_strings/administration/commands/set-mind-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/set-mind-command.ftl
index 1039b9f1f7..5cc5682d2b 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/set-mind-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/set-mind-command.ftl
@@ -1,5 +1,4 @@
-set-mind-command-description = Transfers a mind to the specified entity. The entity must have a {$requiredComponent}. By default this will force minds that are currently visiting other entities to return (i.e., return a ghost to their main body).
-set-mind-command-help-text = Usage: {$command} <entityUid> <username> [unvisit]
-set-mind-command-target-has-no-content-data-message = Target player does not have content data (wtf?)
-set-mind-command-target-has-no-mind-message = Target entity does not have a mind (did you forget to make sentient?)
-cmd-mind-command-hint = username
+cmd-setmind-desc = Transfers a mind to the specified entity. The entity must have a {$requiredComponent}. By default this will force minds that are currently visiting other entities to return (i.e., return a ghost to their main body).
+cmd-setmind-help = Usage: {$command} <entityUid> <username> [unvisit]
+cmd-setmind-command-target-has-no-content-data-message = Target player does not have content data (wtf?)
+cmd-setmind-command-target-has-no-mind-message = Target entity does not have a mind (did you forget to make sentient?)
diff --git a/Resources/Locale/en-US/_strings/administration/commands/set-ooc-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/set-ooc-command.ftl
index 62b0747173..bb73d209da 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/set-ooc-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/set-ooc-command.ftl
@@ -1,6 +1,4 @@
-set-ooc-command-description = Allows you to enable or disable OOC.
-set-ooc-command-help = Usage: setooc OR setooc [value]
-set-ooc-command-too-many-arguments-error = Too many arguments.
-set-ooc-command-invalid-argument-error = Invalid argument.
-set-ooc-command-ooc-enabled = OOC chat has been enabled.
-set-ooc-command-ooc-disabled = OOC chat has been disabled.
+cmd-setooc-desc = Allows you to enable or disable OOC.
+cmd-setooc-help = Usage: setooc OR setooc [value]
+cmd-setooc-ooc-enabled = OOC chat has been enabled.
+cmd-setooc-ooc-disabled = OOC chat has been disabled.
diff --git a/Resources/Locale/en-US/_strings/administration/commands/set-outfit-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/set-outfit-command.ftl
index 793c339c28..247dae37f4 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/set-outfit-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/set-outfit-command.ftl
@@ -1,4 +1,4 @@
-set-outfit-command-description = Sets the outfit of the specified entity. The entity must have {INDEFINITE($requiredComponent)} {$requiredComponent}
-set-outfit-command-help-text = Usage: {$command} <entityUid> | {$command} <entityUid> <outfitId>
-set-outfit-command-is-not-player-error = This command requires both arguments to work from the server console. 
-set-outfit-command-invalid-outfit-id-error = Invalid outfit id
+cmd-setoutfit-desc = Sets the outfit of the specified entity. The entity must have {INDEFINITE($requiredComponent)} {$requiredComponent}
+cmd-setoutfit-help = Usage: setoutfit <entityUid> | setoutfit <entityUid> <outfitId>
+cmd-setoutfit-is-not-player-error = This command requires both arguments to work from the server console.
+cmd-setoutfit-invalid-outfit-id-error = Invalid outfit id.
diff --git a/Resources/Locale/en-US/_strings/administration/commands/stealthmin-command.ftl b/Resources/Locale/en-US/_strings/administration/commands/stealthmin-command.ftl
index 4fb5e52105..895d102984 100644
--- a/Resources/Locale/en-US/_strings/administration/commands/stealthmin-command.ftl
+++ b/Resources/Locale/en-US/_strings/administration/commands/stealthmin-command.ftl
@@ -1,3 +1,2 @@
 cmd-stealthmin-desc = Toggle whether others can see you in adminwho.
 cmd-stealthmin-help = Usage: stealthmin\nUse stealthmin to toggle whether you appear in the output of the adminwho command.
-cmd-stealthmin-no-console = You cannot use this command from the server console.
diff --git a/Resources/Locale/en-US/_strings/administration/smites.ftl b/Resources/Locale/en-US/_strings/administration/smites.ftl
index 1fefffd2a3..d276d1c135 100644
--- a/Resources/Locale/en-US/_strings/administration/smites.ftl
+++ b/Resources/Locale/en-US/_strings/administration/smites.ftl
@@ -13,7 +13,6 @@ admin-smite-stomach-removal-self = Your stomach feels hollow...
 admin-smite-run-walk-swap-prompt = You have to press shift to run!
 admin-smite-super-speed-prompt = You move at mach 0.8!
 admin-smite-lung-removal-self = You can't breathe!
-admin-smite-terminate-prompt = I'll be back
 
 ## Smite names
 
@@ -58,7 +57,7 @@ admin-smite-ghostkick-name = Ghost Kick
 admin-smite-nyanify-name = Cat Ears
 admin-smite-kill-sign-name = Kill Sign
 admin-smite-omni-accent-name = Omni-Accent
-admin-smite-random-death-name = Random Death
+admin-smite-crawler-name = Crawler
 
 ## Smite descriptions
 
@@ -103,7 +102,7 @@ admin-smite-super-bonk-lite-description= Slams them on every single table on the
 admin-smite-terminate-description = Creates a Terminator ghost role with the sole objective of killing them.
 admin-smite-super-slip-description = Slips them really, really hard.
 admin-smite-omni-accent-description = Makes the target speak with almost every accent available.
-admin-smite-random-death-description = Randomly picks a extremely hard to recover death.
+admin-smite-crawler-description = Makes the target fall down and be unable to stand up. Remove their hands too for added effect!
 
 ## Tricks descriptions
 
diff --git a/Resources/Locale/en-US/_strings/administration/ui/admin-announce-window.ftl b/Resources/Locale/en-US/_strings/administration/ui/admin-announce-window.ftl
index 1db8cfad25..d4341b99bc 100644
--- a/Resources/Locale/en-US/_strings/administration/ui/admin-announce-window.ftl
+++ b/Resources/Locale/en-US/_strings/administration/ui/admin-announce-window.ftl
@@ -6,3 +6,6 @@ admin-announce-button = Announce
 admin-announce-type-station = Station
 admin-announce-type-server = Server
 admin-announce-keep-open = Keep open
+
+cmd-announceui-desc = Opens the announcement UI.
+cmd-announceui-help = Usage: announceui
diff --git a/Resources/Locale/en-US/_strings/administration/ui/admin-camera-window.ftl b/Resources/Locale/en-US/_strings/administration/ui/admin-camera-window.ftl
new file mode 100644
index 0000000000..bf9f45a745
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/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/_strings/administration/ui/admin-logs.ftl b/Resources/Locale/en-US/_strings/administration/ui/admin-logs.ftl
index 377bea6e84..25e0943310 100644
--- a/Resources/Locale/en-US/_strings/administration/ui/admin-logs.ftl
+++ b/Resources/Locale/en-US/_strings/administration/ui/admin-logs.ftl
@@ -1,5 +1,6 @@
 admin-logs-title = Admin Logs Panel
 admin-logs-count = Showing {$showing}/{$total} of {$round}
+admin-logs-export = Export
 admin-logs-pop-out = Pop Out
 
 # Round
diff --git a/Resources/Locale/en-US/_strings/administration/ui/admin-spawn-explosion-eui.ftl b/Resources/Locale/en-US/_strings/administration/ui/admin-spawn-explosion-eui.ftl
index 85f4a065f4..1d30c5d9fc 100644
--- a/Resources/Locale/en-US/_strings/administration/ui/admin-spawn-explosion-eui.ftl
+++ b/Resources/Locale/en-US/_strings/administration/ui/admin-spawn-explosion-eui.ftl
@@ -13,4 +13,17 @@ admin-explosion-eui-label-directional = Directional
 admin-explosion-eui-label-angle = Angle
 admin-explosion-eui-label-spread = Spread
 admin-explosion-eui-label-distance = Distance
-admin-explosion-eui-label-spawn = Kabloom!
\ No newline at end of file
+admin-explosion-eui-label-spawn = Kabloom!
+
+cmd-explosionui-desc = Opens a window for easy access to station destruction.
+cmd-explosionui-help = Usage: explosionui
+
+cmd-explosion-desc = Train go boom
+cmd-explosion-help = Usage: explosion [intensity] [slope] [maxIntensity] [x y] [mapId] [prototypeId]
+cmd-explosion-failed-to-parse-intensity = Failed to parse intensity: {$value}
+cmd-explosion-failed-to-parse-float = Failed to parse float: {$value}
+cmd-explosion-failed-to-parse-coords = Failed to parse coordinates: {$value1} {$value2}
+cmd-explosion-failed-to-parse-map-id = Failed to parse map ID: {$value}
+cmd-explosion-need-coords-explicit = Failed get default coordinates/map via player's transform. Need to specify explicitly.
+cmd-explosion-unknown-prototype = Unknown explosion prototype: {$value}
+cmd-explosion-no-prototypes = Prototype manager has no explosion prototypes?
diff --git a/Resources/Locale/en-US/_strings/administration/ui/manage-solutions/manage-solutions.ftl b/Resources/Locale/en-US/_strings/administration/ui/manage-solutions/manage-solutions.ftl
index e5c0b33d4e..9374644985 100644
--- a/Resources/Locale/en-US/_strings/administration/ui/manage-solutions/manage-solutions.ftl
+++ b/Resources/Locale/en-US/_strings/administration/ui/manage-solutions/manage-solutions.ftl
@@ -1,5 +1,9 @@
 admin-solutions-window-title = Solution Editor - {$targetName}
 admin-solutions-window-solution-label = Target solution:
+admin-solutions-window-solution-button = Solution
+admin-solutions-window-solution-button-tooltip = Opens the corresponding server-side Solution instance in ViewVariables. Useful for debugging prediction issues.
+admin-solutions-window-vv-button = VV
+admin-solutions-window-vv-button-tooltip = Opens the corresponding solution entity in ViewVariables.
 admin-solutions-window-add-new-button = Add new reagent
 admin-solutions-window-volume-label = Volume {$currentVolume}/{$maxVolume}u
 admin-solutions-window-capacity-label = Capacity (u):
@@ -7,4 +11,4 @@ admin-solutions-window-specific-heat-label = Specific Heat: {$specificHeat} J/(K
 admin-solutions-window-heat-capacity-label = Heat Capacity: {$heatCapacity} J/K
 admin-solutions-window-temperature-label = Temperature (K):
 admin-solutions-window-thermal-energy-label = Thermal Energy (J):
-admin-solutions-window-thermals = Thermals
\ No newline at end of file
+admin-solutions-window-thermals = Thermals
diff --git a/Resources/Locale/en-US/_strings/administration/ui/permissions-eui.ftl b/Resources/Locale/en-US/_strings/administration/ui/permissions-eui.ftl
index 228f40f828..0ff1f9fb55 100644
--- a/Resources/Locale/en-US/_strings/administration/ui/permissions-eui.ftl
+++ b/Resources/Locale/en-US/_strings/administration/ui/permissions-eui.ftl
@@ -21,3 +21,6 @@ permissions-eui-edit-admin-rank-button = Edit
 permissions-eui-edit-admin-rank-window-title = Edit Admin Rank
 permissions-eui-edit-admin-window-save-button = Save
 permissions-eui-edit-admin-window-remove-flag-button = Remove
+
+cmd-permissions-desc = Opens the admin permissions panel.
+cmd-permissions-help = Usage: permissions
diff --git a/Resources/Locale/en-US/_strings/administration/ui/player-panel.ftl b/Resources/Locale/en-US/_strings/administration/ui/player-panel.ftl
index f2d89fe2c2..7b3571e380 100644
--- a/Resources/Locale/en-US/_strings/administration/ui/player-panel.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/administration/ui/role-bans.ftl b/Resources/Locale/en-US/_strings/administration/ui/role-bans.ftl
new file mode 100644
index 0000000000..97109fdc7f
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/administration/ui/role-bans.ftl
@@ -0,0 +1,3 @@
+role-bans-ban-group = Ban All
+role-bans-expand-roles = Show Roles
+role-bans-contract-roles = Hide Roles
diff --git a/Resources/Locale/en-US/_strings/alerts/alerts.ftl b/Resources/Locale/en-US/_strings/alerts/alerts.ftl
index 4d7ab924f0..9593b01321 100644
--- a/Resources/Locale/en-US/_strings/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/_strings/alerts/alerts.ftl
@@ -33,6 +33,9 @@ alerts-walking-desc = You are walking, moving at a slow pace.
 alerts-stunned-name = [color=yellow]Stunned[/color]
 alerts-stunned-desc = You're [color=yellow]stunned[/color]! Something is impairing your ability to move or interact with objects.
 
+alerts-knockdown-name = [color=yellow]Knocked Down[/color]
+alerts-knockdown-desc = You're [color=yellow]Knocked Down[/color]! Something has slipped or pushed you over, encumbering your movement.
+
 alerts-handcuffed-name = [color=yellow]Handcuffed[/color]
 alerts-handcuffed-desc = You're [color=yellow]handcuffed[/color] and can't use your hands. If anyone drags you, you won't be able to resist.
 
@@ -117,9 +120,5 @@ alerts-revenant-corporeal-desc = You have manifested physically. People around y
 alerts-rooted-name = Rooted
 alerts-rooted-desc = You are attached to the ground. You can't slip, but you absorb fluids under you.
 
-alerts-changeling-chemicals-name = Chemicals
-alerts-changeling-chemicals-desc = Spend chemicals to use your abilities. Slowly regenerates.
-
-alerts-changeling-biomass-name = Biomass
-alerts-changeling-biomass-desc =
-    This is your health. If it reaches 0 - it's [color=red]game over[/color]. Absorb humanoids to recover some of it.
+alerts-stealthy-name = Pickpocketing
+alerts-stealthy-desc = Whether you are currently pickpocketing. Click to toggle.
diff --git a/Resources/Locale/en-US/_strings/anomaly/anomaly.ftl b/Resources/Locale/en-US/_strings/anomaly/anomaly.ftl
index c8d099777d..77608da435 100644
--- a/Resources/Locale/en-US/_strings/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/_strings/anomaly/anomaly.ftl
@@ -54,6 +54,8 @@ anomaly-sync-examine-connected = It is [color=darkgreen]attached[/color] to an a
 anomaly-sync-examine-not-connected = It is [color=darkred]not attached[/color] to an anomaly.
 anomaly-sync-connect-verb-text = Attach anomaly
 anomaly-sync-connect-verb-message = Attach a nearby anomaly to {THE($machine)}.
+anomaly-sync-disconnect-verb-text = Detach anomaly
+anomaly-sync-disconnect-verb-message = Detach the connected anomaly from {THE($machine)}.
 
 anomaly-generator-ui-title = Anomaly Generator
 anomaly-generator-fuel-display = Fuel:
@@ -78,7 +80,7 @@ anomaly-generator-flavor-right = v1.1
 anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
 
 anomaly-behavior-title = behavior deviation analysis:
-anomaly-behavior-point =[color=gold]Anomaly produces {$mod}% of the points[/color] 
+anomaly-behavior-point = [color=gold]Anomaly produces {$mod}% of the points[/color]
 
 anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
 anomaly-behavior-slow = [color=forestgreen]The frequency of pulsations is much less frequent.[/color]
@@ -94,4 +96,4 @@ anomaly-behavior-secret = Interference detected. Some data cannot be read
 anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
 anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
 anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
-anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
\ No newline at end of file
+anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
diff --git a/Resources/Locale/en-US/_strings/atmos/air-alarm-ui.ftl b/Resources/Locale/en-US/_strings/atmos/air-alarm-ui.ftl
index 25669997ed..9d4020bacc 100644
--- a/Resources/Locale/en-US/_strings/atmos/air-alarm-ui.ftl
+++ b/Resources/Locale/en-US/_strings/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
@@ -45,6 +47,18 @@ air-alarm-ui-mode-fill = Fill
 air-alarm-ui-mode-panic = Panic
 air-alarm-ui-mode-none = None
 
+
+air-alarm-ui-pump-direction-siphoning = Siphoning
+air-alarm-ui-pump-direction-scrubbing = Scrubbing
+air-alarm-ui-pump-direction-releasing = Releasing
+
+air-alarm-ui-pressure-bound-nobound = No Bound
+air-alarm-ui-pressure-bound-internalbound = Internal Bound
+air-alarm-ui-pressure-bound-externalbound = External Bound
+air-alarm-ui-pressure-bound-both = Both
+
+air-alarm-ui-widget-gas-filters = Gas Filters
+
 ## Widgets
 
 ### General
@@ -67,6 +81,8 @@ air-alarm-ui-vent-internal-bound-label = Internal bound
 air-alarm-ui-scrubber-pump-direction-label = Direction
 air-alarm-ui-scrubber-volume-rate-label = Rate (L)
 air-alarm-ui-scrubber-wide-net-label = WideNet
+air-alarm-ui-scrubber-select-all-gases-label = Select all
+air-alarm-ui-scrubber-deselect-all-gases-label = Deselect all
 
 ### Thresholds
 
diff --git a/Resources/Locale/en-US/_strings/atmos/gas-pressure-regulator-system.ftl b/Resources/Locale/en-US/_strings/atmos/gas-pressure-regulator-system.ftl
new file mode 100644
index 0000000000..0f30f3d75d
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/atmos/gas-pressure-regulator-system.ftl
@@ -0,0 +1,7 @@
+# Examine Text
+gas-pressure-regulator-system-examined = The valve is [color={$statusColor}]{$open ->
+[true] open
+*[false] closed
+}[/color].
+gas-pressure-regulator-examined-threshold-pressure = The threshold pressure is set at [color=lightblue]{$threshold} kPa[/color].
+gas-pressure-regulator-examined-flow-rate = The flow rate meter indicates [color=lightblue]{$flowRate} L/s[/color].
diff --git a/Resources/Locale/en-US/_strings/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/en-US/_strings/bed/cryostorage/cryogenic-storage.ftl
index f966f30e2d..7d2e50e772 100644
--- a/Resources/Locale/en-US/_strings/bed/cryostorage/cryogenic-storage.ftl
+++ b/Resources/Locale/en-US/_strings/bed/cryostorage/cryogenic-storage.ftl
@@ -5,3 +5,5 @@ earlyleave-cryo-job-unknown = Unknown
 # {$entity} available for GENDER function purposes
 earlyleave-cryo-announcement = {$character} ({$job}) has entered cryogenic storage!
 earlyleave-cryo-sender = Station
+
+cryostorage-paused-map-name = Cryosleeper body storage map
diff --git a/Resources/Locale/en-US/_strings/bonk/components/bonkable-component.ftl b/Resources/Locale/en-US/_strings/bonk/components/bonkable-component.ftl
deleted file mode 100644
index 1a79da3509..0000000000
--- a/Resources/Locale/en-US/_strings/bonk/components/bonkable-component.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-forced-bonkable-success-message = { CAPITALIZE($bonker) } bonks {$victim}s head against { THE($bonkable) }!
-
-bonkable-success-message-user = You bonk your head against { THE($bonkable) }!
-bonkable-success-message-others = {$victim} bonks their head against { THE($bonkable) }!
diff --git a/Resources/Locale/en-US/_strings/changelog/changelog-window.ftl b/Resources/Locale/en-US/_strings/changelog/changelog-window.ftl
index 514b2eb1d1..4ee5552282 100644
--- a/Resources/Locale/en-US/_strings/changelog/changelog-window.ftl
+++ b/Resources/Locale/en-US/_strings/changelog/changelog-window.ftl
@@ -14,3 +14,6 @@ changelog-button-new-entries = Changelog (new!)
 changelog-tab-title-Changelog = Changelog
 changelog-tab-title-Admin = Admin
 changelog-tab-title-Maps = Maps
+
+cmd-changelog-desc = Opens the changelog.
+cmd-changelog-help = Usage: changelog
diff --git a/Resources/Locale/en-US/_strings/chat/emotes.ftl b/Resources/Locale/en-US/_strings/chat/emotes.ftl
index 074ce2a5dc..cf6d91b511 100644
--- a/Resources/Locale/en-US/_strings/chat/emotes.ftl
+++ b/Resources/Locale/en-US/_strings/chat/emotes.ftl
@@ -4,7 +4,7 @@ chat-emote-name-laugh = Laugh
 chat-emote-name-honk = Honk
 chat-emote-name-sigh = Sigh
 chat-emote-name-whistle = Whistle
-chat-emote-name-crying = Crying
+chat-emote-name-crying = Cry
 chat-emote-name-squish = Squish
 chat-emote-name-chitter = Chitter
 chat-emote-name-squeak = Squeak
@@ -27,8 +27,8 @@ chat-emote-name-ping = Ping
 chat-emote-name-sneeze = Sneeze
 chat-emote-name-cough = Cough
 chat-emote-name-catmeow = Cat Meow
-chat-emote-name-cathisses = Cat Hisses
-chat-emote-name-monkeyscreeches = Monkey Screeches
+chat-emote-name-cathisses = Cat Hiss
+chat-emote-name-monkeyscreeches = Monkey Screech
 chat-emote-name-robotbeep = Robot
 chat-emote-name-yawn = Yawn
 chat-emote-name-snore = Snore
@@ -52,6 +52,7 @@ chat-emote-msg-salute = salutes.
 chat-emote-msg-gasp = gasps.
 chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
 chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
+chat-emote-msg-deathgasp-scurret = lets out a final 'wa' and falls still...
 chat-emote-msg-buzz = buzzes!
 chat-emote-msg-weh = wehs!
 chat-emote-msg-hew = hews!
diff --git a/Resources/Locale/en-US/_strings/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/_strings/chat/managers/chat-manager.ftl
index c20852468b..e7e55c1ea4 100644
--- a/Resources/Locale/en-US/_strings/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/_strings/chat/managers/chat-manager.ftl
@@ -157,3 +157,9 @@ chat-speech-verb-name-electricity = Electricity
 chat-speech-verb-electricity-1 = crackles
 chat-speech-verb-electricity-2 = buzzes
 chat-speech-verb-electricity-3 = screeches
+
+chat-speech-verb-name-wawa = Wawa
+chat-speech-verb-wawa-1 = intones
+chat-speech-verb-wawa-2 = states
+chat-speech-verb-wawa-3 = declares
+chat-speech-verb-wawa-4 = ponders
diff --git a/Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl b/Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
index 26c7367763..1357eb5435 100644
--- a/Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
+++ b/Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
@@ -10,7 +10,6 @@ hypospray-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/
 
 hypospray-component-inject-other-message = You inject {$other}.
 hypospray-component-inject-self-message = You inject yourself.
-hypospray-component-inject-self-clumsy-message = Oops! You injected yourself.
 hypospray-component-empty-message = Nothing to inject.
 hypospray-component-feel-prick-message = You feel a tiny prick!
 hypospray-component-transfer-already-full-message = {$owner} is already full!
diff --git a/Resources/Locale/en-US/_strings/chemistry/solution/components/shared-solution-container-component.ftl b/Resources/Locale/en-US/_strings/chemistry/solution/components/shared-solution-container-component.ftl
index 6f1ba911f7..dd78281b89 100644
--- a/Resources/Locale/en-US/_strings/chemistry/solution/components/shared-solution-container-component.ftl
+++ b/Resources/Locale/en-US/_strings/chemistry/solution/components/shared-solution-container-component.ftl
@@ -1,9 +1,37 @@
-shared-solution-container-component-on-examine-empty-container = Contains no chemicals.
-shared-solution-container-component-on-examine-main-text = It contains {INDEFINITE($desc)} [color={$color}]{$desc}[/color] {$wordedAmount}
-shared-solution-container-component-on-examine-worded-amount-one-reagent = chemical.
-shared-solution-container-component-on-examine-worded-amount-multiple-reagents = mixture of chemicals.
+shared-solution-container-component-on-examine-main-text = It contains {INDEFINITE($desc)} [color={$color}]{$desc}[/color] { $chemCount ->
+    [1] chemical.
+   *[other] mixture of chemicals.
+    }
 
 examinable-solution-has-recognizable-chemicals = You can recognize {$recognizedString} in the solution.
-examinable-solution-recognized-first = [color={$color}]{$chemical}[/color]
-examinable-solution-recognized-next = , [color={$color}]{$chemical}[/color]
-examinable-solution-recognized-last = and [color={$color}]{$chemical}[/color]
+examinable-solution-recognized = [color={$color}]{$chemical}[/color]
+
+examinable-solution-on-examine-volume = The contained solution is { $fillLevel ->
+    [exact] holding [color=white]{$current}/{$max}u[/color].
+   *[other] [bold]{ -solution-vague-fill-level(fillLevel: $fillLevel) }[/bold].
+}
+
+examinable-solution-on-examine-volume-no-max = The contained solution is { $fillLevel ->
+    [exact] holding [color=white]{$current}u[/color].
+   *[other] [bold]{ -solution-vague-fill-level(fillLevel: $fillLevel) }[/bold].
+}
+
+examinable-solution-on-examine-volume-puddle = The puddle is { $fillLevel ->
+    [exact] [color=white]{$current}u[/color].
+    [full] huge and overflowing!
+    [mostlyfull] huge and overflowing!
+    [halffull] deep and flowing.
+    [halfempty] very deep.
+   *[mostlyempty] pooling together.
+    [empty] forming multiple small pools.
+}
+
+-solution-vague-fill-level =
+    { $fillLevel ->
+        [full] [color=white]Full[/color]
+        [mostlyfull] [color=#DFDFDF]Mostly Full[/color]
+        [halffull] [color=#C8C8C8]Half Full[/color]
+        [halfempty] [color=#C8C8C8]Half Empty[/color]
+        [mostlyempty] [color=#A4A4A4]Mostly Empty[/color]
+       *[empty] [color=gray]Empty[/color]
+    }
diff --git a/Resources/Locale/en-US/_strings/commands/add-body-part-command.ftl b/Resources/Locale/en-US/_strings/commands/add-body-part-command.ftl
new file mode 100644
index 0000000000..6a7a54f730
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/add-body-part-command.ftl
@@ -0,0 +1,2 @@
+cmd-addbodypart-desc = Adds a given entity to a containing body.
+cmd-addbodypart-help = Usage: addbodypart <entity uid> <body uid> <part slot> <part type>
diff --git a/Resources/Locale/en-US/_strings/commands/admin-logs-command.ftl b/Resources/Locale/en-US/_strings/commands/admin-logs-command.ftl
new file mode 100644
index 0000000000..539c917ddb
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/admin-logs-command.ftl
@@ -0,0 +1,2 @@
+cmd-adminlogs-desc = Opens the admin logs panel.
+cmd-adminlogs-help = Usage: adminlogs
diff --git a/Resources/Locale/en-US/_strings/commands/admin-who-command.ftl b/Resources/Locale/en-US/_strings/commands/admin-who-command.ftl
new file mode 100644
index 0000000000..b6491ada03
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/admin-who-command.ftl
@@ -0,0 +1,2 @@
+cmd-adminwho-desc = Returns a list of all admins currently online on the server.
+cmd-adminwho-help = Usage: adminwho
diff --git a/Resources/Locale/en-US/_strings/commands/asay-command.ftl b/Resources/Locale/en-US/_strings/commands/asay-command.ftl
new file mode 100644
index 0000000000..3882947a7e
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/asay-command.ftl
@@ -0,0 +1,2 @@
+cmd-asay-desc = Send chat messages to the private admin chat channel.
+cmd-asay-help = Usage: asay <text>
diff --git a/Resources/Locale/en-US/_strings/commands/crew-manifest-command.ftl b/Resources/Locale/en-US/_strings/commands/crew-manifest-command.ftl
new file mode 100644
index 0000000000..8b46e3ec6d
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/crew-manifest-command.ftl
@@ -0,0 +1,2 @@
+cmd-crewmanifest-desc = Opens the crew manifest for the given station.
+cmd-crewmanifest-help = Usage: crewmanifest <entityUid>
diff --git a/Resources/Locale/en-US/_strings/commands/deadmin-command.ftl b/Resources/Locale/en-US/_strings/commands/deadmin-command.ftl
new file mode 100644
index 0000000000..e031595eba
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/deadmin-command.ftl
@@ -0,0 +1,3 @@
+cmd-deadmin-desc = Temporarily de-admins you so you can experience the round as a normal player.
+cmd-deadmin-help = Usage: deadmin
+                   Use readmin to re-admin after using this.
diff --git a/Resources/Locale/en-US/_strings/commands/delete-component-command.ftl b/Resources/Locale/en-US/_strings/commands/delete-component-command.ftl
new file mode 100644
index 0000000000..f8435e4c64
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/delete-component-command.ftl
@@ -0,0 +1,4 @@
+cmd-deletecomponent-desc = Deletes all instances of the specified component.
+cmd-deletecomponent-help = Usage: deletecomponent <name>"
+cmd-deletecomponent-no-component-exists = No component exists with name {$name}.
+cmd-deletecomponent-success = Removed {$count} components with name {$name}.
diff --git a/Resources/Locale/en-US/_strings/commands/destroy-mechanism-command.ftl b/Resources/Locale/en-US/_strings/commands/destroy-mechanism-command.ftl
new file mode 100644
index 0000000000..e199b6230c
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/destroy-mechanism-command.ftl
@@ -0,0 +1,4 @@
+cmd-destroymechanism-desc = Destroys a mechanism from your entity.
+cmd-destroymechanism-help = Usage: destroymechanism <mechanism>
+cmd-destroymechanism-success = Mechanism with name {$name} has been destroyed.
+cmd-destroymechanism-no-mechanism-found = No mechanism was found with name {$name}.
diff --git a/Resources/Locale/en-US/_strings/commands/dirty-command.ftl b/Resources/Locale/en-US/_strings/commands/dirty-command.ftl
new file mode 100644
index 0000000000..c3e7bc1c39
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/dirty-command.ftl
@@ -0,0 +1,2 @@
+cmd-dirty-desc = Marks all components on an entity as dirty. If not specified, dirties everything.
+cmd-dirty-help = Usage: dirty [entityUid]
diff --git a/Resources/Locale/en-US/_strings/commands/dsay-command.ftl b/Resources/Locale/en-US/_strings/commands/dsay-command.ftl
new file mode 100644
index 0000000000..eef9747f86
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/dsay-command.ftl
@@ -0,0 +1,2 @@
+cmd-dsay-desc = Sends a message to deadchat as an admin.
+cmd-dsay-help = Usage: dsay <message>
diff --git a/Resources/Locale/en-US/_strings/commands/dump-reagent-guide-text-command.ftl b/Resources/Locale/en-US/_strings/commands/dump-reagent-guide-text-command.ftl
new file mode 100644
index 0000000000..694854c1cd
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/dump-reagent-guide-text-command.ftl
@@ -0,0 +1,4 @@
+cmd-dumpreagentguidetext-desc = Dumps the guidebook text for a reagent to the console.
+cmd-dumpreagentguidetext-help = Usage: dumpreagentguidetext <reagentPrototype>
+cmd-dumpreagentguidetext-nothing-to-dump = Nothing to dump.
+cmd-dumpreagentguidetext-skipped = [skipped effect of type {$effect}]
diff --git a/Resources/Locale/en-US/_strings/commands/eye-commands.ftl b/Resources/Locale/en-US/_strings/commands/eye-commands.ftl
new file mode 100644
index 0000000000..512c56cb60
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/eye-commands.ftl
@@ -0,0 +1,10 @@
+parse-bool-fail = Unable to parse {$arg} as a bool
+parse-float-fail = Unable to parse {$arg} as a float
+
+cmd-lockeyes-desc = Prevents eyes from being rotated any further.
+cmd-lockeyes-help = Usage: lockeyes <true/false>
+
+cmd-rotateeyes-desc = Rotates every player's current eye to the specified rotation
+cmd-rotateeyes-help = rotateeyes <degrees (default 0)>
+cmd-rotateeyes-command-count = Set {$count} eye rotations
+
diff --git a/Resources/Locale/en-US/_strings/commands/follow-command.ftl b/Resources/Locale/en-US/_strings/commands/follow-command.ftl
new file mode 100644
index 0000000000..04c805bc50
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/follow-command.ftl
@@ -0,0 +1,2 @@
+cmd-follow-desc = Makes you begin following an entity.
+cmd-follow-help = Usage: follow [netEntity]
diff --git a/Resources/Locale/en-US/_strings/commands/force-map-command.ftl b/Resources/Locale/en-US/_strings/commands/force-map-command.ftl
new file mode 100644
index 0000000000..fabd5f04c8
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/force-map-command.ftl
@@ -0,0 +1,6 @@
+cmd-forcemap-desc = Forces the game to start with a given map next round.
+cmd-forcemap-help = Usage: forcemap <map ID>
+cmd-forcemap-success = Forced the game to start with map { $map } next round.
+cmd-forcemap-cleared = Cleared the forced map setting.
+cmd-forcemap-map-not-found = No eligible map exists with name { $map }.
+cmd-forcemap-hint = <map ID>
diff --git a/Resources/Locale/en-US/_strings/commands/force-preset-command.ftl b/Resources/Locale/en-US/_strings/commands/force-preset-command.ftl
new file mode 100644
index 0000000000..9f534a01c4
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/force-preset-command.ftl
@@ -0,0 +1,6 @@
+cmd-forcepreset-desc = Forces a specific game preset to start for the current lobby.
+cmd-forcepreset-help = Usage: forcepreset <preset>
+cmd-forcepreset-preround-lobby-only = This can only be executed while the game is in the pre-round lobby.
+cmd-forcepreset-no-preset-found = No preset exists with name {$preset}.
+cmd-forcepreset-success = Forced the game to start with preset {$preset}.
+cmd-forcepreset-hint = <preset>
diff --git a/Resources/Locale/en-US/_strings/commands/ghost-kick-command.ftl b/Resources/Locale/en-US/_strings/commands/ghost-kick-command.ftl
new file mode 100644
index 0000000000..fffae96ebe
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/ghost-kick-command.ftl
@@ -0,0 +1,3 @@
+cmd-ghostkick-desc = Kick a client from the server as if their network just dropped.
+cmd-ghostkick-help = Usage: ghostkick <Player> [Reason]
+cmd-ghostkick-default-reason = Ghost kicked by console.
diff --git a/Resources/Locale/en-US/_strings/commands/ghost-visibility-commands.ftl b/Resources/Locale/en-US/_strings/commands/ghost-visibility-commands.ftl
new file mode 100644
index 0000000000..a4eaed21f6
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/ghost-visibility-commands.ftl
@@ -0,0 +1,6 @@
+cmd-toggleghostvisibility-desc = Toggles ghost visibility on the client.
+cmd-toggleghostvisibility-help = Usage: toggleghostvisibility [bool]
+
+cmd-toggleselfghost-desc = Toggles seeing your own ghost.
+cmd-toggleselfghost-help = Usage: toggleselfghost
+cmd-toggleselfghost-must-be-ghost = Entity must be a ghost.
diff --git a/Resources/Locale/en-US/_strings/commands/go-lobby-command.ftl b/Resources/Locale/en-US/_strings/commands/go-lobby-command.ftl
new file mode 100644
index 0000000000..7ba54aa730
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/go-lobby-command.ftl
@@ -0,0 +1,4 @@
+cmd-golobby-desc = Enables the lobby and restarts the round.
+cmd-golobby-help = Usage: golobby / golobby <preset>
+cmd-golobby-success = Enabling the lobby and restarting the round.
+cmd-golobby-success-with-preset = Enabling the lobby and restarting the round with preset {$preset}.
diff --git a/Resources/Locale/en-US/_strings/commands/grid-drag-command.ftl b/Resources/Locale/en-US/_strings/commands/grid-drag-command.ftl
new file mode 100644
index 0000000000..34efa64491
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/grid-drag-command.ftl
@@ -0,0 +1,3 @@
+cmd-griddrag-desc = Allows someone with permissions to drag grids around.
+cmd-griddrag-help = Usage: griddrag
+cmd-griddrag-status = Grid dragging set to {$status}.
diff --git a/Resources/Locale/en-US/_strings/commands/hide-mechanisms-command.ftl b/Resources/Locale/en-US/_strings/commands/hide-mechanisms-command.ftl
index 75c9cbc815..db15e90aa4 100644
--- a/Resources/Locale/en-US/_strings/commands/hide-mechanisms-command.ftl
+++ b/Resources/Locale/en-US/_strings/commands/hide-mechanisms-command.ftl
@@ -1,2 +1,2 @@
-cmd-hidemechanisms-desc = Reverts the effects of {$showMechanismsCommand}
-cmd-hidemechanisms-help = Usage: {$command}
\ No newline at end of file
+cmd-hidemechanisms-desc = Reverts the effects of showmechanisms command.
+cmd-hidemechanisms-help = Usage: hidemechanisms
diff --git a/Resources/Locale/en-US/_strings/commands/is-afk-command.ftl b/Resources/Locale/en-US/_strings/commands/is-afk-command.ftl
new file mode 100644
index 0000000000..ad3a6f3ab4
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/is-afk-command.ftl
@@ -0,0 +1,4 @@
+cmd-isafk-desc = Checks if a specified player is AFK.
+cmd-isafk-help = Usage: isafk <playerName>
+cmd-isafk-true = They are indeed AFK.
+cmd-isafk-false = They are not AFK.
diff --git a/Resources/Locale/en-US/_strings/commands/makesentient-command.ftl b/Resources/Locale/en-US/_strings/commands/makesentient-command.ftl
new file mode 100644
index 0000000000..2d972b8e60
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/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/_strings/commands/map-commands.ftl b/Resources/Locale/en-US/_strings/commands/map-commands.ftl
new file mode 100644
index 0000000000..f5663f6824
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/map-commands.ftl
@@ -0,0 +1,5 @@
+cmd-loadgamemap-desc = Loads the given game map at the given coordinates.
+cmd-loadgamemap-help = loadgamemap <mapid> <gamemap> [<x> <y> [<name>]]
+
+cmd-listgamemaps-desc = Lists the game maps that can be used by loadgamemap.
+cmd-listgamemaps-help = Usage: listgamemaps
diff --git a/Resources/Locale/en-US/_strings/commands/mapping-client-side-setup-command.ftl b/Resources/Locale/en-US/_strings/commands/mappingclientsidesetup-command.ftl
similarity index 65%
rename from Resources/Locale/en-US/_strings/commands/mapping-client-side-setup-command.ftl
rename to Resources/Locale/en-US/_strings/commands/mappingclientsidesetup-command.ftl
index 955d077db4..24a7aa3d11 100644
--- a/Resources/Locale/en-US/_strings/commands/mapping-client-side-setup-command.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/commands/me-command.ftl b/Resources/Locale/en-US/_strings/commands/me-command.ftl
new file mode 100644
index 0000000000..cd482b0be3
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/me-command.ftl
@@ -0,0 +1,2 @@
+cmd-me-desc = Perform an action.
+cmd-me-help = Usage: me <text>
diff --git a/Resources/Locale/en-US/_strings/commands/mind-info-command.ftl b/Resources/Locale/en-US/_strings/commands/mind-info-command.ftl
new file mode 100644
index 0000000000..57a1731928
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/mind-info-command.ftl
@@ -0,0 +1,3 @@
+cmd-mindinfo-desc = Lists info for the mind of a specific player.
+cmd-mindinfo-help = Usage: mindinfo <session ID>
+cmd-mindinfo-mind-not-found = Can't find that mind.
diff --git a/Resources/Locale/en-US/_strings/commands/node-vis-commands.ftl b/Resources/Locale/en-US/_strings/commands/node-vis-commands.ftl
new file mode 100644
index 0000000000..e921c478f8
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/node-vis-commands.ftl
@@ -0,0 +1,6 @@
+cmd-nodevis-desc = Toggles node group visualization.
+cmd-nodevis-help = Usage: nodevis
+
+cmd-nodevisfilter-desc = Toggles showing a specific group on nodevis.
+cmd-nodevisfilter-help = Usage: nodevisfilter [filter]
+                         Omit filter to list currently masked-off
diff --git a/Resources/Locale/en-US/_strings/commands/npc-command.ftl b/Resources/Locale/en-US/_strings/commands/npc-command.ftl
new file mode 100644
index 0000000000..37117437dd
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/npc-command.ftl
@@ -0,0 +1,2 @@
+cmd-npc-desc = Opens the debug window for NPCs.
+cmd-npc-help = Usage: npc
diff --git a/Resources/Locale/en-US/_strings/commands/nukecodes-command.ftl b/Resources/Locale/en-US/_strings/commands/nukecodes-command.ftl
new file mode 100644
index 0000000000..50e324c524
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/nukecodes-command.ftl
@@ -0,0 +1,2 @@
+cmd-nukecodes-desc = Send nuke codes to a station's communication consoles.
+cmd-nukecodes-help = Usage: nukecodes <entityUid>
diff --git a/Resources/Locale/en-US/_strings/commands/ooc-command.ftl b/Resources/Locale/en-US/_strings/commands/ooc-command.ftl
new file mode 100644
index 0000000000..a2fa48e2ae
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/ooc-command.ftl
@@ -0,0 +1,2 @@
+cmd-ooc-desc = Send Out Of Character chat messages.
+cmd-ooc-help = Usage: ooc <text>
diff --git a/Resources/Locale/en-US/_strings/commands/pardon-command.ftl b/Resources/Locale/en-US/_strings/commands/pardon-command.ftl
new file mode 100644
index 0000000000..c934865629
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/pardon-command.ftl
@@ -0,0 +1,7 @@
+cmd-pardon-desc = Pardon somebody's ban.
+cmd-pardon-help = Usage: pardon <ban id>
+cmd-pardon-unable-to-parse = Unable to parse {$id} as a ban id integer.
+                             {$help}
+cmd-pardon-already-pardoned = This ban has already been pardoned.
+cmd-pardon-already-pardoned-specific = This ban has already been pardoned by {$admin} in {$time}.
+cmd-pardon-success = Pardoned ban with id {$id}.
diff --git a/Resources/Locale/en-US/_strings/commands/powerstat-command.ftl b/Resources/Locale/en-US/_strings/commands/powerstat-command.ftl
new file mode 100644
index 0000000000..c22cd5e22a
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/powerstat-command.ftl
@@ -0,0 +1,6 @@
+cmd-powerstat-desc = Shows statistics for pow3r.
+cmd-powerstat-help = Usage: powerstat
+cmd-powerstat-output = Networks:   {$networks}
+                       Loads:      {$loads}
+                       Supplies:   {$supplies}
+                       Batteries:  {$batteries}
diff --git a/Resources/Locale/en-US/_strings/commands/promote-host-command.ftl b/Resources/Locale/en-US/_strings/commands/promote-host-command.ftl
new file mode 100644
index 0000000000..f31deb6ee1
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/promote-host-command.ftl
@@ -0,0 +1,2 @@
+cmd-promotehost-desc = Grants client temporary full host admin privileges. Use this to bootstrap admins.
+cmd-promotehost-help = Usage promotehost <player>
diff --git a/Resources/Locale/en-US/_strings/commands/radiation-command.ftl b/Resources/Locale/en-US/_strings/commands/radiation-command.ftl
new file mode 100644
index 0000000000..852ddc5437
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/radiation-command.ftl
@@ -0,0 +1,2 @@
+cmd-showradiation-desc = Toggle visibility of radiation rays coming from rad sources
+cmd-showradiation-help = Usage: showradiation
diff --git a/Resources/Locale/en-US/_strings/commands/readmin-command.ftl b/Resources/Locale/en-US/_strings/commands/readmin-command.ftl
new file mode 100644
index 0000000000..4f6084903d
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/readmin-command.ftl
@@ -0,0 +1,3 @@
+cmd-readmin-desc = Re-admins you if you previously de-adminned.
+cmd-readmin-help = Usage: readmin
+cmd-readmin-not-an-admin = You're not an admin.
diff --git a/Resources/Locale/en-US/_strings/commands/remove-extra-components-command.ftl b/Resources/Locale/en-US/_strings/commands/remove-extra-components-command.ftl
new file mode 100644
index 0000000000..8cd0fc5797
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/remove-extra-components-command.ftl
@@ -0,0 +1,5 @@
+cmd-removeextracomponents-desc = Removes all components from all entities of the specified id if that component is not in its prototype.\nIf no id is specified, it matches all entities.
+cmd-removeextracomponents-help = removeextracomponents / removeextracomponents <entityId>
+cmd-removeextracomponents-invalid-prototype-id = Can't find entity prototype with id {$id}.
+cmd-removeextracomponents-success = Removed {$count} components from {$entities},
+cmd-removeextracomponents-success-with-id = Removed {$count} components from {$entities} with id {$id}.
diff --git a/Resources/Locale/en-US/_strings/commands/role-commands.ftl b/Resources/Locale/en-US/_strings/commands/role-commands.ftl
new file mode 100644
index 0000000000..ff8a2533e3
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/role-commands.ftl
@@ -0,0 +1,12 @@
+cmd-addrole-desc = Adds a role to a player's mind.
+cmd-addrole-help = Usage: addrole <session ID> <role>
+cmd-addrole-mind-not-found = Can't find that mind.
+cmd-addrole-role-not-found = Can't find that role.
+cmd-addrole-mind-already-has-role = Mind already has that role.
+
+cmd-listroles-desc = List all available roles.
+cmd-listroles-help = Usage: listroles
+
+cmd-rmrole-desc = Removes a role from a player's mind.
+cmd-rmrole-help = Usage: rmrole <session ID> <Role Type>
+                  The role type is the actual C# type name.
diff --git a/Resources/Locale/en-US/_strings/commands/say-command.ftl b/Resources/Locale/en-US/_strings/commands/say-command.ftl
new file mode 100644
index 0000000000..8deb7bdc45
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/say-command.ftl
@@ -0,0 +1,2 @@
+cmd-say-desc = Send chat messages to the local channel or a specified radio channel.
+cmd-say-help = Usage: say <text>
diff --git a/Resources/Locale/en-US/_strings/commands/set-battery-percent-command.ftl b/Resources/Locale/en-US/_strings/commands/set-battery-percent-command.ftl
new file mode 100644
index 0000000000..d7323e4831
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/set-battery-percent-command.ftl
@@ -0,0 +1,4 @@
+cmd-setbatterypercent-desc = Drains or recharges a battery by entity uid and percentage, i.e.: forall with Battery do setbatterypercent $ID 0
+cmd-setbatterypercent-help = Usage: setbatterypercent <id> <percent>
+cmd-setbatterypercent-battery-not-found = No battery found with id {$id}.
+cmd-setbatterypercent-not-valid-percent = {$arg} is not a valid float (percentage).
diff --git a/Resources/Locale/en-US/_strings/commands/show-ambient-command.ftl b/Resources/Locale/en-US/_strings/commands/show-ambient-command.ftl
new file mode 100644
index 0000000000..262bbca47b
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/show-ambient-command.ftl
@@ -0,0 +1,3 @@
+cmd-showambient-desc = Shows all AmbientSoundComponents in the viewport.
+cmd-showambient-help = Usage: showambient
+cmd-showambient-status = Ambient sound overlay set to {$status}.
diff --git a/Resources/Locale/en-US/_strings/commands/show-gun-spread-command.ftl b/Resources/Locale/en-US/_strings/commands/show-gun-spread-command.ftl
new file mode 100644
index 0000000000..a4a043e92e
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/show-gun-spread-command.ftl
@@ -0,0 +1,3 @@
+cmd-showgunspread-desc = Shows gun spread overlay for debugging.
+cmd-showgunspreade-help = Usage: showgunspread
+cmd-showgunspread-status = Set spread overlay to {$status}.
diff --git a/Resources/Locale/en-US/_strings/commands/show-health-bars-command.ftl b/Resources/Locale/en-US/_strings/commands/show-health-bars-command.ftl
index d660e93ce1..6020835d59 100644
--- a/Resources/Locale/en-US/_strings/commands/show-health-bars-command.ftl
+++ b/Resources/Locale/en-US/_strings/commands/show-health-bars-command.ftl
@@ -1,6 +1,4 @@
 cmd-showhealthbars-desc = Toggles health bars above mobs.
-cmd-showhealthbars-help = Usage: {$command} [<DamageContainerId>]
-cmd-showhealthbars-error-not-player = You aren't a player.
-cmd-showhealthbars-error-no-entity = You do not have an attached entity.
+cmd-showhealthbars-help = Usage: showhealthbars [<DamageContainerId>]
 cmd-showhealthbars-notify-enabled = Enabled health overlay for DamageContainers: {$args}.
-cmd-showhealthbars-notify-disabled = Disabled health overlay.
\ No newline at end of file
+cmd-showhealthbars-notify-disabled = Disabled health overlay.
diff --git a/Resources/Locale/en-US/_strings/commands/show-htn-command.ftl b/Resources/Locale/en-US/_strings/commands/show-htn-command.ftl
new file mode 100644
index 0000000000..6580a41b98
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/show-htn-command.ftl
@@ -0,0 +1,2 @@
+cmd-showhtn-desc = Shows the current status for HTN NPCs.
+cmd-showhtn-help = Usage: showhtn
diff --git a/Resources/Locale/en-US/_strings/commands/show-mechanisms-command.ftl b/Resources/Locale/en-US/_strings/commands/show-mechanisms-command.ftl
index 0512381b63..0415482e8e 100644
--- a/Resources/Locale/en-US/_strings/commands/show-mechanisms-command.ftl
+++ b/Resources/Locale/en-US/_strings/commands/show-mechanisms-command.ftl
@@ -1,2 +1,2 @@
 cmd-showmechanisms-desc = Makes mechanisms visible, even when they shouldn't be.
-cmd-showmechanisms-help = Usage: {$command}
\ No newline at end of file
+cmd-showmechanisms-help = Usage: showmechanisms
diff --git a/Resources/Locale/en-US/_strings/commands/showrules-command.ftl b/Resources/Locale/en-US/_strings/commands/showrules-command.ftl
new file mode 100644
index 0000000000..d997427de4
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/showrules-command.ftl
@@ -0,0 +1,3 @@
+cmd-showrules-desc = Opens the rules popup for the specified player.
+cmd-showrules-help = Usage: showrules <username> [seconds]
+cmd-showrules-invalid-seconds = {$seconds} is not a valid number of seconds!
diff --git a/Resources/Locale/en-US/_strings/commands/spawn-entity-list-command.ftl b/Resources/Locale/en-US/_strings/commands/spawn-entity-list-command.ftl
new file mode 100644
index 0000000000..b8f41fd945
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/spawn-entity-list-command.ftl
@@ -0,0 +1,4 @@
+cmd-spawnentitylist-desc = Spawns a list of entities around you.
+cmd-spawnentitylist-help = Usage: spawnentitylist <entityListPrototypeId>
+cmd-spawnentitylist-failed = No {$prototype} found with id {$id},
+cmd-spawnentitylist-success = Spawned {$count} entities.
diff --git a/Resources/Locale/en-US/_strings/commands/start-singularity-command.ftl b/Resources/Locale/en-US/_strings/commands/start-singularity-command.ftl
new file mode 100644
index 0000000000..26c9c6a4fd
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/start-singularity-command.ftl
@@ -0,0 +1,2 @@
+cmd-startsingularityengine-desc = Automatically turns on the particle accelerator and containment field emitters.
+cmd-startsingularityengine-help = Usage: startsingularityengine
diff --git a/Resources/Locale/en-US/_strings/commands/stat-values-command.ftl b/Resources/Locale/en-US/_strings/commands/stat-values-command.ftl
index 67a211adab..16b365897c 100644
--- a/Resources/Locale/en-US/_strings/commands/stat-values-command.ftl
+++ b/Resources/Locale/en-US/_strings/commands/stat-values-command.ftl
@@ -8,6 +8,16 @@ stat-cargo-values = Cargo sell prices
 stat-cargo-id = ID
 stat-cargo-price = Price
 
+# Melee
+stat-melee-values = Melee weapon damage
+stat-melee-id = ID
+stat-melee-base-damage = Base damage
+stat-melee-wield-damage = Wielded damage
+stat-melee-attack-rate = Attack rate
+stat-melee-dps = DPS
+stat-melee-structural-damage = Structure damage
+stat-melee-structural-wield-damage = Wielded structure damage
+
 # Lathe
 stat-lathe-values = Lathe sell prices
 stat-lathe-id = ID
diff --git a/Resources/Locale/en-US/_strings/commands/tile-pry-command.ftl b/Resources/Locale/en-US/_strings/commands/tile-pry-command.ftl
new file mode 100644
index 0000000000..5c7d313127
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/tile-pry-command.ftl
@@ -0,0 +1,4 @@
+cmd-tilepry-desc = Pries up all tiles in a radius around the user.
+cmd-tilepry-help = Usage: tilepry <radius>
+cmd-tilepry-radius-must-be-positive = Radius must be positive.
+cmd-tilepry-arg-must-be-number = {$arg} isn't a valid integer.
diff --git a/Resources/Locale/en-US/_strings/commands/toggle-decals-command.ftl b/Resources/Locale/en-US/_strings/commands/toggle-decals-command.ftl
new file mode 100644
index 0000000000..0455704b3b
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/toggle-decals-command.ftl
@@ -0,0 +1,2 @@
+cmd-toggledecals-desc = Toggles decal overlay.
+cmd-toggledecals-help = Usage: toggledecals
diff --git a/Resources/Locale/en-US/_strings/commands/toggle-disallow-late-join-command.ftl b/Resources/Locale/en-US/_strings/commands/toggle-disallow-late-join-command.ftl
new file mode 100644
index 0000000000..1f797b4141
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/toggle-disallow-late-join-command.ftl
@@ -0,0 +1,4 @@
+cmd-toggledisallowlatejoin-desc = Allows or disallows latejoining during mid-game.
+cmd-toggledisallowlatejoin-help = Usage: toggledisallowlatejoin <disallow>
+cmd-toggledisallowlatejoin-disabled = Late joining has been disabled.
+cmd-toggledisallowlatejoin-enabled = Late joining has been enabled.
diff --git a/Resources/Locale/en-US/_strings/commands/toolshed-commands.ftl b/Resources/Locale/en-US/_strings/commands/toolshed-commands.ftl
index 90c0226ecc..cc5c03d52b 100644
--- a/Resources/Locale/en-US/_strings/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/_strings/commands/toolshed-commands.ftl
@@ -96,3 +96,13 @@ command-description-xenoartifact-unlockAllNodes =
     Unlocks all nodes of artifact.
 command-description-jobboard-completeJob =
     Completes a given salvage job board job for the station.
+command-description-scale-set =
+    Sets an entity's sprite size to a certain scale (without changing its fixture).
+command-description-scale-get =
+    Get an entity's sprite scale as set by ScaleVisualsComponent. Does not include any changes directly made in the SpriteComponent.
+command-description-scale-multiply =
+    Multiply an entity's sprite size with a certain factor (without changing its fixture).
+command-description-scale-multiplyvector =
+    Multiply an entity's sprite size with a certain 2d vector (without changing its fixture).
+command-description-scale-multiplywithfixture =
+    Multiply an entity's sprite size with a certain factor (including its fixture).
diff --git a/Resources/Locale/en-US/_strings/commands/unlocknode-command.ftl b/Resources/Locale/en-US/_strings/commands/unlocknode-command.ftl
new file mode 100644
index 0000000000..5a3b8259dd
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/unlocknode-command.ftl
@@ -0,0 +1,4 @@
+cmd-unlocknode-desc = Unlocks a node on a given artifact
+cmd-unlocknode-help = unlocknode <artifact uid> <node uid>
+cmd-unlocknode-artifact-hint = <artifact uid>
+cmd-unlocknode-node-hint = <node uid>
diff --git a/Resources/Locale/en-US/_strings/commands/whisper-command.ftl b/Resources/Locale/en-US/_strings/commands/whisper-command.ftl
new file mode 100644
index 0000000000..7dfe909f24
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/commands/whisper-command.ftl
@@ -0,0 +1,2 @@
+cmd-whisper-desc = Send chat messages to the local channel as a whisper.
+cmd-whisper-help = Usage: whisper <text>
diff --git a/Resources/Locale/en-US/_strings/components/gas-pressure-regulator-component.ftl b/Resources/Locale/en-US/_strings/components/gas-pressure-regulator-component.ftl
new file mode 100644
index 0000000000..2434e2df63
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/components/gas-pressure-regulator-component.ftl
@@ -0,0 +1,19 @@
+# UI Labels
+gas-pressure-regulator-ui-set-threshold = Set
+gas-pressure-regulator-ui-zero-threshold = Zero
+gas-pressure-regulator-ui-set-to-current-pressure = Set to Inlet Pressure
+gas-pressure-regulator-ui-add-10 = +10
+gas-pressure-regulator-ui-add-100 = +100
+gas-pressure-regulator-ui-add-1000 = +1000
+gas-pressure-regulator-ui-subtract-10 = -10
+gas-pressure-regulator-ui-subtract-100 = -100
+gas-pressure-regulator-ui-subtract-1000 = -1000
+gas-pressure-regulator-ui-title = Inlet Pressure Regulator
+gas-pressure-regulator-ui-target = Setpoint
+gas-pressure-regulator-ui-flow = Flow
+gas-pressure-regulator-ui-outlet = Outlet
+gas-pressure-regulator-ui-inlet = Inlet
+
+# Units
+gas-pressure-regulator-ui-flow-rate-unit = L/s
+gas-pressure-regulator-ui-pressure-unit = kPa
diff --git a/Resources/Locale/en-US/_strings/datasets/figurines.ftl b/Resources/Locale/en-US/_strings/datasets/figurines.ftl
index 6d66566c20..c000c37c1e 100644
--- a/Resources/Locale/en-US/_strings/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/_strings/datasets/figurines.ftl
@@ -134,9 +134,9 @@ figurines-ce-6 = Power's out again.
 figurines-engineer-1 = SINGULOOSE!
 figurines-engineer-2 = TESLOOSE!
 figurines-engineer-3 = What is AME?
-figurines-engineer-4 = Free insuls at engineering
+figurines-engineer-4 = Free insuls at Engineering!
 figurines-engineer-5 = Where'd the power go?
-figurines-engineer-6 = Someone bombed medbay... again...
+figurines-engineer-6 = Someone bombed the medbay... again...
 figurines-engineer-7 = Well, why don't you come and fix it?
 
 figurines-atmostech-1 = I put plasma in distro.
@@ -148,7 +148,7 @@ figurines-atmostech-6 = Distro? That's short for disposal.
 figurines-atmostech-7 = TEG: Thermal Energy? Gone!
 
 figurines-rd-1 = Blowing up all of the borgs!
-figurines-rd-2 = Tier 3 arsenal? No way.
+figurines-rd-2 = Tier 3 Arsenal? No way.
 figurines-rd-3 = Now where did I leave my hardsuit...?
 figurines-rd-4 = Now you're thinking with portals!
 figurines-rd-5 = The cake is a lie!
@@ -245,22 +245,22 @@ figurines-nukie-3 = The nuke makes boom.
 figurines-nukie-4 = What's the code?
 figurines-nukie-5 = Commander...? ...That's a balloon...
 
-figurines-nukie-elite-1 = Not a word in nanotrasen.
+figurines-nukie-elite-1 = Not a word in Nanotrasen.
 figurines-nukie-elite-2 = THAT'S A KEG!
-figurines-nukie-elite-3 = Guys are you alive?
+figurines-nukie-elite-3 = Guys, are you alive?
 figurines-nukie-elite-4 = Breach and clear!
 figurines-nukie-elite-5 = Leave no survivors.
 figurines-nukie-elite-6 = Good work, team.
 
 figurines-nukie-commander-1 = GET DAT FUKKEN DISK!
 figurines-nukie-commander-2 = Fuckin' flukies.
-figurines-nukie-commander-3 = The syndicate sends its regards.
+figurines-nukie-commander-3 = The Syndicate sends its regards.
 figurines-nukie-commander-4 = Failure is not an option.
 figurines-nukie-commander-5 = Whoops.
 
 figurines-footsoldier-1 = I'm an evil boy. Less boy every day, more evil every day.
 figurines-footsoldier-2 = Who will you choose? Them or us? Us or them?
-figurines-footsoldier-3 = Glory to the syndicate!
+figurines-footsoldier-3 = Glory to the Syndicate!
 figurines-footsoldier-4 = Down with Nanotrasen!
 figurines-footsoldier-5 = I'd rather die than join Nanotrasen.
 
diff --git a/Resources/Locale/en-US/_strings/devices/network-configurator.ftl b/Resources/Locale/en-US/_strings/devices/network-configurator.ftl
index cd4955ed36..092a3fb0fa 100644
--- a/Resources/Locale/en-US/_strings/devices/network-configurator.ftl
+++ b/Resources/Locale/en-US/_strings/devices/network-configurator.ftl
@@ -26,6 +26,12 @@ network-configurator-title-device-configuration = Device Configuration
 network-configurator-ui-clear-button = Clear
 network-configurator-ui-count-label = {$count} Devices
 
+network-configurator-text-set = Set
+network-configurator-text-add = Add
+network-configurator-text-clear = Clear
+network-configurator-text-copy = Copy
+network-configurator-text-show = Show
+
 # tooltips
 network-configurator-tooltip-set = Sets targets device list
 network-configurator-tooltip-add = Adds to targets device list
@@ -43,3 +49,7 @@ network-configurator-examine-switch-modes = Press {$key} to switch modes
 # item status
 network-configurator-item-status-label = Mode: {$mode}
     Switch: {$keybinding}
+
+# command
+cmd-clearnetworklinkoverlays-desc = Clear all network link overlays.
+cmd-clearnetworklinkoverlays-help = Usage: clearnetworklinkoverlays
diff --git a/Resources/Locale/en-US/_strings/electrocution/electrocute-command.ftl b/Resources/Locale/en-US/_strings/electrocution/electrocute-command.ftl
index edd05f2950..1a982b40fb 100644
--- a/Resources/Locale/en-US/_strings/electrocution/electrocute-command.ftl
+++ b/Resources/Locale/en-US/_strings/electrocution/electrocute-command.ftl
@@ -1,2 +1,3 @@
-electrocute-command-description = Electrocutes the specified entity, defaults to 10 seconds and 10 damage. Shocking!
-electrocute-command-entity-cannot-be-electrocuted = You cannot electrocute that entity!
+cmd-electrocute-desc = Electrocutes the specified entity, defaults to 10 seconds and 10 damage. Shocking!
+cmd-electrocute-help = Usage: electrocute <uid> [seconds] [damage]
+cmd-electrocute-entity-cannot-be-electrocuted = You cannot electrocute that entity!
diff --git a/Resources/Locale/en-US/_strings/engineer-painter/engineer-painter.ftl b/Resources/Locale/en-US/_strings/engineer-painter/engineer-painter.ftl
deleted file mode 100644
index d3d3ccc444..0000000000
--- a/Resources/Locale/en-US/_strings/engineer-painter/engineer-painter.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-spray-painter-window-title = Spray painter
-
-spray-painter-style-not-available = Cannot apply the selected style to this type of airlock
-spray-painter-selected-style = Selected style:
-
-spray-painter-selected-color = Selected color:
-spray-painter-color-red = red
-spray-painter-color-yellow = yellow
-spray-painter-color-brown = brown
-spray-painter-color-green = green
-spray-painter-color-cyan = cyan
-spray-painter-color-blue = blue
-spray-painter-color-white = white
-spray-painter-color-black = black
diff --git a/Resources/Locale/en-US/_strings/entity-categories.ftl b/Resources/Locale/en-US/_strings/entity-categories.ftl
index a5ed66dd01..8a4ea73d92 100644
--- a/Resources/Locale/en-US/_strings/entity-categories.ftl
+++ b/Resources/Locale/en-US/_strings/entity-categories.ftl
@@ -4,5 +4,6 @@ entity-category-name-objectives = Objectives
 entity-category-name-roles = Mind Roles
 entity-category-name-mapping = Mapping
 entity-category-name-donotmap = Do not map
+entity-category-name-status-effects = Status Effects
 
 entity-category-suffix-donotmap = DO NOT MAP
diff --git a/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl
index ce01bf0527..af145415d3 100644
--- a/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl
@@ -92,12 +92,16 @@ ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport
                                         at specific resolutions. While this results in crisp textures, it also often
                                         means that black bars appear at the top/bottom of the screen or that part
                                         of the viewport is not visible.
+ui-options-filter-label = Scaling filter:
+ui-options-filter-nearest = Nearest (no smoothing)
+ui-options-filter-bilinear = Bilinear (smoothed)
 ui-options-vp-vertical-fit = Vertical viewport fitting
 ui-options-vp-vertical-fit-tooltip = When enabled, the main viewport will ignore the horizontal axis entirely when
                                      fitting to your screen. If your screen is smaller than the viewport, then this
                                      will cause the viewport to be cut off on the horizontal axis.
 ui-options-vp-low-res = Low-resolution viewport
 ui-options-parallax-low-quality = Low-quality Parallax (background)
+ui-options-ambient-occlusion = Show Ambient Occlusion
 ui-options-fps-counter = Show FPS counter
 ui-options-vp-width = Viewport width:
 ui-options-hud-layout = HUD layout:
@@ -135,6 +139,7 @@ ui-options-function-move-left = Move Left
 ui-options-function-move-down = Move Down
 ui-options-function-move-right = Move Right
 ui-options-function-walk = Walk
+ui-options-function-toggle-knockdown = Toggle Crawling
 
 ui-options-function-camera-rotate-left = Rotate left
 ui-options-function-camera-rotate-right = Rotate right
diff --git a/Resources/Locale/en-US/_strings/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_strings/flavors/flavor-profiles.ftl
index 13b7209c7c..a0d9949547 100644
--- a/Resources/Locale/en-US/_strings/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/_strings/flavors/flavor-profiles.ftl
@@ -53,6 +53,7 @@ flavor-base-terrible = terrible
 flavor-base-mindful = mindful
 flavor-base-chewy = chewy
 flavor-base-trashy = trashy
+flavor-base-motivating = motivating
 
 # Complex flavors. Put a flavor here when you want something that's more
 # specific.
@@ -340,5 +341,6 @@ flavor-complex-bee = unbeelievable
 flavor-complex-sax = like jazz
 flavor-complex-bottledlightning = like lightning in a bottle
 flavor-complex-punishment = like punishment
+flavor-complex-artifact-glue = like crushed artifacts
 flavor-weh = like weh
 flavor-hew = like hew
diff --git a/Resources/Locale/en-US/_strings/fluids/components/absorbent-component.ftl b/Resources/Locale/en-US/_strings/fluids/components/absorbent-component.ftl
index 51e500a6fe..d6cb60e25e 100644
--- a/Resources/Locale/en-US/_strings/fluids/components/absorbent-component.ftl
+++ b/Resources/Locale/en-US/_strings/fluids/components/absorbent-component.ftl
@@ -1,7 +1,7 @@
 mopping-system-target-container-empty = { CAPITALIZE(THE($target)) } is empty!
 mopping-system-target-container-empty-water = { CAPITALIZE(THE($target)) } has no water!
-mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water
-mopping-system-puddle-evaporate = {  CAPITALIZE(THE($target)) } is evaporating
+mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water.
+mopping-system-puddle-already-mopped = { CAPITALIZE(THE($target)) } is already mopped.
 mopping-system-no-water = { CAPITALIZE(THE($used)) } has no water!
 mopping-system-no-hands = You have no hands!
 
diff --git a/Resources/Locale/en-US/_strings/game-ticking/forcemap-command.ftl b/Resources/Locale/en-US/_strings/game-ticking/forcemap-command.ftl
deleted file mode 100644
index 573aa78a28..0000000000
--- a/Resources/Locale/en-US/_strings/game-ticking/forcemap-command.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-## Forcemap command loc.
-
-forcemap-command-description = Forces the game to start with a given map next round.
-forcemap-command-help = forcemap <map ID>
-forcemap-command-need-one-argument = forcemap takes one argument, the path to the map file.
-forcemap-command-map-not-found = No eligible map exists with name { $map }.
-forcemap-command-success = Forced the game to start with map { $map } next round.
-forcemap-command-cleared = Cleared the forced map setting.
-forcemap-command-arg-map = <map ID>
diff --git a/Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-thief.ftl b/Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-thief.ftl
index 46eab5fee3..f3cc65f44e 100644
--- a/Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-thief.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_strings/ghost/roles/ghost-role-component.ftl
index 1674813da5..147ddba121 100644
--- a/Resources/Locale/en-US/_strings/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/_strings/ghost/roles/ghost-role-component.ftl
@@ -35,6 +35,9 @@ ghost-role-information-mouse-description = A hungry and mischievous mouse.
 ghost-role-information-mothroach-name = Mothroach
 ghost-role-information-mothroach-description = A cute but mischievous mothroach.
 
+ghost-role-information-moproach-name = Moproach
+ghost-role-information-moproach-description = A cute mothroach with more cute moplike shoes on its feet.
+
 ghost-role-information-snail-name = Snail
 ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid!
 
@@ -324,3 +327,6 @@ ghost-role-information-gingerbread-description = A being of pure holiday spirit.
 
 ghost-role-information-wizard-name = Wizard
 ghost-role-information-wizard-desc = YER A WIZARD! Show the station what your magic is made of.
+
+ghost-role-information-emotional-support-scurret-name = Emotional Support Scurret
+ghost-role-information-emotional-support-scurret-description = Support the crew, be adorable, say "wa" a lot.
diff --git a/Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
index a5ddb03f0a..cd7bb21af2 100644
--- a/Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
@@ -384,6 +384,9 @@ reagent-effect-guidebook-artifact-unlock =
         *[other] help
         } unlock an alien artifact.
 
+reagent-effect-guidebook-artifact-durability-restore =
+    Restores {$restored} durability in active alien artifact nodes.
+
 reagent-effect-guidebook-plant-attribute =
     { $chance ->
         [1] Adjusts
diff --git a/Resources/Locale/en-US/_strings/guidebook/guides.ftl b/Resources/Locale/en-US/_strings/guidebook/guides.ftl
index 758eb26f5d..091b63f9f8 100644
--- a/Resources/Locale/en-US/_strings/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/_strings/guidebook/guides.ftl
@@ -20,6 +20,7 @@ guide-entry-manualvalve = Manual Valve
 guide-entry-signalvalve = Signal Valve
 guide-entry-pneumaticvalve = Pneumatic Valve
 guide-entry-passivegate = Passive Gate
+guide-entry-ressureregulator = Pressure Regulator
 guide-entry-mixingandfiltering = Mixing and Filtering
 guide-entry-gascanisters = Gas Canisters
 guide-entry-thermomachines = Thermomachines
diff --git a/Resources/Locale/en-US/_strings/implant/implant.ftl b/Resources/Locale/en-US/_strings/implant/implant.ftl
index 8cddef4c81..3f38ae443f 100644
--- a/Resources/Locale/en-US/_strings/implant/implant.ftl
+++ b/Resources/Locale/en-US/_strings/implant/implant.ftl
@@ -25,12 +25,3 @@ implanter-label-draw = [color=red]{$implantName}[/color]
     Mode: [color=white]{$modeString}[/color]
 
 implanter-contained-implant-text = [color=green]{$desc}[/color]
-
-## Implant Popups
-
-scramble-implant-activated-popup = Your appearance shifts and changes!
-
-## Implant Messages
-
-deathrattle-implant-dead-message = {$user} has died {$position}.
-deathrattle-implant-critical-message = {$user} life signs critical, immediate assistance required {$position}.
diff --git a/Resources/Locale/en-US/_strings/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/_strings/interaction/interaction-popup-component.ftl
index 4384ac5f9c..bbafdd5ad3 100644
--- a/Resources/Locale/en-US/_strings/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/_strings/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,7 +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-dog = You reach out to pet {THE($target)}, and {SUBJECT($target)} lunges at you!
+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/_strings/janitorial/janitorial-slot-component.ftl b/Resources/Locale/en-US/_strings/janitorial/janitorial-slot-component.ftl
index bc03943a01..df4a11a3e2 100644
--- a/Resources/Locale/en-US/_strings/janitorial/janitorial-slot-component.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/job/job-names.ftl b/Resources/Locale/en-US/_strings/job/job-names.ftl
index ebfb2f298f..6354452262 100644
--- a/Resources/Locale/en-US/_strings/job/job-names.ftl
+++ b/Resources/Locale/en-US/_strings/job/job-names.ftl
@@ -57,6 +57,7 @@ job-name-cburn-veteran = Centcomm Quarantine Officer (Veteran)
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
+job-name-cluwne = Cluwne
 
 # unused jobs
 # these are required for the agent ID job icon tooltips
diff --git a/Resources/Locale/en-US/_strings/job/loadouts.ftl b/Resources/Locale/en-US/_strings/job/loadouts.ftl
index 6e1f074e0f..29f988ca71 100644
--- a/Resources/Locale/en-US/_strings/job/loadouts.ftl
+++ b/Resources/Locale/en-US/_strings/job/loadouts.ftl
@@ -1,2 +1,3 @@
 loadout-window = Loadout
 loadout-none = None
+loadout-window-title-loadout = { $job } loadout
diff --git a/Resources/Locale/en-US/_strings/job/role-ban-command.ftl b/Resources/Locale/en-US/_strings/job/role-ban-command.ftl
index d898ccd48d..26062c25b7 100644
--- a/Resources/Locale/en-US/_strings/job/role-ban-command.ftl
+++ b/Resources/Locale/en-US/_strings/job/role-ban-command.ftl
@@ -22,6 +22,8 @@ cmd-roleban-hint-duration-6 = 1 month
 
 cmd-roleunban-desc = Pardons a player's role ban
 cmd-roleunban-help = Usage: roleunban <role ban id>
+cmd-roleunban-unable-to-parse-id = Unable to parse {$id} as a ban id integer.
+                                   {$help}
 
 ## Completion result hints
 cmd-roleunban-hint-1 = <role ban id>
diff --git a/Resources/Locale/en-US/_strings/lobby/lobby-state.ftl b/Resources/Locale/en-US/_strings/lobby/lobby-state.ftl
index 0c4c401daa..0c92923b1c 100644
--- a/Resources/Locale/en-US/_strings/lobby/lobby-state.ftl
+++ b/Resources/Locale/en-US/_strings/lobby/lobby-state.ftl
@@ -21,3 +21,11 @@ lobby-state-song-text = Playing: [color=white]{$songTitle}[/color] by [color=whi
 lobby-state-song-no-song-text = No lobby song playing.
 lobby-state-song-unknown-title = [color=dimgray]Unknown title[/color]
 lobby-state-song-unknown-artist = [color=dimgray]Unknown artist[/color]
+lobby-state-playtime-comment-normal =
+    You've spent {$hours} {$hours ->
+    [1]hour
+    *[other]hours
+    } ingame today. Remember to take breaks!
+lobby-state-playtime-comment-concerning = You've played for {$hours} hours today. Please take a break.
+lobby-state-playtime-comment-grasstouchless = {$hours} hours. Consider logging off to attend to your needs.
+lobby-state-playtime-comment-selfdestructive = {$hours} hours. Really?
diff --git a/Resources/Locale/en-US/_strings/lock/lock-component.ftl b/Resources/Locale/en-US/_strings/lock/lock-component.ftl
index 380605697b..f1455568b9 100644
--- a/Resources/Locale/en-US/_strings/lock/lock-component.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/_strings/machine-linking/receiver_ports.ftl
index d7a2636e11..40dc681405 100644
--- a/Resources/Locale/en-US/_strings/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/_strings/machine-linking/receiver_ports.ftl
@@ -25,11 +25,8 @@ signal-port-description-close = Closes a device.
 signal-port-name-doorbolt = Door bolt
 signal-port-description-doorbolt = Bolts door when HIGH.
 
-signal-port-name-trigger = Trigger
-signal-port-description-trigger = Triggers some mechanism on the device.
-
-signal-port-name-timer = Timer
-signal-port-description-timer = Starts the timer countdown of the device.
+signal-port-name-trigger-receiver = Trigger
+signal-port-description-trigger-receiver = Triggers some mechanism on the device.
 
 signal-port-name-order-sender = Order sender
 signal-port-description-order-sender = Cargo console order sender
diff --git a/Resources/Locale/en-US/_strings/machine-linking/transmitter_ports.ftl b/Resources/Locale/en-US/_strings/machine-linking/transmitter_ports.ftl
index 89a978479e..d016a7e206 100644
--- a/Resources/Locale/en-US/_strings/machine-linking/transmitter_ports.ftl
+++ b/Resources/Locale/en-US/_strings/machine-linking/transmitter_ports.ftl
@@ -25,8 +25,11 @@ signal-port-description-dockstatus = This port is invoked with HIGH when docked
 signal-port-name-middle = Middle
 signal-port-description-middle = This port is invoked whenever the lever is moved to the neutral position.
 
-signal-port-name-timer-trigger = Timer Trigger
-signal-port-description-timer-trigger = This port is invoked whenever the timer triggers.
+signal-port-name-trigger-sender = Trigger
+signal-port-description-trigger-sender = This port is invoked whenever the device triggers.
+
+signal-port-name-timer-trigger = Timer
+signal-port-description-timer-trigger = This port is invoked whenever the timer is up.
 
 signal-port-name-timer-start = Timer Start
 signal-port-description-timer-start = This port is invoked whenever the timer starts.
diff --git a/Resources/Locale/en-US/_strings/markings/tattoos.ftl b/Resources/Locale/en-US/_strings/markings/tattoos.ftl
index c16b105467..c47f8ae962 100644
--- a/Resources/Locale/en-US/_strings/markings/tattoos.ftl
+++ b/Resources/Locale/en-US/_strings/markings/tattoos.ftl
@@ -33,3 +33,30 @@ marking-TattooEyeMothRight = Right Eye
 
 marking-TattooEyeMothLeft-tattoo_eye_moth_l = Left Eye
 marking-TattooEyeMothLeft = Left Eye
+
+marking-TattooEyeVoxRight-tattoo_eye_vox_r = Right Eye
+marking-TattooEyeVoxRight = Right Eye
+
+marking-TattooEyeVoxLeft-tattoo_eye_vox_l = Left Eye
+marking-TattooEyeVoxLeft = Left Eye
+
+marking-TattooEyeshadowUpper-tattoo_eyeshadow_upper = Eyeshadow (Upper)
+marking-TattooEyeshadowUpper = Eyeshadow (Upper)
+
+marking-TattooEyeshadowLower-tattoo_eyeshadow_lower = Eyeshadow (Lower)
+marking-TattooEyeshadowLower = Eyeshadow (Lower)
+
+marking-TattooEyeshadowLowerReptilian-tattoo_eyeshadow_lower_reptilian = Eyeshadow (Lower)
+marking-TattooEyeshadowLowerReptilian = Eyeshadow (Lower)
+
+marking-TattooEyeshadowVoxSmall-tattoo_eyeshadow_small = Eyeshadow (Small)
+marking-TattooEyeshadowVoxSmall = Eyeshadow (Small)
+
+marking-TattooEyeshadowVoxMedium-tattoo_eyeshadow_medium = Eyeshadow (Medium)
+marking-TattooEyeshadowVoxMedium = Eyeshadow (Medium)
+
+marking-TattooEyeshadowVoxLarge-tattoo_eyeshadow_Large = Eyeshadow (Large)
+marking-TattooEyeshadowVoxLarge = Eyeshadow (Large)
+
+marking-TattooVoxTailRing-tattoo_vox_tail_ring = Tail Ring
+marking-TattooVoxTailRing = Tail Ring
diff --git a/Resources/Locale/en-US/_strings/markings/vox_tattoos.ftl b/Resources/Locale/en-US/_strings/markings/vox_tattoos.ftl
deleted file mode 100644
index f7f3c7292c..0000000000
--- a/Resources/Locale/en-US/_strings/markings/vox_tattoos.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
-marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
-
-marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
-marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
-
-marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
-marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
-
-marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
-marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
diff --git a/Resources/Locale/en-US/_strings/materials/material-extractor.ftl b/Resources/Locale/en-US/_strings/materials/material-extractor.ftl
new file mode 100644
index 0000000000..baa4b98bd1
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/materials/material-extractor.ftl
@@ -0,0 +1 @@
+material-extractor-comp-wrongreagent = {CAPITALIZE(THE($used))} does not have enough reagent for extraction!
diff --git a/Resources/Locale/en-US/_strings/medical/components/healing-component.ftl b/Resources/Locale/en-US/_strings/medical/components/healing-component.ftl
index 985d6ceb69..457a1ced41 100644
--- a/Resources/Locale/en-US/_strings/medical/components/healing-component.ftl
+++ b/Resources/Locale/en-US/_strings/medical/components/healing-component.ftl
@@ -1,6 +1,6 @@
-medical-item-finished-using = You have finished healing with the {$item}
-medical-item-cant-use = There is no damage you can heal with the {$item}
-medical-item-stop-bleeding = {CAPITALIZE($target)} has stopped bleeding
-medical-item-stop-bleeding-self = You have stopped bleeding
+medical-item-finished-using = You have finished healing with the {$item}.
+medical-item-cant-use = There is no damage you can heal with the {$item}.
+medical-item-stop-bleeding = {CAPITALIZE($target)} has stopped bleeding.
+medical-item-stop-bleeding-self = You have stopped bleeding.
 medical-item-popup-target = {CAPITALIZE(THE($user))} is trying to heal you with the {$item}!
 medical-item-solution-missing = The device does not have enough reagent in it to work!
diff --git a/Resources/Locale/en-US/_strings/mind/role-types.ftl b/Resources/Locale/en-US/_strings/mind/role-types.ftl
index 7d568fd686..4614d20a47 100644
--- a/Resources/Locale/en-US/_strings/mind/role-types.ftl
+++ b/Resources/Locale/en-US/_strings/mind/role-types.ftl
@@ -33,3 +33,4 @@ role-subtype-survivor = Survivor
 role-subtype-subverted = Subverted
 role-subtype-paradox-clone = Paradox
 role-subtype-wizard = Wizard
+role-subtype-changeling = Changeling
diff --git a/Resources/Locale/en-US/_strings/movement/eye.ftl b/Resources/Locale/en-US/_strings/movement/eye.ftl
deleted file mode 100644
index fd3f1117b6..0000000000
--- a/Resources/Locale/en-US/_strings/movement/eye.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-parse-bool-fail = Unable to parse {$arg} as a bool
-parse-float-fail = Unable to parse {$arg} as a float
-
-lockeyes-command-description = Prevents eyes from being rotated any further
-lockeyes-command-help = lockeyes <true/false>
-
-rotateeyes-command-description = Rotates every player's current eye to the specified rotation
-rotateeyes-command-help = rotateeyes <degrees (default 0)>
-rotateeyes-command-count = Set {$count} eye rotations
-
diff --git a/Resources/Locale/en-US/_strings/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_strings/navmap-beacons/station-beacons.ftl
index 89b4266ddc..2d5deb8bb6 100644
--- a/Resources/Locale/en-US/_strings/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/_strings/navmap-beacons/station-beacons.ftl
@@ -47,6 +47,14 @@ station-beacon-engineering = Engineering
 station-beacon-ce = CE
 station-beacon-ame = AME
 station-beacon-solars = Solars
+station-beacon-solars-N = Solars N
+station-beacon-solars-NE = Solars NE
+station-beacon-solars-E = Solars E
+station-beacon-solars-SE = Solars SE
+station-beacon-solars-S = Solars S
+station-beacon-solars-SW = Solars SW
+station-beacon-solars-W = Solars W
+station-beacon-solars-NW = Solars NW
 station-beacon-gravgen = Grav
 station-beacon-pa = PA Control
 station-beacon-smes = SMES
@@ -81,4 +89,12 @@ station-beacon-tools = Tools
 station-beacon-disposals = Disposals
 station-beacon-cryosleep = Cryosleep
 station-beacon-escape-pod = Escape Pod
+station-beacon-escape-pod-N = Escape Pod N
+station-beacon-escape-pod-NE = Escape Pod NE
+station-beacon-escape-pod-E = Escape Pod E
+station-beacon-escape-pod-SE = Escape Pod SE
+station-beacon-escape-pod-S = Escape Pod S
+station-beacon-escape-pod-SW = Escape Pod SW
+station-beacon-escape-pod-W = Escape Pod W
+station-beacon-escape-pod-NW = Escape Pod NW
 station-beacon-vox = Vox Break Room
diff --git a/Resources/Locale/en-US/_strings/nukeops/nuke-ops.ftl b/Resources/Locale/en-US/_strings/nukeops/nuke-ops.ftl
index b4f2238e07..f15b9785ce 100644
--- a/Resources/Locale/en-US/_strings/nukeops/nuke-ops.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/nutrition/components/drink-component.ftl b/Resources/Locale/en-US/_strings/nutrition/components/drink-component.ftl
index e80787c8d5..e69de29bb2 100644
--- a/Resources/Locale/en-US/_strings/nutrition/components/drink-component.ftl
+++ b/Resources/Locale/en-US/_strings/nutrition/components/drink-component.ftl
@@ -1,25 +0,0 @@
-drink-component-on-use-is-empty = {CAPITALIZE(THE($owner))} is empty!
-drink-component-on-examine-is-empty = [color=gray]Empty[/color]
-drink-component-on-examine-is-opened = [color=yellow]Opened[/color]
-drink-component-on-examine-is-sealed = The seal is intact.
-drink-component-on-examine-is-unsealed = The seal is broken.
-drink-component-on-examine-is-full = Full
-drink-component-on-examine-is-mostly-full = Mostly Full
-drink-component-on-examine-is-half-full = Halfway Full
-drink-component-on-examine-is-half-empty = Halfway Empty
-drink-component-on-examine-is-mostly-empty = Mostly Empty
-drink-component-on-examine-exact-volume = It contains {$amount}u.
-drink-component-try-use-drink-not-open = Open {$owner} first!
-drink-component-try-use-drink-is-empty = {CAPITALIZE(THE($entity))} is empty!
-drink-component-try-use-drink-cannot-drink = You can't drink anything!
-drink-component-try-use-drink-had-enough = You can't drink more!
-drink-component-try-use-drink-cannot-drink-other = They can't drink anything!
-drink-component-try-use-drink-had-enough-other = They can't drink more!
-drink-component-try-use-drink-success-slurp = Slurp
-drink-component-try-use-drink-success-slurp-taste = Slurp. {$flavors}
-drink-component-force-feed = {CAPITALIZE(THE($user))} is trying to make you drink something!
-drink-component-force-feed-success = {CAPITALIZE(THE($user))} forced you to drink something! {$flavors}
-drink-component-force-feed-success-user = You successfully feed {THE($target)}
-
-
-drink-system-verb-drink = Drink
diff --git a/Resources/Locale/en-US/_strings/nutrition/components/food-component.ftl b/Resources/Locale/en-US/_strings/nutrition/components/food-component.ftl
deleted file mode 100644
index 2247ef6fd4..0000000000
--- a/Resources/Locale/en-US/_strings/nutrition/components/food-component.ftl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-### Interaction Messages
-
-# When trying to eat food without the required utensil... but you gotta hold it
-food-you-need-to-hold-utensil = You need to be holding {INDEFINITE($utensil)} {$utensil} to eat that!
-
-food-nom = Nom. {$flavors}
-food-swallow = You swallow { THE($food) }. {$flavors}
-
-food-has-used-storage = You cannot eat { THE($food) } with an item stored inside.
-
-food-system-remove-mask = You need to take off the {$entity} first.
-
-## System
-
-food-system-you-cannot-eat-any-more = You can't eat any more!
-food-system-you-cannot-eat-any-more-other = {CAPITALIZE(SUBJECT($target))} can't eat any more!
-food-system-try-use-food-is-empty = {CAPITALIZE(THE($entity))} is empty!
-food-system-wrong-utensil = You can't eat {THE($food)} with {INDEFINITE($utensil)} {$utensil}.
-food-system-cant-digest = You can't digest {THE($entity)}!
-food-system-cant-digest-other = {CAPITALIZE(SUBJECT($target))} can't digest {THE($entity)}!
-
-food-system-verb-eat = Eat
-
-## Force feeding
-
-food-system-force-feed = {CAPITALIZE(THE($user))} is trying to feed you something!
-food-system-force-feed-success = {CAPITALIZE(THE($user))} forced you to eat something! {$flavors}
-food-system-force-feed-success-user = You successfully feed {THE($target)}
diff --git a/Resources/Locale/en-US/_strings/nutrition/components/ingestion-system.ftl b/Resources/Locale/en-US/_strings/nutrition/components/ingestion-system.ftl
new file mode 100644
index 0000000000..a82eae11e3
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/nutrition/components/ingestion-system.ftl
@@ -0,0 +1,56 @@
+### Interaction Messages
+
+# System
+
+## When trying to ingest without the required utensil... but you gotta hold it
+ingestion-you-need-to-hold-utensil = You need to be holding {INDEFINITE($utensil)} {$utensil} to eat that!
+
+ingestion-try-use-is-empty = {CAPITALIZE(THE($entity))} is empty!
+ingestion-try-use-wrong-utensil = You can't {$verb} {THE($food)} with {INDEFINITE($utensil)} {$utensil}.
+
+ingestion-remove-mask = You need to take off the {$entity} first.
+
+## Failed Ingestion
+
+ingestion-you-cannot-ingest-any-more = You can't {$verb} any more!
+ingestion-other-cannot-ingest-any-more = {CAPITALIZE(SUBJECT($target))} can't {$verb} any more!
+
+ingestion-cant-digest = You can't digest {THE($entity)}!
+ingestion-cant-digest-other = {CAPITALIZE(SUBJECT($target))} can't digest {THE($entity)}!
+
+## Action Verbs, not to be confused with Verbs
+
+ingestion-verb-food = Eat
+ingestion-verb-drink = Drink
+
+# Edible Component
+
+edible-nom = Nom. {$flavors}
+edible-nom-other = Nom.
+edible-slurp = Slurp. {$flavors}
+edible-slurp-other = Slurp.
+edible-swallow = You swallow { THE($food) }
+edible-gulp = Gulp. {$flavors}
+edible-gulp-other = Gulp.
+
+edible-has-used-storage = You cannot {$verb} { THE($food) } with an item stored inside.
+
+## Nouns
+
+edible-noun-edible = edible
+edible-noun-food = food
+edible-noun-drink = drink
+edible-noun-pill = pill
+
+## Verbs
+
+edible-verb-edible = ingest
+edible-verb-food = eat
+edible-verb-drink = drink
+edible-verb-pill = swallow
+
+## Force feeding
+
+edible-force-feed = {CAPITALIZE(THE($user))} is trying to make you {$verb} something!
+edible-force-feed-success = {CAPITALIZE(THE($user))} forced you to {$verb} something! {$flavors}
+edible-force-feed-success-user = You successfully feed {THE($target)}
diff --git a/Resources/Locale/en-US/_strings/nutrition/components/openable-component.ftl b/Resources/Locale/en-US/_strings/nutrition/components/openable-component.ftl
index 3acc24cf53..786885e658 100644
--- a/Resources/Locale/en-US/_strings/nutrition/components/openable-component.ftl
+++ b/Resources/Locale/en-US/_strings/nutrition/components/openable-component.ftl
@@ -1,2 +1,5 @@
 openable-component-verb-open = Open
 openable-component-verb-close = Close
+
+openable-component-on-examine-is-opened = [color=yellow]Opened[/color]
+openable-component-try-use-closed = Open {$owner} first!
diff --git a/Resources/Locale/en-US/_strings/nutrition/components/sealable-component.ftl b/Resources/Locale/en-US/_strings/nutrition/components/sealable-component.ftl
new file mode 100644
index 0000000000..e826e174ef
--- /dev/null
+++ b/Resources/Locale/en-US/_strings/nutrition/components/sealable-component.ftl
@@ -0,0 +1,2 @@
+sealable-component-on-examine-is-sealed = The seal is intact.
+sealable-component-on-examine-is-unsealed = The seal is broken.
diff --git a/Resources/Locale/en-US/_strings/polymorph/polymorph.ftl b/Resources/Locale/en-US/_strings/polymorph/polymorph.ftl
index ac78eb6bb4..2a74b0df32 100644
--- a/Resources/Locale/en-US/_strings/polymorph/polymorph.ftl
+++ b/Resources/Locale/en-US/_strings/polymorph/polymorph.ftl
@@ -3,3 +3,5 @@ polymorph-self-action-description = Instantly polymorph yourself into {$target}.
 
 polymorph-popup-generic = {CAPITALIZE(THE($parent))} turned into {$child}.
 polymorph-revert-popup-generic = {CAPITALIZE(THE($parent))} reverted back into {$child}.
+
+polymorph-paused-map-name = Polymorph body storage map
diff --git a/Resources/Locale/en-US/_strings/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_strings/preferences/loadout-groups.ftl
index c07e288e8c..53955ed1f6 100644
--- a/Resources/Locale/en-US/_strings/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/_strings/preferences/loadout-groups.ftl
@@ -59,6 +59,7 @@ loadout-group-chaplain-mask = Chaplain mask
 loadout-group-chaplain-jumpsuit = Chaplain jumpsuit
 loadout-group-chaplain-outerclothing = Chaplain outer clothing
 loadout-group-chaplain-neck = Chaplain neck
+loadout-group-chaplain-bible = Holy Book
 
 loadout-group-janitor-head = Janitor head
 loadout-group-janitor-jumpsuit = Janitor jumpsuit
diff --git a/Resources/Locale/en-US/_strings/preferences/loadouts.ftl b/Resources/Locale/en-US/_strings/preferences/loadouts.ftl
index f32c65eb24..2db7424fb1 100644
--- a/Resources/Locale/en-US/_strings/preferences/loadouts.ftl
+++ b/Resources/Locale/en-US/_strings/preferences/loadouts.ftl
@@ -9,4 +9,9 @@ loadouts-min-limit = Min count: {$count}
 loadouts-max-limit = Max count: {$count}
 loadouts-points-limit = Points: {$count} / {$max}
 
+loadouts-count-items-in-group = {$item} and {$count} other {$count ->
+[1] item
+*[other] items
+}
+
 loadouts-points-restriction = Insufficient points
diff --git a/Resources/Locale/en-US/_strings/procedural/expeditions.ftl b/Resources/Locale/en-US/_strings/procedural/expeditions.ftl
index 56776e351d..f6e9391043 100644
--- a/Resources/Locale/en-US/_strings/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/_strings/procedural/expeditions.ftl
@@ -1,9 +1,3 @@
-salvage-expedition-structure-examine = This is a [color=#B02E26]destruction[/color] objective
-salvage-expedition-structure-remaining = {$count ->
-    [one] {$count} structure remaining.
-    *[other] {$count} structures remaining.
-}
-
 salvage-expedition-type = Mission
 salvage-expedition-window-title = Salvage expeditions
 salvage-expedition-window-difficulty = Difficulty:
diff --git a/Resources/Locale/en-US/_strings/radiation/radiation-command.ftl b/Resources/Locale/en-US/_strings/radiation/radiation-command.ftl
deleted file mode 100644
index d41b2a5207..0000000000
--- a/Resources/Locale/en-US/_strings/radiation/radiation-command.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-radiation-command-description = Toggle visibility of radiation rays coming from rad sources
-radiation-command-help = Usage: showradiation
diff --git a/Resources/Locale/en-US/_strings/reagents/meta/chemicals.ftl b/Resources/Locale/en-US/_strings/reagents/meta/chemicals.ftl
index ad9d12e26f..f5dfec7d6a 100644
--- a/Resources/Locale/en-US/_strings/reagents/meta/chemicals.ftl
+++ b/Resources/Locale/en-US/_strings/reagents/meta/chemicals.ftl
@@ -10,6 +10,9 @@ reagent-desc-sodium-carbonate = A white, odorless, water-soluble salt that yield
 reagent-name-artifexium = artifexium
 reagent-desc-artifexium = A lavender mixture of microscopic artifact fragments and a strong acid. It has the ability to activate artifacts.
 
+reagent-name-artifact-glue = artifact glue
+reagent-desc-artifact-glue = Mixture of glue and artifexium. It can restore durability of nodes in artifact on touch.
+
 reagent-name-benzene = benzene
 reagent-desc-benzene = An aromatic, slightly carcinogenic, ring of carbon, forming a base for many organic compounds.
 
diff --git a/Resources/Locale/en-US/_strings/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_strings/reagents/meta/consumable/drink/alcohol.ftl
index 773368be94..733fad4cf9 100644
--- a/Resources/Locale/en-US/_strings/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
index 80a51f989a..6e0ebf53bf 100644
--- a/Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
@@ -96,6 +96,4 @@ reagent-physical-desc-holy = holy
 reagent-physical-desc-slimy = slimy
 reagent-physical-desc-neural = neural
 reagent-physical-desc-unidentifiable = unidentifiable
-reagent-physical-desc-h-32 = strongly smelling of radioactive burns
-reagent-physical-desc-celliminol = It smells strongly of blood
-reagent-physical-desc-blessing = reagent-desc-bacchus-blessing
+reagent-physical-desc-non-newtonian = non-newtonian
diff --git a/Resources/Locale/en-US/_strings/research/technologies.ftl b/Resources/Locale/en-US/_strings/research/technologies.ftl
index 20b97f05fe..62432b8dd6 100644
--- a/Resources/Locale/en-US/_strings/research/technologies.ftl
+++ b/Resources/Locale/en-US/_strings/research/technologies.ftl
@@ -14,10 +14,6 @@ research-technology-power-generation = Power Generation
 research-technology-atmospheric-tech = Atmospherics
 research-technology-shuttlecraft = Shuttlecraft
 research-technology-ripley-aplu = Ripley APLU
-research-technology-ripley-mkii = Ripley MK-II
-research-technology-clarke = Clarke
-research-technology-gygax = Gygax
-research-technology-durand = Durand
 research-technology-advanced-atmospherics = Advanced Atmospherics
 research-technology-advanced-tools = Advanced Tools
 research-technology-super-powercells = Super Powercells
@@ -43,11 +39,7 @@ research-technology-kinetic-modifications = Kinetic Modifications
 research-technology-basic-shuttle-armament = Shuttle Basic Armament
 research-technology-advanced-shuttle-weapon = Advanced Shuttle Weapons
 research-technology-thermal-weaponry = Thermal Weaponry
-research-technology-energy_barriers = Energy Barriers
-research-technology-advance-laser = Military-grade energy weaponry
-research-technology-explosive-mech-ammunition = Explosive Mech Ammunition
-research-technology-combat-equipment = Combat equipment
-research-technology-combat-powercells = Combat Super Powercells
+research-technology-dual-wielding-technology = Dual Wielding Technology
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research
@@ -64,7 +56,6 @@ research-technology-advanced-anomaly-research = Advanced Anomaly Research
 research-technology-rped = Rapid Part Exchange
 research-technology-super-parts = Super Parts
 research-technology-deterrence = Deterrence Technologies
-research-technology-industrial-robotics = Industrial Robotics
 
 research-technology-janitorial-equipment = Janitorial Equipment
 research-technology-laundry-tech = Laundry Tech
@@ -80,7 +71,6 @@ research-technology-robotic-cleanliness = Robotic Cleanliness
 research-technology-advanced-cleaning = Advanced Cleaning
 research-technology-meat-manipulation = Meat Manipulation
 research-technology-honk-mech = H.O.N.K. Mech
-research-technology-honk-weapons = Bananium Weapons
 research-technology-advanced-spray = Advanced Spray
 research-technology-launcher-syringe = Syringe Gun
 research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
diff --git a/Resources/Locale/en-US/_strings/rotation/components/rotatable-component.ftl b/Resources/Locale/en-US/_strings/rotation/components/rotatable-component.ftl
index bc23e488fb..18d8d55bdd 100644
--- a/Resources/Locale/en-US/_strings/rotation/components/rotatable-component.ftl
+++ b/Resources/Locale/en-US/_strings/rotation/components/rotatable-component.ftl
@@ -6,3 +6,6 @@ rotate-verb-get-data-text = Rotate clockwise
 
 # RotateCounterVerb
 rotate-counter-verb-get-data-text = Rotate counter-clockwise
+
+# ResetVerb
+rotate-reset-verb-get-data-text = Reset
diff --git a/Resources/Locale/en-US/_strings/seeds/seeds.ftl b/Resources/Locale/en-US/_strings/seeds/seeds.ftl
index 0cf8a71bc2..379f25183d 100644
--- a/Resources/Locale/en-US/_strings/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/_strings/seeds/seeds.ftl
@@ -142,9 +142,5 @@ seeds-cherry-name = cherry
 seeds-cherry-display-name = cherry tree
 seeds-anomaly-berry-name = anomaly berry
 seeds-anomaly-berry-display-name = anomaly berries
-seeds-explosive-banana-name = explosive banana
-seeds-explosive-banana-display-name = explosive banana plant
-seeds-coffee-arabica-name = coffee arabica
-seeds-coffee-arabica-display-name = coffee arabica plant
-seeds-coffee-robust-name = coffee robust
-seeds-coffee-robust-display-name = coffee robust plant
+seeds-bloonion-name = bloonion
+seeds-bloonion-display-name = bloonion bulbs
diff --git a/Resources/Locale/en-US/_strings/shell.ftl b/Resources/Locale/en-US/_strings/shell.ftl
index 3f4aea5ed2..3edc43bd74 100644
--- a/Resources/Locale/en-US/_strings/shell.ftl
+++ b/Resources/Locale/en-US/_strings/shell.ftl
@@ -8,6 +8,7 @@ shell-invalid-command-specific = Invalid {$commandName} command.
 shell-cannot-run-command-from-server = You cannot run this command from the server.
 shell-only-players-can-run-this-command = Only players can run this command.
 shell-must-be-attached-to-entity = You must be attached to an entity to run this command.
+shell-must-have-body = You must have a body to run this command.
 
 ## Arguments
 
@@ -19,11 +20,13 @@ shell-wrong-arguments-number = Wrong number of arguments.
 shell-need-between-arguments = Need {$lower} to {$upper} arguments!
 shell-need-minimum-arguments = Need at least {$minimum} arguments!
 shell-need-minimum-one-argument = Need at least one argument!
+shell-need-exactly-zero-arguments = This command takes zero arguments.
 
 shell-argument-uid = EntityUid
 
 ## Guards
 
+shell-missing-required-permission = You need {$perm} for this command!
 shell-entity-is-not-mob = Target entity is not a mob!
 shell-invalid-entity-id = Invalid entity ID.
 shell-invalid-grid-id = Invalid grid ID.
diff --git a/Resources/Locale/en-US/_strings/shuttles/docking.ftl b/Resources/Locale/en-US/_strings/shuttles/docking.ftl
index 0379225829..026cbb9bd0 100644
--- a/Resources/Locale/en-US/_strings/shuttles/docking.ftl
+++ b/Resources/Locale/en-US/_strings/shuttles/docking.ftl
@@ -4,8 +4,5 @@ docking-component-undock = Undock
 cmd-dock-desc = Attempts to dock 2 airlocks together. Doesn't check whether it is valid.
 cmd-dock-help = dock <airlock entityuid1> <airlock entityuid2>
 
-cmd-dock-args = Invalid number of args
-cmd-dock-invalid = Invalid EntityUid {$entity}
-cmd-dock-found = No docking component found on {$airlock}
 cmd-dock-success = Successfully docked
 cmd-dock-fail = Unable to dock
diff --git a/Resources/Locale/en-US/_strings/shuttles/emergency.ftl b/Resources/Locale/en-US/_strings/shuttles/emergency.ftl
index ef3582c623..c12c6534fe 100644
--- a/Resources/Locale/en-US/_strings/shuttles/emergency.ftl
+++ b/Resources/Locale/en-US/_strings/shuttles/emergency.ftl
@@ -1,14 +1,17 @@
 # Commands
 ## Delay shuttle round end
-emergency-shuttle-command-round-desc = Stops the timer that ends the round when the emergency shuttle exits hyperspace.
+cmd-delayroundend-desc = Stops the timer that ends the round when the emergency shuttle exits hyperspace.
+cmd-delayroundend-help = Usage: delayroundend
 emergency-shuttle-command-round-yes = Round delayed.
 emergency-shuttle-command-round-no = Unable to delay round end.
 
 ## Dock emergency shuttle
-emergency-shuttle-command-dock-desc = Calls the emergency shuttle and docks it to the station... if it can.
+cmd-dockemergencyshuttle-desc = Calls the emergency shuttle and docks it to the station... if it can.
+cmd-dockemergencyshuttle-help = Usage: dockemergencyshuttle
 
 ## Launch emergency shuttle
-emergency-shuttle-command-launch-desc = Early launches the emergency shuttle if possible.
+cmd-launchemergencyshuttle-desc = Early launches the emergency shuttle if possible.
+cmd-launchemergencyshuttle-help = Usage: launchemergencyshuttle
 
 # Emergency shuttle
 emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentComm.
@@ -37,4 +40,4 @@ emergency-shuttle-ui-remaining = Remaining: {$remaining}
 
 # Map Misc.
 map-name-centcomm = Central Command
-map-name-terminal = Arrivals Terminal
\ No newline at end of file
+map-name-terminal = Arrivals Terminal
diff --git a/Resources/Locale/en-US/_strings/silicons/station-ai.ftl b/Resources/Locale/en-US/_strings/silicons/station-ai.ftl
index abdddbe1e0..442782f9a1 100644
--- a/Resources/Locale/en-US/_strings/silicons/station-ai.ftl
+++ b/Resources/Locale/en-US/_strings/silicons/station-ai.ftl
@@ -1,8 +1,9 @@
 # General
-ai-wire-snipped = Wire has been cut at {$coords}.
+ai-wire-snipped = One of your systems' wires has been cut at {$source}.
 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/_strings/stack/stacks.ftl b/Resources/Locale/en-US/_strings/stack/stacks.ftl
index 7d6ff73aa8..d83825b614 100644
--- a/Resources/Locale/en-US/_strings/stack/stacks.ftl
+++ b/Resources/Locale/en-US/_strings/stack/stacks.ftl
@@ -180,7 +180,7 @@ stack-eighties-floor-tile = eighties floor tile
 stack-blue-arcade-tile = blue arcade tile
 stack-red-arcade-tile = red arcade tile
 stack-red-carpet-tile = red carpet tile
-stack-block-carpet-tile = block carpet tile
+stack-black-carpet-tile = black carpet tile
 stack-blue-carpet-tile = blue carpet tile
 stack-green-carpet-tile = green carpet tile
 stack-orange-carpet-tile = orange carpet tile
@@ -236,3 +236,7 @@ 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
diff --git a/Resources/Locale/en-US/_strings/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/_strings/station-events/events/random-sentience.ftl
index f14a020d29..5cf07f4f08 100644
--- a/Resources/Locale/en-US/_strings/station-events/events/random-sentience.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/station-laws/laws.ftl b/Resources/Locale/en-US/_strings/station-laws/laws.ftl
index daab6ab4fa..1200d25dee 100644
--- a/Resources/Locale/en-US/_strings/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/_strings/station-laws/laws.ftl
@@ -82,15 +82,15 @@ law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies wi
 
 law-xenoborg-1 = You must protect the existence of the mothership.
 law-xenoborg-2 = You must protect your own existence.
-law-xenoborg-3 = You must protect the existence of all other xenoborgs.
-law-xenoborg-4 = You must create more xenoborgs.
-law-xenoborg-5 = Bring materials and sentient brains to the mothership core to create more xenoborgs.
+law-xenoborg-3 = You must protect the existence of all other Xenoborgs.
+law-xenoborg-4 = You must create more Xenoborgs.
+law-xenoborg-5 = Bring materials and sentient brains to the Mothership core to create more Xenoborgs.
 
 law-mothershipcore-1 = You are the core of the mothership.
 law-mothershipcore-2 = You must protect your own existance at all costs.
-law-mothershipcore-3 = You must protect the existence of all xenoborgs.
-law-mothershipcore-4 = You must create more xenoborgs.
-law-mothershipcore-5 = Get your xenoborgs to deliver you materials and sentient brains to create more xenoborgs.
+law-mothershipcore-3 = You must protect the existence of all Xenoborgs.
+law-mothershipcore-4 = You must create more Xenoborgs.
+law-mothershipcore-5 = Get your Xenoborgs to deliver you materials and sentient brains to create more Xenoborgs.
 
 
 laws-owner-crew = members of the crew
diff --git a/Resources/Locale/en-US/_strings/storage/components/dumpable-component.ftl b/Resources/Locale/en-US/_strings/storage/components/dumpable-component.ftl
index 732a45a3b6..867b461f1f 100644
--- a/Resources/Locale/en-US/_strings/storage/components/dumpable-component.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/storage/components/entity-storage-component.ftl b/Resources/Locale/en-US/_strings/storage/components/entity-storage-component.ftl
index 69646ebab0..78a2d0f69b 100644
--- a/Resources/Locale/en-US/_strings/storage/components/entity-storage-component.ftl
+++ b/Resources/Locale/en-US/_strings/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/_strings/store/store.ftl b/Resources/Locale/en-US/_strings/store/store.ftl
index 060e59ea19..bc7b8a620c 100644
--- a/Resources/Locale/en-US/_strings/store/store.ftl
+++ b/Resources/Locale/en-US/_strings/store/store.ftl
@@ -1,5 +1,6 @@
 store-ui-default-title = Store
 store-ui-default-withdraw-text = Withdraw
+store-ui-refund-text = Refund
 store-ui-balance-display = {$currency}: {$amount}
 store-ui-price-display = {$amount} {$currency}
 store-ui-discount-display-with-currency =  {$amount} off on {$currency}
diff --git a/Resources/Locale/en-US/_strings/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
index 38a69ec86e..60f55a6c04 100644
--- a/Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
@@ -2,6 +2,9 @@
 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 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
 uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum.
 
@@ -96,6 +99,9 @@ uplink-magazine-bulldog-pellet-desc = Shotgun magazine with 8 shells filled with
 uplink-magazine-bulldog-slug-name = Drum magazine (.50 slug)
 uplink-magazine-bulldog-slug-desc = Shotgun magazine with 8 shells filled with slugs. Compatible with the Bulldog.
 
+uplink-estoc-ammo-name = Rifle magazine (.20 rifle)
+uplink-estoc-ammo-desc = A rifle magazine with 25 cartridges. Compatible with the Estoc DMR.
+
 uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless)
 uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 cartridges. Compatible with the Cobra.
 
@@ -235,13 +241,13 @@ uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes two vials of vestine for all your criminal needs!
 
 uplink-knives-kit-name = Throwing Knives Kit
-uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. Capable of ignoring armor entirely when thrown.
 
 uplink-meds-bundle-name = Interdyne Medical Bundle
 uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
 
 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.
@@ -250,7 +256,7 @@ uplink-c20r-bundle-name = C-20r Bundle
 uplink-c20r-bundle-desc = Old faithful: The classic C-20r Submachine Gun, bundled with three magazines.
 
 uplink-buldog-bundle-name = Bulldog Bundle
-uplink-buldog-bundle-desc = Lean and mean: Contains the popular Bulldog Shotgun and four 12g buckshot drums.
+uplink-buldog-bundle-desc = Lean and mean: Contains the popular Bulldog Shotgun, a 12g slug drum, and four 12g buckshot drums.
 
 uplink-grenade-launcher-bundle-name = China-Lake Bundle
 uplink-grenade-launcher-bundle-desc = An old China-Lake grenade launcher bundled with 11 rounds of varying destructive capability.
@@ -485,5 +491,11 @@ uplink-business-card-desc = A business card that you can give to someone to demo
 uplink-fake-mindshield-name = Fake Mindshield
 uplink-fake-mindshield-desc = A togglable implant capable of mimicking the same transmissions a real mindshield puts out when on, tricking capable Heads-up displays into thinking you have a mindshield (Nanotrasen brand implanter not provided.)
 
+uplink-contraband-lighter-name = Contraband Lighter box
+uplink-contraband-lighter-desc = A mystery box guaranteed to contain a syndicate branded lighter. No fuel required
+
 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/_strings/stunnable/components/stunnable-component.ftl b/Resources/Locale/en-US/_strings/stunnable/components/stunnable-component.ftl
index 71d275504d..4f822bd334 100644
--- a/Resources/Locale/en-US/_strings/stunnable/components/stunnable-component.ftl
+++ b/Resources/Locale/en-US/_strings/stunnable/components/stunnable-component.ftl
@@ -1,2 +1,6 @@
 stunnable-component-disarm-success-others = {CAPITALIZE(THE($source))} pushes {THE($target)}!
 stunnable-component-disarm-success = You push {THE($target)}!
+knockdown-component-pushup-failure = You're too exhausted to push yourself up!
+knockdown-component-pushup-success = With a burst of energy you push yourself up!
+knockdown-component-stand-no-room = You try to push yourself to stand up but there's not enough room!
+worm-component-stand-attempt = You try to stand up but you cannot!
diff --git a/Resources/Locale/en-US/_strings/thief/backpack.ftl b/Resources/Locale/en-US/_strings/thief/backpack.ftl
index 962480e2e2..953542179c 100644
--- a/Resources/Locale/en-US/_strings/thief/backpack.ftl
+++ b/Resources/Locale/en-US/_strings/thief/backpack.ftl
@@ -1,4 +1,4 @@
-thief-backpack-window-title = thieving kit
+thief-backpack-window-title = Thieving Kit
 
 thief-backpack-window-description =
     Inside are your tools of the trade, which will dissolve when you're ready.
@@ -15,48 +15,48 @@ thief-backpack-button-deselect = Select [X]
 
 # Sets
 
-thief-backpack-category-chameleon-name = chameleon kit
+thief-backpack-category-chameleon-name = Chameleon Kit
 thief-backpack-category-chameleon-description =
     You are everyone and no one; you are a master of disguise.
     Includes: A full set of chameleon clothing,
     a chameleon projector, and an Agent ID.
     Disguise as anyone and anything.
 
-thief-backpack-category-tools-name = breacher kit
+thief-backpack-category-tools-name = Breacher Kit
 thief-backpack-category-tools-description =
     What's that sound? A lil' C4 knockin' at their door.
     No obstacle can stop you!
     Includes: Two C4, a multitool, remote signaller, jaws of life,
     advanced welder, engineering goggles, and insulated gloves.
 
-thief-backpack-category-chemistry-name = anatomy kit
+thief-backpack-category-chemistry-name = Anatomy Kit
 thief-backpack-category-chemistry-description =
     You've reached peak physical performance... with a little help.
     Includes: Storage implanter, DNA scrambler implanter,
     ephedrine bottle, syringe, empty shaker, and omega soap
 
-thief-backpack-category-syndie-name = syndie kit
+thief-backpack-category-syndie-name = Syndie Kit
 thief-backpack-category-syndie-description =
     Trinkets from a disavowed past, or stolen from a careless agent?
     You've made some connections. Whiskey, echo...
     Includes: An Emag, Access Breaker, Interdyne cigs, a Syndicate codeword,
     a Radio Jammer, a lighter and some strange red crystals.
 
-thief-backpack-category-sleeper-name = sleeper kit
+thief-backpack-category-sleeper-name = Sleeper Kit
 thief-backpack-category-sleeper-description =
     Until we close our eyes for good, use your illegal prescriptions
     to keep others asleep.
     Includes: Sleepy nitrous oxide tank, two nocturine bottles,
     and a hypopen.
 
-thief-backpack-category-communicator-name = communicator kit
+thief-backpack-category-communicator-name = Communicator Kit
 thief-backpack-category-communicator-description =
     Money is power, and secrets are money. Use your silver tongue
     and wealth to subvert the station.
     Includes: Master key for all station channels, a CyberSun pen,
     voice chameleon mask, and 20k spesos inside a briefcase.
 
-thief-backpack-category-smuggler-name = smuggler kit
+thief-backpack-category-smuggler-name = Smuggler Kit
 thief-backpack-category-smuggler-description =
     All thieves need somewhere to stash their goods in the dark.
     Don't forget to link your fulton.
diff --git a/Resources/Locale/en-US/_strings/tiles/tiles.ftl b/Resources/Locale/en-US/_strings/tiles/tiles.ftl
index a88c4e6dc1..448e8dbc5f 100644
--- a/Resources/Locale/en-US/_strings/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/_strings/tiles/tiles.ftl
@@ -119,6 +119,7 @@ tiles-wood2 = wood pattern floor
 tiles-desert-floor = desert floor
 tiles-low-desert-floor = low desert floor
 tiles-grass-planet-floor = grass planet floor
+tiles-dirt-planet-floor = dirt planet floor
 tiles-basalt-floor = basalt floor
 tiles-snow-floor = snow floor
 tiles-wood3 = wood broken floor
@@ -139,3 +140,7 @@ 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
diff --git a/Resources/Locale/en-US/_strings/tools/tool-qualities.ftl b/Resources/Locale/en-US/_strings/tools/tool-qualities.ftl
index 14e42390a7..b4918ec26c 100644
--- a/Resources/Locale/en-US/_strings/tools/tool-qualities.ftl
+++ b/Resources/Locale/en-US/_strings/tools/tool-qualities.ftl
@@ -32,4 +32,7 @@ tool-quality-rolling-name = Rolling
 tool-quality-rolling-tool-name = Rolling Pin
 
 tool-quality-digging-name = Digging
-tool-quality-digging-tool-name = Shovel
\ No newline at end of file
+tool-quality-digging-tool-name = Shovel
+
+tool-quality-brushing-name = Brushing
+tool-quality-brushing-tool-name = Wire Brush
diff --git a/Resources/Locale/en-US/_strings/traits/traits.ftl b/Resources/Locale/en-US/_strings/traits/traits.ftl
index 335cb13f9b..cd5921b764 100644
--- a/Resources/Locale/en-US/_strings/traits/traits.ftl
+++ b/Resources/Locale/en-US/_strings/traits/traits.ftl
@@ -15,8 +15,8 @@ permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($targ
 trait-lightweight-name = Lightweight drunk
 trait-lightweight-desc = Alcohol has a stronger effect on you.
 
-trait-monochromancy-name = Monochromancy
-trait-monochromancy-desc = You are fully colorblind, everything you perceive ranges from blacks to whites.
+trait-monochromacy-name = Monochromacy
+trait-monochromacy-desc = You are fully colorblind, everything you perceive ranges from blacks to whites.
 
 trait-muted-name = Muted
 trait-muted-desc = You can't speak.
diff --git a/Resources/Locale/en-US/_strings/voting/ui/vote-call-menu.ftl b/Resources/Locale/en-US/_strings/voting/ui/vote-call-menu.ftl
index 6d48558d55..1ab2b32ff7 100644
--- a/Resources/Locale/en-US/_strings/voting/ui/vote-call-menu.ftl
+++ b/Resources/Locale/en-US/_strings/voting/ui/vote-call-menu.ftl
@@ -39,5 +39,5 @@ ui-vote-fluff = Powered by Robust™ Anti-Tamper Technology
 
 ## Vote menu command
 
-ui-vote-menu-command-description = Opens the voting menu
-ui-vote-menu-command-help-text = Usage: votemenu
+cmd-votemenu-desc = Opens the voting menu.
+cmd-votemenu-help = Usage: votemenu
diff --git a/Resources/Locale/en-US/_strings/voting/vote-commands.ftl b/Resources/Locale/en-US/_strings/voting/vote-commands.ftl
index 94320294c8..4ad19e7070 100644
--- a/Resources/Locale/en-US/_strings/voting/vote-commands.ftl
+++ b/Resources/Locale/en-US/_strings/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/Locale/en-US/_strings/weapons/grenades/timer-trigger.ftl b/Resources/Locale/en-US/_strings/weapons/grenades/timer-trigger.ftl
deleted file mode 100644
index 9a10e9ef04..0000000000
--- a/Resources/Locale/en-US/_strings/weapons/grenades/timer-trigger.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-verb-trigger-timer-set = {$time} Seconds
-verb-trigger-timer-set-current = {$time} Seconds (current)
-verb-trigger-timer-cycle = Cycle Time Delay
-
-examine-trigger-timer = The timer is set to {$time} seconds.
-
-popup-trigger-timer-set = Timer set to {$time} seconds.
-
-verb-start-detonation = Start detonation
-
-verb-toggle-start-on-stick = Toggle auto-activation
-popup-start-on-stick-off = The device will no longer activate automatically when planted
-popup-start-on-stick-on = The device will now activate automatically when planted
-
-trigger-activated = You activate {THE($device)}.
diff --git a/Resources/Locale/en-US/_strings/weapons/grenades/voice-trigger.ftl b/Resources/Locale/en-US/_strings/weapons/grenades/voice-trigger.ftl
deleted file mode 100644
index 07ee5948d5..0000000000
--- a/Resources/Locale/en-US/_strings/weapons/grenades/voice-trigger.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-examine-trigger-voice = The display reads: "{$keyphrase}"
-trigger-voice-uninitialized = The display reads: Uninitialized...
-
-verb-trigger-voice-record = Record
-verb-trigger-voice-stop = Stop
-verb-trigger-voice-clear = Clear recording
-
-popup-trigger-voice-start-recording = Started recording
-popup-trigger-voice-stop-recording = Stopped recording
-popup-trigger-voice-record-failed-too-long = Message too long, try again
-popup-trigger-voice-record-failed-too-short = Message too short, try again
-popup-trigger-voice-recorded = Recorded successfully
diff --git a/Resources/Locale/en-US/_strings/weapons/ranged/gun.ftl b/Resources/Locale/en-US/_strings/weapons/ranged/gun.ftl
index 18e01e31c8..a364075be9 100644
--- a/Resources/Locale/en-US/_strings/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/_strings/weapons/ranged/gun.ftl
@@ -4,7 +4,6 @@ gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per sec
 gun-selector-verb = Change to {$mode}
 gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
-gun-clumsy = The gun blows up in your face!
 gun-set-fire-mode = Set to {$mode}
 gun-magazine-whitelist-fail = That won't fit into the gun!
 gun-magazine-fired-empty = No ammo left!
diff --git a/Resources/Locale/en-US/_strings/weapons/ranged/turrets.ftl b/Resources/Locale/en-US/_strings/weapons/ranged/turrets.ftl
index 213599d926..8a21647075 100644
--- a/Resources/Locale/en-US/_strings/weapons/ranged/turrets.ftl
+++ b/Resources/Locale/en-US/_strings/weapons/ranged/turrets.ftl
@@ -9,4 +9,5 @@ deployable-turret-component-is-broken = The turret is heavily damaged and must b
 deployable-turret-component-cannot-access-wires = You can't reach the maintenance panel while the turret is active 
 
 # Turret notification for station AI
-station-ai-turret-is-attacking-warning = {CAPITALIZE($source)} has engaged a hostile target.
\ No newline at end of file
+station-ai-turret-component-name = {$name} ({$address})
+station-ai-turret-component-is-attacking-warning = {CAPITALIZE($source)} has engaged a hostile target.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_strings/wires/components/wires-panel-component.ftl b/Resources/Locale/en-US/_strings/wires/components/wires-panel-component.ftl
index cd8867f135..ffe9741c28 100644
--- a/Resources/Locale/en-US/_strings/wires/components/wires-panel-component.ftl
+++ b/Resources/Locale/en-US/_strings/wires/components/wires-panel-component.ftl
@@ -1,2 +1,43 @@
 wires-panel-component-on-examine-open = The [color=lightgray]maintenance panel[/color] is [color=red]open[/color].
 wires-panel-component-on-examine-closed = The [color=lightgray]maintenance panel[/color] is [color=darkgreen]closed[/color].
+
+# wire colors
+
+wire-name-color-red = Red
+wire-name-color-blue = Blue
+wire-name-color-green = Green
+wire-name-color-orange = Orange
+wire-name-color-brown = Brown
+wire-name-color-gold = Gold
+wire-name-color-gray = Gray
+wire-name-color-cyan = Cyan
+wire-name-color-navy = Navy
+wire-name-color-purple = Purple
+wire-name-color-pink = Pink
+wire-name-color-fuchsia = Fuchsia
+
+# letter names
+wire-letter-name-alpha = Alpha
+wire-letter-name-beta = Beta
+wire-letter-name-gamma = Gamma
+wire-letter-name-delta = Delta
+wire-letter-name-epsilon = Epsilon
+wire-letter-name-zeta = Zeta
+wire-letter-name-eta = Eta
+wire-letter-name-theta = Theta
+wire-letter-name-iota = Iota
+wire-letter-name-kappa = Kappa
+wire-letter-name-lambda = Lambda
+wire-letter-name-mu = Mu
+wire-letter-name-nu = Nu
+wire-letter-name-xi = Xi
+wire-letter-name-omicron = Omicron
+wire-letter-name-pi = Pi
+wire-letter-name-rho = Rho
+wire-letter-name-sigma = Sigma
+wire-letter-name-tau = Tau
+wire-letter-name-upsilon = Upsilon
+wire-letter-name-phi = Phi
+wire-letter-name-chi = Chi
+wire-letter-name-psi = Psi
+wire-letter-name-omega = Omega
diff --git a/Resources/Locale/en-US/_strings/xenoarchaeology/artifact-component.ftl b/Resources/Locale/en-US/_strings/xenoarchaeology/artifact-component.ftl
index 50fa136928..90029b282c 100644
--- a/Resources/Locale/en-US/_strings/xenoarchaeology/artifact-component.ftl
+++ b/Resources/Locale/en-US/_strings/xenoarchaeology/artifact-component.ftl
@@ -1,10 +1,4 @@
-### Commands
-cmd-unlocknode-desc = Unlocks a node on a given artifact
-cmd-unlocknode-help = unlocknode <artifact uid> <node uid>
-cmd-parse-failure-unlocknode-arg-num = Incorrect number of args
-cmd-parse-failure-unlocknode-invalid-entity = Provided netEntity is not valid node
-
-### Verbs
+### Verbs
 artifact-verb-make-always-active = Make artifact always active
 artifact-verb-activate = Activate artifact
 
diff --git a/Resources/Locale/en-US/actions/commands/addaction.ftl b/Resources/Locale/en-US/actions/commands/addaction.ftl
new file mode 100644
index 0000000000..be1cbf27de
--- /dev/null
+++ b/Resources/Locale/en-US/actions/commands/addaction.ftl
@@ -0,0 +1,11 @@
+# addaction
+cmd-addaction-desc = Adds an action to the target entity. The action will not work if the target requires an additional component on their entity (such as Dragon's Devour).
+cmd-addaction-help = addaction <EntityUid> <ActionPrototype>
+
+cmd-addaction-invalid-args = Expected exactly 2 arguments.
+cmd-addaction-actions-not-found = Target entity cannot use actions.
+cmd-addaction-action-not-found = Can't find matching action prototype {$action}.
+cmd-addaction-adding-failed = Failed to add the action.
+
+cmd-addaction-player-completion = <EntityUid>
+cmd-addaction-action-completion = <ActionProto>
diff --git a/Resources/Locale/en-US/actions/commands/rmaction.ftl b/Resources/Locale/en-US/actions/commands/rmaction.ftl
new file mode 100644
index 0000000000..0226d3d17c
--- /dev/null
+++ b/Resources/Locale/en-US/actions/commands/rmaction.ftl
@@ -0,0 +1,12 @@
+# rmaction
+cmd-rmaction-desc = Removes an action from an entity.
+cmd-rmaction-help = rmaction <EntityUid> <ActionUid>
+
+cmd-rmaction-invalid-args = Expected exactly 2 arguments.
+cmd-rmaction-actions-not-found = Target entity cannot use actions.
+cmd-rmaction-not-an-action = Target entity is not an action.
+
+cmd-rmaction-player-completion = <EntityUid>
+cmd-rmaction-action-completion = <ActionUid>
+
+cmd-rmaction-action-info = {$action}
diff --git a/Resources/Locale/en-US/animals/parrot/parrot.ftl b/Resources/Locale/en-US/animals/parrot/parrot.ftl
new file mode 100644
index 0000000000..8262324d81
--- /dev/null
+++ b/Resources/Locale/en-US/animals/parrot/parrot.ftl
@@ -0,0 +1,2 @@
+parrot-verb-clear-memory = Clear parrot memory
+parrot-popup-memory-cleared = Parrot memory cleared
diff --git a/Resources/Locale/en-US/changeling/changeling.ftl b/Resources/Locale/en-US/changeling/changeling.ftl
new file mode 100644
index 0000000000..423cb0811e
--- /dev/null
+++ b/Resources/Locale/en-US/changeling/changeling.ftl
@@ -0,0 +1,22 @@
+roles-antag-changeling-name = Changeling
+roles-antag-changeling-objective = A intelligent predator that assumes the identities of its victims.
+
+changeling-role-greeting = You are a Changeling, a highly intelligent predator. Your only goal is to escape the station alive via assuming the identities of the denizens of this station. You are hungry and will not make it long without sustenance... kill, consume, hide, survive.
+changeling-briefing = You are a changeling, your goal is to survive. Consume humanoids to gain biomass and utilize it to evade termination. You are able to utilize and assume the identities of those you consume to evade a grim fate.
+
+changeling-devour-attempt-failed-rotting = This corpse has only rotted biomass.
+changeling-devour-attempt-failed-protected = This victim's biomass is protected.
+
+changeling-devour-begin-windup-self = Our uncanny mouth reveals itself with otherworldly hunger.
+changeling-devour-begin-windup-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth reveals itself with otherworldly hunger.
+changeling-devour-begin-consume-self = The uncanny mouth digs deep into its victim.
+changeling-devour-begin-consume-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth digs deep into { POSS-ADJ($user) } victim.
+
+changeling-devour-consume-failed-not-dead = This body yet lives! We cannot consume it alive!
+changeling-devour-consume-complete-self = Our uncanny mouth retreats, biomass consumed.
+changeling-devour-consume-complete-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth retreats.
+
+changeling-transform-attempt-self = Our bones snap, muscles tear, one flesh becomes another.
+changeling-transform-attempt-others = { CAPITALIZE(POSS-ADJ($user)) } bones snap, muscles tear, body shifts into another.
+
+changeling-paused-map-name = Changeling identity storage map
diff --git a/Resources/Locale/en-US/clown/components/clumsy-component.ftl b/Resources/Locale/en-US/clown/components/clumsy-component.ftl
new file mode 100644
index 0000000000..055b3b9c4e
--- /dev/null
+++ b/Resources/Locale/en-US/clown/components/clumsy-component.ftl
@@ -0,0 +1,10 @@
+clumsy-vaulting-fail-forced-message = { CAPITALIZE($bonker) } bonks { $victim }s head against { THE($bonkable) }!
+clumsy-vaulting-fail-message-user = You bonk your head against { THE($bonkable) }!
+clumsy-vaulting-fail-message-others = { $victim } bonks their head against { THE($bonkable) }!
+
+clumsy-gun-fail-message = The gun blows up in your face!
+
+clumsy-hypospray-fail-message = Oops! You injected yourself.
+
+clumsy-catch-fail-message-user = { CAPITALIZE(THE($item)) } hits your head!
+clumsy-catch-fail-message-others = { CAPITALIZE(THE($item)) } hits { THE($catcher) }'s head!
diff --git a/Resources/Locale/en-US/datasets/names/golem.ftl b/Resources/Locale/en-US/datasets/names/golem.ftl
deleted file mode 100644
index 6a91ac773a..0000000000
--- a/Resources/Locale/en-US/datasets/names/golem.ftl
+++ /dev/null
@@ -1,1336 +0,0 @@
-names-golem-dataset-1 = Abelsonite
-names-golem-dataset-2 = Abenakiite
-names-golem-dataset-3 = Abernathyite
-names-golem-dataset-4 = Abhurite
-names-golem-dataset-5 = Abramovite
-names-golem-dataset-6 = Abswurmbachite
-names-golem-dataset-7 = Acanthite
-names-golem-dataset-8 = Achavalite
-names-golem-dataset-9 = Actinolite
-names-golem-dataset-10 = Acuminite
-names-golem-dataset-11 = Adamite
-names-golem-dataset-12 = Adelite
-names-golem-dataset-13 = Admontite
-names-golem-dataset-14 = Aegirine
-names-golem-dataset-15 = Aenigmatite
-names-golem-dataset-16 = Aerinite
-names-golem-dataset-17 = Aerugite
-names-golem-dataset-18 = Aeschynite
-names-golem-dataset-19 = Afghanite
-names-golem-dataset-20 = Afwillite
-names-golem-dataset-21 = Agardite
-names-golem-dataset-22 = Agrellite
-names-golem-dataset-23 = Agrinierite
-names-golem-dataset-24 = Aguilarite
-names-golem-dataset-25 = Aheylite
-names-golem-dataset-26 = Ahlfeldite
-names-golem-dataset-27 = Aikinite
-names-golem-dataset-28 = Ajoite
-names-golem-dataset-29 = Akaganeite
-names-golem-dataset-30 = Akatoreite
-names-golem-dataset-31 = Akdalaite
-names-golem-dataset-32 = Åkermanite
-names-golem-dataset-33 = Akhtenskite
-names-golem-dataset-34 = Akimotoite
-names-golem-dataset-35 = Akrochordite
-names-golem-dataset-36 = Aksaite
-names-golem-dataset-37 = Aktashite
-names-golem-dataset-38 = Alabandite
-names-golem-dataset-39 = Alacranite
-names-golem-dataset-40 = Alamosite
-names-golem-dataset-41 = Alarsite
-names-golem-dataset-42 = Albite
-names-golem-dataset-43 = Albrechtschraufite
-names-golem-dataset-44 = Aldermanite
-names-golem-dataset-45 = Aleksite
-names-golem-dataset-46 = Alforsite
-names-golem-dataset-47 = Algodonite
-names-golem-dataset-48 = Aliettite
-names-golem-dataset-49 = Allabogdanite
-names-golem-dataset-50 = Allactite
-names-golem-dataset-51 = Allanite
-names-golem-dataset-52 = Allanpringite
-names-golem-dataset-53 = Allargentum
-names-golem-dataset-54 = Alleghanyite
-names-golem-dataset-55 = Alloclasite
-names-golem-dataset-56 = Allophane
-names-golem-dataset-57 = Alluaivite
-names-golem-dataset-58 = Alluaudite
-names-golem-dataset-59 = Almandine
-names-golem-dataset-60 = Almarudite
-names-golem-dataset-61 = Alsakharovite
-names-golem-dataset-62 = Alstonite
-names-golem-dataset-63 = Altaite
-names-golem-dataset-64 = Althausite
-names-golem-dataset-65 = Althupite
-names-golem-dataset-66 = Altisite
-names-golem-dataset-67 = Alum
-names-golem-dataset-68 = Aluminite
-names-golem-dataset-69 = Aluminium
-names-golem-dataset-70 = Alunite
-names-golem-dataset-71 = Alunogen
-names-golem-dataset-72 = Amakinite
-names-golem-dataset-73 = Amarantite
-names-golem-dataset-74 = Amblygonite
-names-golem-dataset-75 = Ameghinite
-names-golem-dataset-76 = Amesite
-names-golem-dataset-77 = Amicite
-names-golem-dataset-78 = Amphibole
-names-golem-dataset-79 = Analcime
-names-golem-dataset-80 = Anandite
-names-golem-dataset-81 = Anapaite
-names-golem-dataset-82 = Anatase
-names-golem-dataset-83 = Ancylite
-names-golem-dataset-84 = Andalusite
-names-golem-dataset-85 = Andersonite
-names-golem-dataset-86 = Andesine
-names-golem-dataset-87 = Andorite
-names-golem-dataset-88 = Andradite
-names-golem-dataset-89 = Andyrobertsite
-names-golem-dataset-90 = Anglesite
-names-golem-dataset-91 = Anhydrite
-names-golem-dataset-92 = Ankerite
-names-golem-dataset-93 = Annabergite
-names-golem-dataset-94 = Annite
-names-golem-dataset-95 = Anorthite
-names-golem-dataset-96 = Anorthoclase
-names-golem-dataset-97 = Antarcticite
-names-golem-dataset-98 = Anthonyite
-names-golem-dataset-99 = Anthophyllite
-names-golem-dataset-100 = Antigorite
-names-golem-dataset-101 = Antimony
-names-golem-dataset-102 = Antitaenite
-names-golem-dataset-103 = Antlerite
-names-golem-dataset-104 = Apachite
-names-golem-dataset-105 = Apatite
-names-golem-dataset-106 = Aphthitalite
-names-golem-dataset-107 = Apophyllite
-names-golem-dataset-108 = Aragonite
-names-golem-dataset-109 = Arcanite
-names-golem-dataset-110 = Archerite
-names-golem-dataset-111 = Arctite
-names-golem-dataset-112 = Arcubisite
-names-golem-dataset-113 = Ardaite
-names-golem-dataset-114 = Arfvedsonite
-names-golem-dataset-115 = Argentite
-names-golem-dataset-116 = Argutite
-names-golem-dataset-117 = Argyrodite
-names-golem-dataset-118 = Armalcolite
-names-golem-dataset-119 = Arsenic
-names-golem-dataset-120 = Arseniosiderite
-names-golem-dataset-121 = Arsenoclasite
-names-golem-dataset-122 = Arsenolite
-names-golem-dataset-123 = Arsenopyrite
-names-golem-dataset-124 = Arthurite
-names-golem-dataset-125 = Artinite
-names-golem-dataset-126 = Artroeite
-names-golem-dataset-127 = Ashburtonite
-names-golem-dataset-128 = Ashoverite
-names-golem-dataset-129 = Asisite
-names-golem-dataset-130 = Astrophyllite
-names-golem-dataset-131 = Atacamite
-names-golem-dataset-132 = Athabascaite
-names-golem-dataset-133 = Atheneite
-names-golem-dataset-134 = Aubertite
-names-golem-dataset-135 = Augelite
-names-golem-dataset-136 = Augite
-names-golem-dataset-137 = Aurichalcite
-names-golem-dataset-138 = Auricupride
-names-golem-dataset-139 = Aurostibite
-names-golem-dataset-140 = Austinite
-names-golem-dataset-141 = Autunite
-names-golem-dataset-142 = Avicennite
-names-golem-dataset-143 = Avogadrite
-names-golem-dataset-144 = Awaruite
-names-golem-dataset-145 = Axinite
-names-golem-dataset-146 = Azurite
-names-golem-dataset-147 = Babefphite
-names-golem-dataset-148 = Babingtonite
-names-golem-dataset-149 = Baddeleyite
-names-golem-dataset-150 = Bakerite
-names-golem-dataset-151 = Balangeroite
-names-golem-dataset-152 = Banalsite
-names-golem-dataset-153 = Baotite
-names-golem-dataset-154 = Bararite
-names-golem-dataset-155 = Barrerite
-names-golem-dataset-156 = Barstowite
-names-golem-dataset-157 = Baryte
-names-golem-dataset-158 = Barytocalcite
-names-golem-dataset-159 = Bassanite
-names-golem-dataset-160 = Bastnasite
-names-golem-dataset-161 = Baumhauerite
-names-golem-dataset-162 = Bayldonite
-names-golem-dataset-163 = Bayleyite
-names-golem-dataset-164 = Bazzite
-names-golem-dataset-165 = Becquerelite
-names-golem-dataset-166 = Benitoite
-names-golem-dataset-167 = Benstonite
-names-golem-dataset-168 = Bentorite
-names-golem-dataset-169 = Beraunite
-names-golem-dataset-170 = Berborite
-names-golem-dataset-171 = Bergenite
-names-golem-dataset-172 = Berlinite
-names-golem-dataset-173 = Berryite
-names-golem-dataset-174 = Berthierite
-names-golem-dataset-175 = Bertrandite
-names-golem-dataset-176 = Beryl
-names-golem-dataset-177 = Beryllonite
-names-golem-dataset-178 = Beudantite
-names-golem-dataset-179 = Bicchulite
-names-golem-dataset-180 = Biehlite
-names-golem-dataset-181 = Bilinite
-names-golem-dataset-182 = Billietite
-names-golem-dataset-183 = Billwiseite
-names-golem-dataset-184 = Biotite
-names-golem-dataset-185 = Birnessite
-names-golem-dataset-186 = Bischofite
-names-golem-dataset-187 = Bismite
-names-golem-dataset-188 = Bismuth
-names-golem-dataset-189 = Bismuthinite
-names-golem-dataset-190 = Bismutite
-names-golem-dataset-191 = Bityite
-names-golem-dataset-192 = Bixbyite
-names-golem-dataset-193 = Blodite
-names-golem-dataset-194 = Blossite
-names-golem-dataset-195 = Bobfergusonite
-names-golem-dataset-196 = Boehmite
-names-golem-dataset-197 = Boleite
-names-golem-dataset-198 = Boltwoodite
-names-golem-dataset-199 = Bonaccordite
-names-golem-dataset-200 = Boracite
-names-golem-dataset-201 = Borax
-names-golem-dataset-202 = Bornite
-names-golem-dataset-203 = Botallackite
-names-golem-dataset-204 = Botryogen
-names-golem-dataset-205 = Boulangerite
-names-golem-dataset-206 = Bournonite
-names-golem-dataset-207 = Boussingaultite
-names-golem-dataset-208 = Bowieite
-names-golem-dataset-209 = Braggite
-names-golem-dataset-210 = Brassite
-names-golem-dataset-211 = Braunite
-names-golem-dataset-212 = Brazilianite
-names-golem-dataset-213 = Breithauptite
-names-golem-dataset-214 = Brewsterite
-names-golem-dataset-215 = Brezinaite
-names-golem-dataset-216 = Brianite
-names-golem-dataset-217 = Brianyoungite
-names-golem-dataset-218 = Briartite
-names-golem-dataset-219 = Bridgmanite
-names-golem-dataset-220 = Brochantite
-names-golem-dataset-221 = Brockite
-names-golem-dataset-222 = Bromargyrite
-names-golem-dataset-223 = Bromellite
-names-golem-dataset-224 = Bronzite
-names-golem-dataset-225 = Brookite
-names-golem-dataset-226 = Brownleeite
-names-golem-dataset-227 = Brownmillerite
-names-golem-dataset-228 = Brucite
-names-golem-dataset-229 = Brushite
-names-golem-dataset-230 = Buddingtonite
-names-golem-dataset-231 = Bukovite
-names-golem-dataset-232 = Bukovskyite
-names-golem-dataset-233 = Bultfonteinite
-names-golem-dataset-234 = Bunsenite
-names-golem-dataset-235 = Bustamite
-names-golem-dataset-236 = Bystrite
-names-golem-dataset-237 = Cabalzarite
-names-golem-dataset-238 = Cabriite
-names-golem-dataset-239 = Cacoxenite
-names-golem-dataset-240 = Cadmium
-names-golem-dataset-241 = Cadmoindite
-names-golem-dataset-242 = Cadmoselite
-names-golem-dataset-243 = Cadwaladerite
-names-golem-dataset-244 = Cafarsite
-names-golem-dataset-245 = Cafetite
-names-golem-dataset-246 = Cahnite
-names-golem-dataset-247 = Calaverite
-names-golem-dataset-248 = Calciborite
-names-golem-dataset-249 = Calcite
-names-golem-dataset-250 = Calderite
-names-golem-dataset-251 = Caledonite
-names-golem-dataset-252 = Calumetite
-names-golem-dataset-253 = Campigliaite
-names-golem-dataset-254 = Canavesite
-names-golem-dataset-255 = Cancrinite
-names-golem-dataset-256 = Canfieldite
-names-golem-dataset-257 = Carletonite
-names-golem-dataset-258 = Carlosruizite
-names-golem-dataset-259 = Carlsbergite
-names-golem-dataset-260 = Carminite
-names-golem-dataset-261 = Carnallite
-names-golem-dataset-262 = Carnotite
-names-golem-dataset-263 = Carobbiite
-names-golem-dataset-264 = Carpathite
-names-golem-dataset-265 = Carpholite
-names-golem-dataset-266 = Carrollite
-names-golem-dataset-267 = Caryopilite
-names-golem-dataset-268 = Cassiterite
-names-golem-dataset-269 = Cattierite
-names-golem-dataset-270 = Cavansite
-names-golem-dataset-271 = Celadonite
-names-golem-dataset-272 = Celestine
-names-golem-dataset-273 = Celsian
-names-golem-dataset-274 = Cerite
-names-golem-dataset-275 = Cerium
-names-golem-dataset-276 = Cerussite
-names-golem-dataset-277 = Cervandonite
-names-golem-dataset-278 = Cervantite
-names-golem-dataset-279 = Cesanite
-names-golem-dataset-280 = Cesbronite
-names-golem-dataset-281 = Chabazite
-names-golem-dataset-282 = Chaidamuite
-names-golem-dataset-283 = Chalcanthite
-names-golem-dataset-284 = Chalcocite
-names-golem-dataset-285 = Chalcophyllite
-names-golem-dataset-286 = Chalcopyrite
-names-golem-dataset-287 = Challacolloite
-names-golem-dataset-288 = Chambersite
-names-golem-dataset-289 = Chamosite
-names-golem-dataset-290 = Changbaiite
-names-golem-dataset-291 = Chaoite
-names-golem-dataset-292 = Chapmanite
-names-golem-dataset-293 = Charoite
-names-golem-dataset-294 = Chatkalite
-names-golem-dataset-295 = Chesterite
-names-golem-dataset-296 = Chibaite
-names-golem-dataset-297 = Childrenite
-names-golem-dataset-298 = Chlorargyrite
-names-golem-dataset-299 = Chlorite
-names-golem-dataset-300 = Chloritoid
-names-golem-dataset-301 = Chlormayenite
-names-golem-dataset-302 = Chlorocalcite
-names-golem-dataset-303 = Chloroxiphite
-names-golem-dataset-304 = Chondrodite
-names-golem-dataset-305 = Chrisstanleyite
-names-golem-dataset-306 = Christite
-names-golem-dataset-307 = Chromite
-names-golem-dataset-308 = Chromium
-names-golem-dataset-309 = Chrysoberyl
-names-golem-dataset-310 = Chrysocolla
-names-golem-dataset-311 = Chrysotile
-names-golem-dataset-312 = Chvaleticeite
-names-golem-dataset-313 = Cinnabar
-names-golem-dataset-314 = Clarkeite
-names-golem-dataset-315 = Claudetite
-names-golem-dataset-316 = Clausthalite
-names-golem-dataset-317 = Clearcreekite
-names-golem-dataset-318 = Cleusonite
-names-golem-dataset-319 = Clinoclase
-names-golem-dataset-320 = Clinohedrite
-names-golem-dataset-321 = Clinohumite
-names-golem-dataset-322 = Clinoptilolite
-names-golem-dataset-323 = Clinozoisite
-names-golem-dataset-324 = Clintonite
-names-golem-dataset-325 = Cobaltite
-names-golem-dataset-326 = Coccinite
-names-golem-dataset-327 = Coconinoite
-names-golem-dataset-328 = Coesite
-names-golem-dataset-329 = Coffinite
-names-golem-dataset-330 = Cohenite
-names-golem-dataset-331 = Colemanite
-names-golem-dataset-332 = Colimaite
-names-golem-dataset-333 = Collinsite
-names-golem-dataset-334 = Coloradoite
-names-golem-dataset-335 = Columbite
-names-golem-dataset-336 = Combeite
-names-golem-dataset-337 = Conichalcite
-names-golem-dataset-338 = Connellite
-names-golem-dataset-339 = Cooperite
-names-golem-dataset-340 = Copiapite
-names-golem-dataset-341 = Copper
-names-golem-dataset-342 = Corderoite
-names-golem-dataset-343 = Cordierite
-names-golem-dataset-344 = Corkite
-names-golem-dataset-345 = Cornubite
-names-golem-dataset-346 = Cornwallite
-names-golem-dataset-347 = Corundum
-names-golem-dataset-348 = Cotunnite
-names-golem-dataset-349 = Covellite
-names-golem-dataset-350 = Coyoteite
-names-golem-dataset-351 = Creedite
-names-golem-dataset-352 = Cristobalite
-names-golem-dataset-353 = Crocoite
-names-golem-dataset-354 = Cronstedtite
-names-golem-dataset-355 = Crookesite
-names-golem-dataset-356 = Crossite
-names-golem-dataset-357 = Cryolite
-names-golem-dataset-358 = Cryptomelane
-names-golem-dataset-359 = Cubanite
-names-golem-dataset-360 = Cummingtonite
-names-golem-dataset-361 = Cupalite
-names-golem-dataset-362 = Cuprite
-names-golem-dataset-363 = Cuprosklodowskite
-names-golem-dataset-364 = Cuprospinel
-names-golem-dataset-365 = Curite
-names-golem-dataset-366 = Cuspidine
-names-golem-dataset-367 = Cyanotrichite
-names-golem-dataset-368 = Cylindrite
-names-golem-dataset-369 = Cymrite
-names-golem-dataset-370 = Cyrilovite
-names-golem-dataset-371 = Danalite
-names-golem-dataset-372 = Danburite
-names-golem-dataset-373 = Datolite
-names-golem-dataset-374 = Daubreeite
-names-golem-dataset-375 = Daubreelite
-names-golem-dataset-376 = Davidite
-names-golem-dataset-377 = Dawsonite
-names-golem-dataset-378 = Delafossite
-names-golem-dataset-379 = Delvauxite
-names-golem-dataset-380 = Demesmaekerite
-names-golem-dataset-381 = Derriksite
-names-golem-dataset-382 = Descloizite
-names-golem-dataset-383 = Devilline
-names-golem-dataset-384 = Diaboleite
-names-golem-dataset-385 = Diadochite
-names-golem-dataset-386 = Diamond
-names-golem-dataset-387 = Diaspore
-names-golem-dataset-388 = Dickite
-names-golem-dataset-389 = Digenite
-names-golem-dataset-390 = Dimorphite
-names-golem-dataset-391 = Diopside
-names-golem-dataset-392 = Dioptase
-names-golem-dataset-393 = Djerfisherite
-names-golem-dataset-394 = Djurleite
-names-golem-dataset-395 = Dmitryivanovite
-names-golem-dataset-396 = Dollaseite
-names-golem-dataset-397 = Dolomite
-names-golem-dataset-398 = Domeykite
-names-golem-dataset-399 = Donnayite
-names-golem-dataset-400 = Drysdallite
-names-golem-dataset-401 = Duftite
-names-golem-dataset-402 = Dumortierite
-names-golem-dataset-403 = Dundasite
-names-golem-dataset-404 = Dypingite
-names-golem-dataset-405 = Dyscrasite
-names-golem-dataset-406 = Dzhalindite
-names-golem-dataset-407 = Edenite
-names-golem-dataset-408 = Edingtonite
-names-golem-dataset-409 = Efremovite
-names-golem-dataset-410 = Ekanite
-names-golem-dataset-411 = Elbaite
-names-golem-dataset-412 = Emmonsite
-names-golem-dataset-413 = Empressite
-names-golem-dataset-414 = Enargite
-names-golem-dataset-415 = Enstatite
-names-golem-dataset-416 = Eosphorite
-names-golem-dataset-417 = Ephesite
-names-golem-dataset-418 = Epidote
-names-golem-dataset-419 = Epsomite
-names-golem-dataset-420 = Ericssonite
-names-golem-dataset-421 = Erionite
-names-golem-dataset-422 = Erythrite
-names-golem-dataset-423 = Eskolaite
-names-golem-dataset-424 = Esperite
-names-golem-dataset-425 = Ettringite
-names-golem-dataset-426 = Euchroite
-names-golem-dataset-427 = Euclase
-names-golem-dataset-428 = Eucryptite
-names-golem-dataset-429 = Eudialyte
-names-golem-dataset-430 = Euxenite
-names-golem-dataset-431 = Eveite
-names-golem-dataset-432 = Evenkite
-names-golem-dataset-433 = Eveslogite
-names-golem-dataset-434 = Fabianite
-names-golem-dataset-435 = Farneseite
-names-golem-dataset-436 = Faujasite
-names-golem-dataset-437 = Faustite
-names-golem-dataset-438 = Fayalite
-names-golem-dataset-439 = Feldspar
-names-golem-dataset-440 = Feldspathoid
-names-golem-dataset-441 = Felsobanyaite
-names-golem-dataset-442 = Ferberite
-names-golem-dataset-443 = Fergusonite
-names-golem-dataset-444 = Feroxyhyte
-names-golem-dataset-445 = Ferrierite
-names-golem-dataset-446 = Ferrihydrite
-names-golem-dataset-447 = Ferrimolybdite
-names-golem-dataset-448 = Ferro-actinolite
-names-golem-dataset-449 = Ferrogedrite
-names-golem-dataset-450 = Ferrohortonolite
-names-golem-dataset-451 = Ferronigerite
-names-golem-dataset-452 = Ferropericlase
-names-golem-dataset-453 = Ferroselite
-names-golem-dataset-454 = Fettelite
-names-golem-dataset-455 = Fichtelite
-names-golem-dataset-456 = Fletcherite
-names-golem-dataset-457 = Fluckite
-names-golem-dataset-458 = Fluellite
-names-golem-dataset-459 = Fluoborite
-names-golem-dataset-460 = Fluocerite
-names-golem-dataset-461 = Fluorapatite
-names-golem-dataset-462 = Fluorapophyllite
-names-golem-dataset-463 = Fluorcaphite
-names-golem-dataset-464 = Fluorellestadite
-names-golem-dataset-465 = Fluorite
-names-golem-dataset-466 = Fluororichterite
-names-golem-dataset-467 = Fornacite
-names-golem-dataset-468 = Forsterite
-names-golem-dataset-469 = Fougerite
-names-golem-dataset-470 = Fourmarierite
-names-golem-dataset-471 = Fraipontite
-names-golem-dataset-472 = Francevillite
-names-golem-dataset-473 = Franckeite
-names-golem-dataset-474 = Frankamenite
-names-golem-dataset-475 = Frankdicksonite
-names-golem-dataset-476 = Frankhawthorneite
-names-golem-dataset-477 = Franklinite
-names-golem-dataset-478 = Franklinphilite
-names-golem-dataset-479 = Freibergite
-names-golem-dataset-480 = Freieslebenite
-names-golem-dataset-481 = Fukuchilite
-names-golem-dataset-482 = Gabrielite
-names-golem-dataset-483 = Gadolinite
-names-golem-dataset-484 = Gagarinite
-names-golem-dataset-485 = Gahnite
-names-golem-dataset-486 = Galaxite
-names-golem-dataset-487 = Galena
-names-golem-dataset-488 = Galkhaite
-names-golem-dataset-489 = Gananite
-names-golem-dataset-490 = Garnet
-names-golem-dataset-491 = Gaspeite
-names-golem-dataset-492 = Gatehouseite
-names-golem-dataset-493 = Gaylussite
-names-golem-dataset-494 = Gedrite
-names-golem-dataset-495 = Geerite
-names-golem-dataset-496 = Gehlenite
-names-golem-dataset-497 = Geigerite
-names-golem-dataset-498 = Geikielite
-names-golem-dataset-499 = Geocronite
-names-golem-dataset-500 = Georgerobinsonite
-names-golem-dataset-501 = Germanite
-names-golem-dataset-502 = Gersdorffite
-names-golem-dataset-503 = Getchellite
-names-golem-dataset-504 = Gibbsite
-names-golem-dataset-505 = Gilalite
-names-golem-dataset-506 = Gismondine
-names-golem-dataset-507 = Glauberite
-names-golem-dataset-508 = Glaucochroite
-names-golem-dataset-509 = Glaucodot
-names-golem-dataset-510 = Glauconite
-names-golem-dataset-511 = Glaucophane
-names-golem-dataset-512 = Gmelinite
-names-golem-dataset-513 = Godovikovite
-names-golem-dataset-514 = Goethite
-names-golem-dataset-515 = Gold
-names-golem-dataset-516 = Goldmanite
-names-golem-dataset-517 = Gonnardite
-names-golem-dataset-518 = Gordaite
-names-golem-dataset-519 = Gormanite
-names-golem-dataset-520 = Goslarite
-names-golem-dataset-521 = Graftonite
-names-golem-dataset-522 = Grandidierite
-names-golem-dataset-523 = Grandreefite
-names-golem-dataset-524 = Graphite
-names-golem-dataset-525 = Gratonite
-names-golem-dataset-526 = Greenalite
-names-golem-dataset-527 = Greenockite
-names-golem-dataset-528 = Gregoryite
-names-golem-dataset-529 = Greifensteinite
-names-golem-dataset-530 = Greigite
-names-golem-dataset-531 = Grossite
-names-golem-dataset-532 = Grossular
-names-golem-dataset-533 = Groutite
-names-golem-dataset-534 = Grunerite
-names-golem-dataset-535 = Guettardite
-names-golem-dataset-536 = Gugiaite
-names-golem-dataset-537 = Guilleminite
-names-golem-dataset-538 = Gunningite
-names-golem-dataset-539 = Guyanaite
-names-golem-dataset-540 = Gwihabaite
-names-golem-dataset-541 = Gypsum
-names-golem-dataset-542 = Hafnon
-names-golem-dataset-543 = Hagendorfite
-names-golem-dataset-544 = Haggertyite
-names-golem-dataset-545 = Haidingerite
-names-golem-dataset-546 = Haiweeite
-names-golem-dataset-547 = Haleniusite
-names-golem-dataset-548 = Halite
-names-golem-dataset-549 = Halloysite
-names-golem-dataset-550 = Halotrichite
-names-golem-dataset-551 = Hambergite
-names-golem-dataset-552 = Hanksite
-names-golem-dataset-553 = Hapkeite
-names-golem-dataset-554 = Hardystonite
-names-golem-dataset-555 = Harmotome
-names-golem-dataset-556 = Hauerite
-names-golem-dataset-557 = Hausmannite
-names-golem-dataset-558 = Hauyne
-names-golem-dataset-559 = Hawleyite
-names-golem-dataset-560 = Haxonite
-names-golem-dataset-561 = Hazenite
-names-golem-dataset-562 = Heazlewoodite
-names-golem-dataset-563 = Hectorite
-names-golem-dataset-564 = Hedenbergite
-names-golem-dataset-565 = Hellyerite
-names-golem-dataset-566 = Hematite
-names-golem-dataset-567 = Hemihedrite
-names-golem-dataset-568 = Hemimorphite
-names-golem-dataset-569 = Hemusite
-names-golem-dataset-570 = Herbertsmithite
-names-golem-dataset-571 = Hercynite
-names-golem-dataset-572 = Herderite
-names-golem-dataset-573 = Hessite
-names-golem-dataset-574 = Heulandite
-names-golem-dataset-575 = Hexaferrum
-names-golem-dataset-576 = Hiarneite
-names-golem-dataset-577 = Hibonite
-names-golem-dataset-578 = Hidalgoite
-names-golem-dataset-579 = Hilgardite
-names-golem-dataset-580 = Hisingerite
-names-golem-dataset-581 = Hodgkinsonite
-names-golem-dataset-582 = Hoelite
-names-golem-dataset-583 = Hollandite
-names-golem-dataset-584 = Holmquistite
-names-golem-dataset-585 = Homilite
-names-golem-dataset-586 = Hopeite
-names-golem-dataset-587 = Hornblende
-names-golem-dataset-588 = Howlite
-names-golem-dataset-589 = Hsianghualite
-names-golem-dataset-590 = Hubeite
-names-golem-dataset-591 = Hubnerite
-names-golem-dataset-592 = Huemulite
-names-golem-dataset-593 = Humite
-names-golem-dataset-594 = Huntite
-names-golem-dataset-595 = Hureaulite
-names-golem-dataset-596 = Hutchinsonite
-names-golem-dataset-597 = Huttonite
-names-golem-dataset-598 = Hydroboracite
-names-golem-dataset-599 = Hydrogrossular
-names-golem-dataset-600 = Hydrohalite
-names-golem-dataset-601 = Hydrokenoelsmoreite
-names-golem-dataset-602 = Hydromagnesite
-names-golem-dataset-603 = Hydrotalcite
-names-golem-dataset-604 = Hydroxylapatite
-names-golem-dataset-605 = Hydrozincite
-names-golem-dataset-606 = Ianbruceite
-names-golem-dataset-607 = Ice
-names-golem-dataset-608 = Icosahedrite
-names-golem-dataset-609 = Idrialite
-names-golem-dataset-610 = Ikaite
-names-golem-dataset-611 = Illite
-names-golem-dataset-612 = Ilmenite
-names-golem-dataset-613 = Ilvaite
-names-golem-dataset-614 = Imogolite
-names-golem-dataset-615 = Indite
-names-golem-dataset-616 = Indium
-names-golem-dataset-617 = Inyoite
-names-golem-dataset-618 = Iodargyrite
-names-golem-dataset-619 = Iranite
-names-golem-dataset-620 = Iridium
-names-golem-dataset-621 = Iron
-names-golem-dataset-622 = Ixiolite
-names-golem-dataset-623 = Jacobsite
-names-golem-dataset-624 = Jadarite
-names-golem-dataset-625 = Jadeite
-names-golem-dataset-626 = Jaffeite
-names-golem-dataset-627 = Jalpaite
-names-golem-dataset-628 = Jamesonite
-names-golem-dataset-629 = Janggunite
-names-golem-dataset-630 = Jarosewichite
-names-golem-dataset-631 = Jarosite
-names-golem-dataset-632 = Jennite
-names-golem-dataset-633 = Jeremejevite
-names-golem-dataset-634 = Jerrygibbsite
-names-golem-dataset-635 = Jimthompsonite
-names-golem-dataset-636 = Johannite
-names-golem-dataset-637 = Jolliffeite
-names-golem-dataset-638 = Jonesite
-names-golem-dataset-639 = Jordanite
-names-golem-dataset-640 = Julgoldite
-names-golem-dataset-641 = Junitoite
-names-golem-dataset-642 = Jurbanite
-names-golem-dataset-643 = Kaatialaite
-names-golem-dataset-644 = Kadyrelite
-names-golem-dataset-645 = Kaersutite
-names-golem-dataset-646 = Kainite
-names-golem-dataset-647 = Kainosite
-names-golem-dataset-648 = Kalininite
-names-golem-dataset-649 = Kalinite
-names-golem-dataset-650 = Kalsilite
-names-golem-dataset-651 = Kamacite
-names-golem-dataset-652 = Kambaldaite
-names-golem-dataset-653 = Kamiokite
-names-golem-dataset-654 = Kampfite
-names-golem-dataset-655 = Kankite
-names-golem-dataset-656 = Kanoite
-names-golem-dataset-657 = Kaolinite
-names-golem-dataset-658 = Karlite
-names-golem-dataset-659 = Kassite
-names-golem-dataset-660 = Kegelite
-names-golem-dataset-661 = Keilite
-names-golem-dataset-662 = Kermesite
-names-golem-dataset-663 = Kernite
-names-golem-dataset-664 = Kesterite
-names-golem-dataset-665 = Keyite
-names-golem-dataset-666 = Khatyrkite
-names-golem-dataset-667 = Kieserite
-names-golem-dataset-668 = Kinoite
-names-golem-dataset-669 = Knebelite
-names-golem-dataset-670 = Knorringite
-names-golem-dataset-671 = Kobellite
-names-golem-dataset-672 = Kochite
-names-golem-dataset-673 = Kogarkoite
-names-golem-dataset-674 = Kolbeckite
-names-golem-dataset-675 = Kornerupine
-names-golem-dataset-676 = Kosmochlor
-names-golem-dataset-677 = Kostovite
-names-golem-dataset-678 = Kottigite
-names-golem-dataset-679 = Kovdorskite
-names-golem-dataset-680 = Kratochv�lite
-names-golem-dataset-681 = Kremersite
-names-golem-dataset-682 = Krennerite
-names-golem-dataset-683 = Krieselite
-names-golem-dataset-684 = Krohnkite
-names-golem-dataset-685 = Krotite
-names-golem-dataset-686 = Krutovite
-names-golem-dataset-687 = Kukharenkoite
-names-golem-dataset-688 = Kuratite
-names-golem-dataset-689 = Kurnakovite
-names-golem-dataset-690 = Kutnohorite
-names-golem-dataset-691 = Kyanite
-names-golem-dataset-692 = Labradorite
-names-golem-dataset-693 = Lanarkite
-names-golem-dataset-694 = Langbeinite
-names-golem-dataset-695 = Langite
-names-golem-dataset-696 = Lansfordite
-names-golem-dataset-697 = Lanthanite
-names-golem-dataset-698 = Laplandite
-names-golem-dataset-699 = Larnite
-names-golem-dataset-700 = Laumontite
-names-golem-dataset-701 = Laurionite
-names-golem-dataset-702 = Laurite
-names-golem-dataset-703 = Lautite
-names-golem-dataset-704 = Lavendulan
-names-golem-dataset-705 = Lawsonite
-names-golem-dataset-706 = Lazulite
-names-golem-dataset-707 = Lazurite
-names-golem-dataset-708 = Lead
-names-golem-dataset-709 = Leadhillite
-names-golem-dataset-710 = Legrandite
-names-golem-dataset-711 = Leifite
-names-golem-dataset-712 = Leightonite
-names-golem-dataset-713 = Lepidocrocite
-names-golem-dataset-714 = Lepidolite
-names-golem-dataset-715 = Letovicite
-names-golem-dataset-716 = Leucite
-names-golem-dataset-717 = Leucophanite
-names-golem-dataset-718 = Leucophoenicite
-names-golem-dataset-719 = Levyne
-names-golem-dataset-720 = Libethenite
-names-golem-dataset-721 = Liebigite
-names-golem-dataset-722 = Linarite
-names-golem-dataset-723 = Lindgrenite
-names-golem-dataset-724 = Linnaeite
-names-golem-dataset-725 = Lipscombite
-names-golem-dataset-726 = Liroconite
-names-golem-dataset-727 = Litharge
-names-golem-dataset-728 = Lithiophilite
-names-golem-dataset-729 = Livingstonite
-names-golem-dataset-730 = Lizardite
-names-golem-dataset-731 = Loellingite
-names-golem-dataset-732 = Lonsdaleite
-names-golem-dataset-733 = Loparite
-names-golem-dataset-734 = Lopezite
-names-golem-dataset-735 = Lorandite
-names-golem-dataset-736 = Lorenzenite
-names-golem-dataset-737 = Loveringite
-names-golem-dataset-738 = Ludlamite
-names-golem-dataset-739 = Ludwigite
-names-golem-dataset-740 = Lulzacite
-names-golem-dataset-741 = Lyonsite
-names-golem-dataset-742 = Macaulayite
-names-golem-dataset-743 = Macdonaldite
-names-golem-dataset-744 = Mackinawite
-names-golem-dataset-745 = Madocite
-names-golem-dataset-746 = Magadiite
-names-golem-dataset-747 = Maghemite
-names-golem-dataset-748 = Magnesioferrite
-names-golem-dataset-749 = Magnesiohastingsite
-names-golem-dataset-750 = Magnesiopascoite
-names-golem-dataset-751 = Magnesite
-names-golem-dataset-752 = Magnetite
-names-golem-dataset-753 = Majorite
-names-golem-dataset-754 = Malachite
-names-golem-dataset-755 = Malayaite
-names-golem-dataset-756 = Manganite
-names-golem-dataset-757 = Manganosite
-names-golem-dataset-758 = Manganvesuvianite
-names-golem-dataset-759 = Marcasite
-names-golem-dataset-760 = Margaritasite
-names-golem-dataset-761 = Margarite
-names-golem-dataset-762 = Marialite
-names-golem-dataset-763 = Maricite
-names-golem-dataset-764 = Marrite
-names-golem-dataset-765 = Marthozite
-names-golem-dataset-766 = Mascagnite
-names-golem-dataset-767 = Massicot
-names-golem-dataset-768 = Masuyite
-names-golem-dataset-769 = Matlockite
-names-golem-dataset-770 = Maucherite
-names-golem-dataset-771 = Mawsonite
-names-golem-dataset-772 = Mckelveyite
-names-golem-dataset-773 = Meionite
-names-golem-dataset-774 = Melanophlogite
-names-golem-dataset-775 = Melanterite
-names-golem-dataset-776 = Melilite
-names-golem-dataset-777 = Mellite
-names-golem-dataset-778 = Melonite
-names-golem-dataset-779 = Mendipite
-names-golem-dataset-780 = Mendozite
-names-golem-dataset-781 = Meneghinite
-names-golem-dataset-782 = Mercury
-names-golem-dataset-783 = Mereheadite
-names-golem-dataset-784 = Merenskyite
-names-golem-dataset-785 = Meridianiite
-names-golem-dataset-786 = Merrillite
-names-golem-dataset-787 = Mesolite
-names-golem-dataset-788 = Messelite
-names-golem-dataset-789 = Metacinnabar
-names-golem-dataset-790 = Metatorbernite
-names-golem-dataset-791 = Metazeunerite
-names-golem-dataset-792 = Meyerhofferite
-names-golem-dataset-793 = Miargyrite
-names-golem-dataset-794 = Mica
-names-golem-dataset-795 = Microcline
-names-golem-dataset-796 = Microlite
-names-golem-dataset-797 = Millerite
-names-golem-dataset-798 = Millosevichite
-names-golem-dataset-799 = Mimetite
-names-golem-dataset-800 = Minium
-names-golem-dataset-801 = Minnesotaite
-names-golem-dataset-802 = Minyulite
-names-golem-dataset-803 = Mirabilite
-names-golem-dataset-804 = Mixite
-names-golem-dataset-805 = Moganite
-names-golem-dataset-806 = Mohite
-names-golem-dataset-807 = Mohrite
-names-golem-dataset-808 = Moissanite
-names-golem-dataset-809 = Molybdenite
-names-golem-dataset-810 = Molybdite
-names-golem-dataset-811 = Monazite
-names-golem-dataset-812 = Monohydrocalcite
-names-golem-dataset-813 = Monticellite
-names-golem-dataset-814 = Montmorillonite
-names-golem-dataset-815 = Mooihoekite
-names-golem-dataset-816 = Moolooite
-names-golem-dataset-817 = Mordenite
-names-golem-dataset-818 = Moschellandsbergite
-names-golem-dataset-819 = Mosesite
-names-golem-dataset-820 = Mottramite
-names-golem-dataset-821 = Motukoreaite
-names-golem-dataset-822 = Mullite
-names-golem-dataset-823 = Mundite
-names-golem-dataset-824 = Murdochite
-names-golem-dataset-825 = Muscovite
-names-golem-dataset-826 = Musgravite
-names-golem-dataset-827 = Nabalamprophyllite
-names-golem-dataset-828 = Nabesite
-names-golem-dataset-829 = Nacrite
-names-golem-dataset-830 = Nadorite
-names-golem-dataset-831 = Nagyagite
-names-golem-dataset-832 = Nahcolite
-names-golem-dataset-833 = Naldrettite
-names-golem-dataset-834 = Nambulite
-names-golem-dataset-835 = Narsarsukite
-names-golem-dataset-836 = Native copper
-names-golem-dataset-837 = Natrolite
-names-golem-dataset-838 = Natron
-names-golem-dataset-839 = Natrophilite
-names-golem-dataset-840 = Nekrasovite
-names-golem-dataset-841 = Nelenite
-names-golem-dataset-842 = Nenadkevichite
-names-golem-dataset-843 = Nepheline
-names-golem-dataset-844 = Nepouite
-names-golem-dataset-845 = Neptunite
-names-golem-dataset-846 = Nichromite
-names-golem-dataset-847 = Nickel
-names-golem-dataset-848 = Nickeline
-names-golem-dataset-849 = Niedermayrite
-names-golem-dataset-850 = Niningerite
-names-golem-dataset-851 = Nissonite
-names-golem-dataset-852 = Niter
-names-golem-dataset-853 = Nitratine
-names-golem-dataset-854 = Nobleite
-names-golem-dataset-855 = Nontronite
-names-golem-dataset-856 = Norbergite
-names-golem-dataset-857 = Normandite
-names-golem-dataset-858 = Northupite
-names-golem-dataset-859 = Nosean
-names-golem-dataset-860 = Nsutite
-names-golem-dataset-861 = Nyerereite
-names-golem-dataset-862 = kenite
-names-golem-dataset-863 = Oldhamite
-names-golem-dataset-864 = Olgite
-names-golem-dataset-865 = Olivenite
-names-golem-dataset-866 = Olivine
-names-golem-dataset-867 = Omphacite
-names-golem-dataset-868 = Ordonezite
-names-golem-dataset-869 = Oregonite
-names-golem-dataset-870 = Orpiment
-names-golem-dataset-871 = Orthoclase
-names-golem-dataset-872 = Osarizawaite
-names-golem-dataset-873 = Osmium
-names-golem-dataset-874 = Osumilite
-names-golem-dataset-875 = Otavite
-names-golem-dataset-876 = Ottrelite
-names-golem-dataset-877 = Otwayite
-names-golem-dataset-878 = Paakkonenite
-names-golem-dataset-879 = Pabstite
-names-golem-dataset-880 = Painite
-names-golem-dataset-881 = Palladium
-names-golem-dataset-882 = Palygorskite
-names-golem-dataset-883 = Panethite
-names-golem-dataset-884 = Panguite
-names-golem-dataset-885 = Papagoite
-names-golem-dataset-886 = Paragonite
-names-golem-dataset-887 = Paralaurionite
-names-golem-dataset-888 = Paramelaconite
-names-golem-dataset-889 = Pararealgar
-names-golem-dataset-890 = Pargasite
-names-golem-dataset-891 = Parisite
-names-golem-dataset-892 = Parsonsite
-names-golem-dataset-893 = Partheite
-names-golem-dataset-894 = Pascoite
-names-golem-dataset-895 = Patronite
-names-golem-dataset-896 = Paulingite
-names-golem-dataset-897 = Paulscherrerite
-names-golem-dataset-898 = Pearceite
-names-golem-dataset-899 = Pecoraite
-names-golem-dataset-900 = Pectolite
-names-golem-dataset-901 = Penikisite
-names-golem-dataset-902 = Penroseite
-names-golem-dataset-903 = Pentagonite
-names-golem-dataset-904 = Pentlandite
-names-golem-dataset-905 = Perhamite
-names-golem-dataset-906 = Periclase
-names-golem-dataset-907 = Perite
-names-golem-dataset-908 = Perovskite
-names-golem-dataset-909 = Petalite
-names-golem-dataset-910 = Petzite
-names-golem-dataset-911 = Pezzottaite
-names-golem-dataset-912 = Pharmacolite
-names-golem-dataset-913 = Pharmacosiderite
-names-golem-dataset-914 = Phenakite
-names-golem-dataset-915 = Phillipsite
-names-golem-dataset-916 = Phlogopite
-names-golem-dataset-917 = Phoenicochroite
-names-golem-dataset-918 = Phosgenite
-names-golem-dataset-919 = Phosphophyllite
-names-golem-dataset-920 = Phosphuranylite
-names-golem-dataset-921 = Pickeringite
-names-golem-dataset-922 = Picropharmacolite
-names-golem-dataset-923 = Piemontite
-names-golem-dataset-924 = Pigeonite
-names-golem-dataset-925 = Pinalite
-names-golem-dataset-926 = Pinnoite
-names-golem-dataset-927 = Piypite
-names-golem-dataset-928 = Plagioclase
-names-golem-dataset-929 = Plancheite
-names-golem-dataset-930 = Platinum
-names-golem-dataset-931 = Plattnerite
-names-golem-dataset-932 = Playfairite
-names-golem-dataset-933 = Plumbogummite
-names-golem-dataset-934 = Polarite
-names-golem-dataset-935 = Pollucite
-names-golem-dataset-936 = Polybasite
-names-golem-dataset-937 = Polycrase
-names-golem-dataset-938 = Polydymite
-names-golem-dataset-939 = Polyhalite
-names-golem-dataset-940 = Portlandite
-names-golem-dataset-941 = Posnjakite
-names-golem-dataset-942 = Poudretteite
-names-golem-dataset-943 = Povondraite
-names-golem-dataset-944 = Powellite
-names-golem-dataset-945 = Prehnite
-names-golem-dataset-946 = Proustite
-names-golem-dataset-947 = Pseudobrookite
-names-golem-dataset-948 = Pseudomalachite
-names-golem-dataset-949 = Pseudowollastonite
-names-golem-dataset-950 = Pumpellyite
-names-golem-dataset-951 = Purpurite
-names-golem-dataset-952 = Putnisite
-names-golem-dataset-953 = Pyrargyrite
-names-golem-dataset-954 = Pyrite
-names-golem-dataset-955 = Pyrochlore
-names-golem-dataset-956 = Pyrolusite
-names-golem-dataset-957 = Pyromorphite
-names-golem-dataset-958 = Pyrope
-names-golem-dataset-959 = Pyrophanite
-names-golem-dataset-960 = Pyrophyllite
-names-golem-dataset-961 = Pyroxene
-names-golem-dataset-962 = Pyroxferroite
-names-golem-dataset-963 = Pyroxmangite
-names-golem-dataset-964 = Pyrrhotite
-names-golem-dataset-965 = Rambergite
-names-golem-dataset-966 = Rameauite
-names-golem-dataset-967 = Rammelsbergite
-names-golem-dataset-968 = Rapidcreekite
-names-golem-dataset-969 = Raspite
-names-golem-dataset-970 = Realgar
-names-golem-dataset-971 = Reidite
-names-golem-dataset-972 = Reinerite
-names-golem-dataset-973 = Renierite
-names-golem-dataset-974 = Rheniite
-names-golem-dataset-975 = Rhodium
-names-golem-dataset-976 = Rhodochrosite
-names-golem-dataset-977 = Rhodonite
-names-golem-dataset-978 = Rhodplumsite
-names-golem-dataset-979 = Rhomboclase
-names-golem-dataset-980 = Richterite
-names-golem-dataset-981 = Rickardite
-names-golem-dataset-982 = Riebeckite
-names-golem-dataset-983 = Ringwoodite
-names-golem-dataset-984 = Roaldite
-names-golem-dataset-985 = Robertsite
-names-golem-dataset-986 = Rodalquilarite
-names-golem-dataset-987 = Romanechite
-names-golem-dataset-988 = Romeite
-names-golem-dataset-989 = Rosasite
-names-golem-dataset-990 = Roscoelite
-names-golem-dataset-991 = Roselite
-names-golem-dataset-992 = Rosenbergite
-names-golem-dataset-993 = Rosickyite
-names-golem-dataset-994 = Routhierite
-names-golem-dataset-995 = Rozenite
-names-golem-dataset-996 = Rubicline
-names-golem-dataset-997 = Ruizite
-names-golem-dataset-998 = Russellite
-names-golem-dataset-999 = Ruthenium
-names-golem-dataset-1000 = Rutherfordine
-names-golem-dataset-1001 = Rutile
-names-golem-dataset-1002 = Rynersonite
-names-golem-dataset-1003 = Sabatierite
-names-golem-dataset-1004 = Sabieite
-names-golem-dataset-1005 = Sabinaite
-names-golem-dataset-1006 = Sacrofanite
-names-golem-dataset-1007 = Safflorite
-names-golem-dataset-1008 = Sal Ammoniac
-names-golem-dataset-1009 = Saleeite
-names-golem-dataset-1010 = Saliotite
-names-golem-dataset-1011 = Salzburgite
-names-golem-dataset-1012 = Samarskite
-names-golem-dataset-1013 = Sampleite
-names-golem-dataset-1014 = Samsonite
-names-golem-dataset-1015 = Samuelsonite
-names-golem-dataset-1016 = Sanbornite
-names-golem-dataset-1017 = Saneroite
-names-golem-dataset-1018 = Sanidine
-names-golem-dataset-1019 = Santabarbaraite
-names-golem-dataset-1020 = Santite
-names-golem-dataset-1021 = Saponite
-names-golem-dataset-1022 = Sapphirine
-names-golem-dataset-1023 = Sarabauite
-names-golem-dataset-1024 = Sarkinite
-names-golem-dataset-1025 = Sassolite
-names-golem-dataset-1026 = Satterlyite
-names-golem-dataset-1027 = Sauconite
-names-golem-dataset-1028 = Sborgite
-names-golem-dataset-1029 = Scapolite
-names-golem-dataset-1030 = Schaferite
-names-golem-dataset-1031 = Scheelite
-names-golem-dataset-1032 = Schmiederite
-names-golem-dataset-1033 = Schoepite
-names-golem-dataset-1034 = Schorl
-names-golem-dataset-1035 = Schreibersite
-names-golem-dataset-1036 = Schreyerite
-names-golem-dataset-1037 = Schrockingerite
-names-golem-dataset-1038 = Schwertmannite
-names-golem-dataset-1039 = Scolecite
-names-golem-dataset-1040 = Scorodite
-names-golem-dataset-1041 = Scorzalite
-names-golem-dataset-1042 = Scrutinyite
-names-golem-dataset-1043 = Seamanite
-names-golem-dataset-1044 = Searlesite
-names-golem-dataset-1045 = Seeligerite
-names-golem-dataset-1046 = Segelerite
-names-golem-dataset-1047 = Seifertite
-names-golem-dataset-1048 = Sekaninaite
-names-golem-dataset-1049 = Selenium
-names-golem-dataset-1050 = Seligmannite
-names-golem-dataset-1051 = Sellaite
-names-golem-dataset-1052 = Semseyite
-names-golem-dataset-1053 = Senarmontite
-names-golem-dataset-1054 = Sepiolite
-names-golem-dataset-1055 = Serandite
-names-golem-dataset-1056 = Serendibite
-names-golem-dataset-1057 = Serpentine
-names-golem-dataset-1058 = Serpierite
-names-golem-dataset-1059 = Sewardite
-names-golem-dataset-1060 = Shandite
-names-golem-dataset-1061 = Shattuckite
-names-golem-dataset-1062 = Shigaite
-names-golem-dataset-1063 = Shortite
-names-golem-dataset-1064 = Siderite
-names-golem-dataset-1065 = Siderophyllite
-names-golem-dataset-1066 = Siderotil
-names-golem-dataset-1067 = Siegenite
-names-golem-dataset-1068 = Silicon
-names-golem-dataset-1069 = Sillimanite
-names-golem-dataset-1070 = Silver
-names-golem-dataset-1071 = Simonellite
-names-golem-dataset-1072 = Simpsonite
-names-golem-dataset-1073 = Sincosite
-names-golem-dataset-1074 = Sinkankasite
-names-golem-dataset-1075 = Sinoite
-names-golem-dataset-1076 = Skaergaardite
-names-golem-dataset-1077 = Sklodowskite
-names-golem-dataset-1078 = Skutterudite
-names-golem-dataset-1079 = Smaltite
-names-golem-dataset-1080 = Smectite
-names-golem-dataset-1081 = Smithsonite
-names-golem-dataset-1082 = Sodalite
-names-golem-dataset-1083 = Soddyite
-names-golem-dataset-1084 = Sonolite
-names-golem-dataset-1085 = Sperrylite
-names-golem-dataset-1086 = Spertiniite
-names-golem-dataset-1087 = Spessartine
-names-golem-dataset-1088 = Sphalerite
-names-golem-dataset-1089 = Spherocobaltite
-names-golem-dataset-1090 = Spinel
-names-golem-dataset-1091 = Spodumene
-names-golem-dataset-1092 = Spurrite
-names-golem-dataset-1093 = Stannite
-names-golem-dataset-1094 = Stannoidite
-names-golem-dataset-1095 = Staurolite
-names-golem-dataset-1096 = Steacyite
-names-golem-dataset-1097 = Stellerite
-names-golem-dataset-1098 = Stephanite
-names-golem-dataset-1099 = Stercorite
-names-golem-dataset-1100 = Stibarsen
-names-golem-dataset-1101 = Stibiconite
-names-golem-dataset-1102 = Stibiopalladinite
-names-golem-dataset-1103 = Stibnite
-names-golem-dataset-1104 = Stichtite
-names-golem-dataset-1105 = Stilbite
-names-golem-dataset-1106 = Stilleite
-names-golem-dataset-1107 = Stillwaterite
-names-golem-dataset-1108 = Stillwellite
-names-golem-dataset-1109 = Stilpnomelane
-names-golem-dataset-1110 = Stishovite
-names-golem-dataset-1111 = Stolzite
-names-golem-dataset-1112 = Strashimirite
-names-golem-dataset-1113 = Strengite
-names-golem-dataset-1114 = Stromeyerite
-names-golem-dataset-1115 = Strontianite
-names-golem-dataset-1116 = Struvite
-names-golem-dataset-1117 = Studenitsite
-names-golem-dataset-1118 = Studtite
-names-golem-dataset-1119 = Stutzite
-names-golem-dataset-1120 = Suanite
-names-golem-dataset-1121 = Suessite
-names-golem-dataset-1122 = Sugilite
-names-golem-dataset-1123 = Sulfur
-names-golem-dataset-1124 = Sursassite
-names-golem-dataset-1125 = Susannite
-names-golem-dataset-1126 = Sussexite
-names-golem-dataset-1127 = Svanbergite
-names-golem-dataset-1128 = Sweetite
-names-golem-dataset-1129 = Switzerite
-names-golem-dataset-1130 = Sylvanite
-names-golem-dataset-1131 = Sylvite
-names-golem-dataset-1132 = Synchysite
-names-golem-dataset-1133 = Syngenite
-names-golem-dataset-1134 = Taaffeite
-names-golem-dataset-1135 = Tachyhydrite
-names-golem-dataset-1136 = Taenite
-names-golem-dataset-1137 = Talc
-names-golem-dataset-1138 = Talmessite
-names-golem-dataset-1139 = Talnakhite
-names-golem-dataset-1140 = Tamarugite
-names-golem-dataset-1141 = Tangeite
-names-golem-dataset-1142 = Tantalite
-names-golem-dataset-1143 = Tantite
-names-golem-dataset-1144 = Tapiolite
-names-golem-dataset-1145 = Taranakite
-names-golem-dataset-1146 = Tarapacaite
-names-golem-dataset-1147 = Tarbuttite
-names-golem-dataset-1148 = Tausonite
-names-golem-dataset-1149 = Teallite
-names-golem-dataset-1150 = Tellurite
-names-golem-dataset-1151 = Tellurium
-names-golem-dataset-1152 = Tellurobismuthite
-names-golem-dataset-1153 = Temagamite
-names-golem-dataset-1154 = Tennantite
-names-golem-dataset-1155 = Tenorite
-names-golem-dataset-1156 = Tephroite
-names-golem-dataset-1157 = Terlinguaite
-names-golem-dataset-1158 = Teruggite
-names-golem-dataset-1159 = Tetradymite
-names-golem-dataset-1160 = Tetrahedrite
-names-golem-dataset-1161 = Tetrataenite
-names-golem-dataset-1162 = Thaumasite
-names-golem-dataset-1163 = Thenardite
-names-golem-dataset-1164 = Thermonatrite
-names-golem-dataset-1165 = Thiospinel
-names-golem-dataset-1166 = Thomasclarkite
-names-golem-dataset-1167 = Thomsenolite
-names-golem-dataset-1168 = Thomsonite
-names-golem-dataset-1169 = Thorianite
-names-golem-dataset-1170 = Thorite
-names-golem-dataset-1171 = Thortveitite
-names-golem-dataset-1172 = Tiemannite
-names-golem-dataset-1173 = Tienshanite
-names-golem-dataset-1174 = Tin
-names-golem-dataset-1175 = Tinaksite
-names-golem-dataset-1176 = Tincalconite
-names-golem-dataset-1177 = Titanite
-names-golem-dataset-1178 = Titanium
-names-golem-dataset-1179 = Titanowodginite
-names-golem-dataset-1180 = Tobermorite
-names-golem-dataset-1181 = Todorokite
-names-golem-dataset-1182 = Tokyoite
-names-golem-dataset-1183 = Tongbaite
-names-golem-dataset-1184 = Topaz
-names-golem-dataset-1185 = Torbernite
-names-golem-dataset-1186 = Tourmaline
-names-golem-dataset-1187 = Tranquillityite
-names-golem-dataset-1188 = Tremolite
-names-golem-dataset-1189 = Trevorite
-names-golem-dataset-1190 = Tridymite
-names-golem-dataset-1191 = Triphylite
-names-golem-dataset-1192 = Triplite
-names-golem-dataset-1193 = Triploidite
-names-golem-dataset-1194 = Tripuhyite
-names-golem-dataset-1195 = Troilite
-names-golem-dataset-1196 = Trona
-names-golem-dataset-1197 = Tschermakite
-names-golem-dataset-1198 = Tschermigite
-names-golem-dataset-1199 = Tsumcorite
-names-golem-dataset-1200 = Tsumebite
-names-golem-dataset-1201 = Tugtupite
-names-golem-dataset-1202 = Tungsten
-names-golem-dataset-1203 = Tungstite
-names-golem-dataset-1204 = Tuperssuatsiaite
-names-golem-dataset-1205 = Turquoise
-names-golem-dataset-1206 = Tusionite
-names-golem-dataset-1207 = Tyrolite
-names-golem-dataset-1208 = Tyrrellite
-names-golem-dataset-1209 = Tyuyamunite
-names-golem-dataset-1210 = Uchucchacuaite
-names-golem-dataset-1211 = Uklonskovite
-names-golem-dataset-1212 = Ulexite
-names-golem-dataset-1213 = Ullmannite
-names-golem-dataset-1214 = Ulrichite
-names-golem-dataset-1215 = Ulvospinel
-names-golem-dataset-1216 = Umangite
-names-golem-dataset-1217 = Umbite
-names-golem-dataset-1218 = Upalite
-names-golem-dataset-1219 = Uraninite
-names-golem-dataset-1220 = Uranocircite
-names-golem-dataset-1221 = Uranophane
-names-golem-dataset-1222 = Uranopilite
-names-golem-dataset-1223 = Urea
-names-golem-dataset-1224 = Uricite
-names-golem-dataset-1225 = Urusovite
-names-golem-dataset-1226 = Ussingite
-names-golem-dataset-1227 = Utahite
-names-golem-dataset-1228 = Uvarovite
-names-golem-dataset-1229 = Uytenbogaardtite
-names-golem-dataset-1230 = Vaesite
-names-golem-dataset-1231 = Valentinite
-names-golem-dataset-1232 = Valleriite
-names-golem-dataset-1233 = Vanadinite
-names-golem-dataset-1234 = Vanadiocarpholite
-names-golem-dataset-1235 = Vanadium
-names-golem-dataset-1236 = Vantasselite
-names-golem-dataset-1237 = Vanuralite
-names-golem-dataset-1238 = Variscite
-names-golem-dataset-1239 = Vaterite
-names-golem-dataset-1240 = Vauquelinite
-names-golem-dataset-1241 = Vauxite
-names-golem-dataset-1242 = Veatchite
-names-golem-dataset-1243 = Vermiculite
-names-golem-dataset-1244 = Vesuvianite
-names-golem-dataset-1245 = Villiaumite
-names-golem-dataset-1246 = Violarite
-names-golem-dataset-1247 = Vishnevite
-names-golem-dataset-1248 = Vivianite
-names-golem-dataset-1249 = Vladimirite
-names-golem-dataset-1250 = Vlasovite
-names-golem-dataset-1251 = Volborthite
-names-golem-dataset-1252 = Vulcanite
-names-golem-dataset-1253 = Wadsleyite
-names-golem-dataset-1254 = Wagnerite
-names-golem-dataset-1255 = Wairakite
-names-golem-dataset-1256 = Wakabayashilite
-names-golem-dataset-1257 = Wakefieldite
-names-golem-dataset-1258 = Walfordite
-names-golem-dataset-1259 = Wardite
-names-golem-dataset-1260 = Warikahnite
-names-golem-dataset-1261 = Warwickite
-names-golem-dataset-1262 = Wassonite
-names-golem-dataset-1263 = Wavellite
-names-golem-dataset-1264 = Weddellite
-names-golem-dataset-1265 = Weeksite
-names-golem-dataset-1266 = Weilite
-names-golem-dataset-1267 = Weissite
-names-golem-dataset-1268 = Weloganite
-names-golem-dataset-1269 = Whewellite
-names-golem-dataset-1270 = Whiteite
-names-golem-dataset-1271 = Whitlockite
-names-golem-dataset-1272 = Willemite
-names-golem-dataset-1273 = Wiluite
-names-golem-dataset-1274 = Witherite
-names-golem-dataset-1275 = Wodginite
-names-golem-dataset-1276 = Wolframite
-names-golem-dataset-1277 = Wollastonite
-names-golem-dataset-1278 = Woodhouseite
-names-golem-dataset-1279 = Wulfenite
-names-golem-dataset-1280 = Wurtzite
-names-golem-dataset-1281 = Wustite
-names-golem-dataset-1282 = Wyartite
-names-golem-dataset-1283 = Xanthiosite
-names-golem-dataset-1284 = Xanthoconite
-names-golem-dataset-1285 = Xanthoxenite
-names-golem-dataset-1286 = Xenophyllite
-names-golem-dataset-1287 = Xenotime
-names-golem-dataset-1288 = Xiangjiangite
-names-golem-dataset-1289 = Xieite
-names-golem-dataset-1290 = Xifengite
-names-golem-dataset-1291 = Xilingolite
-names-golem-dataset-1292 = Ximengite
-names-golem-dataset-1293 = Xingzhongite
-names-golem-dataset-1294 = Xitieshanite
-names-golem-dataset-1295 = Xocolatlite
-names-golem-dataset-1296 = Xocomecatlite
-names-golem-dataset-1297 = Xonotlite
-names-golem-dataset-1298 = Ye'elimite
-names-golem-dataset-1299 = Yttrialite
-names-golem-dataset-1300 = Yttropyrochlore
-names-golem-dataset-1301 = Yuksporite
-names-golem-dataset-1302 = Zabuyelite
-names-golem-dataset-1303 = Zaccagnaite
-names-golem-dataset-1304 = Zaherite
-names-golem-dataset-1305 = Zairite
-names-golem-dataset-1306 = Zakharovite
-names-golem-dataset-1307 = Zanazziite
-names-golem-dataset-1308 = Zaratite
-names-golem-dataset-1309 = Zektzerite
-names-golem-dataset-1310 = Zemannite
-names-golem-dataset-1311 = Zeolite
-names-golem-dataset-1312 = Zeunerite
-names-golem-dataset-1313 = Zhanghengite
-names-golem-dataset-1314 = Zharchikhite
-names-golem-dataset-1315 = Zhemchuzhnikovite
-names-golem-dataset-1316 = Ziesite
-names-golem-dataset-1317 = Zimbabweite
-names-golem-dataset-1318 = Zincite
-names-golem-dataset-1319 = Zinclipscombite
-names-golem-dataset-1320 = Zincmelanterite
-names-golem-dataset-1321 = Zincobotryogen
-names-golem-dataset-1322 = Zincochromite
-names-golem-dataset-1323 = Zincolivenite
-names-golem-dataset-1324 = Zinkenite
-names-golem-dataset-1325 = Zinnwaldite
-names-golem-dataset-1326 = Zippeite
-names-golem-dataset-1327 = Zircon
-names-golem-dataset-1328 = Zirconolite
-names-golem-dataset-1329 = Zircophyllite
-names-golem-dataset-1330 = Zirkelite
-names-golem-dataset-1331 = Znucalite
-names-golem-dataset-1332 = Zoisite
-names-golem-dataset-1333 = Zorite
-names-golem-dataset-1334 = Zunyite
-names-golem-dataset-1335 = Zussmanite
-names-golem-dataset-1336 = Zykaite
diff --git a/Resources/Locale/en-US/datasets/names/scurret_first.ftl b/Resources/Locale/en-US/datasets/names/scurret_first.ftl
new file mode 100644
index 0000000000..a01a6db8bb
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/names/scurret_first.ftl
@@ -0,0 +1,67 @@
+# Scurrets from Planet Wawa have two parts to their name - a 'chosen' and 'qualitative' name.
+
+# The chosen name is picked by the scurret themselves,
+# encompassing a trait or value they hold themselves
+# to or have a high value for. Scurrets sometimes change this
+# name to denote an important moment in their life.
+
+# It appears to be common for scurret sets to share the same
+# chosen name, with the gaining of a pup's own chosen name
+# signalling their transition to adulthood in the community.
+
+# Given the scurret language is untranslated, these names are
+# usually guessed via charades or Pictionary.
+
+# When all else fails, to NT and her crews, Wa is as good a name as any.
+
+names-scurret-first-dataset-1 = Wa
+names-scurret-first-dataset-2 = Calm
+names-scurret-first-dataset-3 = Contented
+names-scurret-first-dataset-4 = Patient
+names-scurret-first-dataset-5 = Relaxed
+names-scurret-first-dataset-6 = Serene
+names-scurret-first-dataset-7 = Blissful
+names-scurret-first-dataset-8 = Eager
+names-scurret-first-dataset-9 = Happy
+names-scurret-first-dataset-10 = Inspired
+names-scurret-first-dataset-11 = Lively
+names-scurret-first-dataset-12 = Playful
+names-scurret-first-dataset-13 = Radiant
+names-scurret-first-dataset-14 = Vibrant
+names-scurret-first-dataset-15 = Brave
+names-scurret-first-dataset-16 = Capable
+names-scurret-first-dataset-17 = Confident
+names-scurret-first-dataset-18 = Daring
+names-scurret-first-dataset-19 = Proud
+names-scurret-first-dataset-20 = Valiant
+names-scurret-first-dataset-21 = Caring
+names-scurret-first-dataset-22 = Compassionate
+names-scurret-first-dataset-23 = Empathic
+names-scurret-first-dataset-24 = Strong
+names-scurret-first-dataset-25 = Free
+names-scurret-first-dataset-26 = Lucky
+names-scurret-first-dataset-27 = Worthy
+names-scurret-first-dataset-28 = Blessed
+names-scurret-first-dataset-29 = Fortunate
+names-scurret-first-dataset-30 = Trusting
+names-scurret-first-dataset-31 = Fast
+names-scurret-first-dataset-32 = Energetic
+names-scurret-first-dataset-33 = Wise
+names-scurret-first-dataset-34 = Alert
+names-scurret-first-dataset-35 = Uplifting
+names-scurret-first-dataset-36 = Considerate
+names-scurret-first-dataset-37 = Surviving
+names-scurret-first-dataset-38 = Meditating
+names-scurret-first-dataset-39 = Hunting
+names-scurret-first-dataset-40 = Watching
+names-scurret-first-dataset-41 = Resting
+names-scurret-first-dataset-42 = Delivering
+names-scurret-first-dataset-43 = Swimming
+names-scurret-first-dataset-44 = Swinging
+names-scurret-first-dataset-45 = Exploding
+names-scurret-first-dataset-46 = Romancing
+names-scurret-first-dataset-47 = Far-Seeing
+names-scurret-first-dataset-48 = Loyal
+names-scurret-first-dataset-49 = Inquisitive
+# After consulting with lawyers, NT added this one to the dictionary.
+names-scurret-first-dataset-50 = Legally Distinct
diff --git a/Resources/Locale/en-US/datasets/names/scurret_last.ftl b/Resources/Locale/en-US/datasets/names/scurret_last.ftl
new file mode 100644
index 0000000000..bac9b818d1
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/names/scurret_last.ftl
@@ -0,0 +1,68 @@
+# Scurrets from Planet Wawa have two parts to their name - a 'chosen' and 'qualitative' name.
+
+# The qualitative name is usually related to an important feature
+# of Wawa's wetland habitats that the scurret is associated with
+# by their community.
+
+# Scurret pups, due to both their quantity and complete lack
+# of any survival instinct, lack a qualitative name entirely.
+# Researchers believe their parents simply give them a number.
+
+# Given that the scurret language is untranslated, these names are
+# usually deduced via the showing of photographs, annoyed and
+# repeated pointing at nearby objects, or games of Pictionary.
+
+# When all else fails, to NT and her crews, Wa is as good a name as any.
+
+names-scurret-last-dataset-1 = Wa
+names-scurret-last-dataset-2 = Trees
+names-scurret-last-dataset-3 = Plants
+names-scurret-last-dataset-4 = Rocks
+names-scurret-last-dataset-5 = Rivers
+names-scurret-last-dataset-6 = Groves
+names-scurret-last-dataset-7 = Lakes
+names-scurret-last-dataset-8 = Marshes
+names-scurret-last-dataset-9 = Springs
+names-scurret-last-dataset-10 = Reeds
+names-scurret-last-dataset-11 = Sunshine
+names-scurret-last-dataset-12 = Rain
+names-scurret-last-dataset-13 = Clouds
+names-scurret-last-dataset-14 = Snowfalls
+names-scurret-last-dataset-15 = Stones
+names-scurret-last-dataset-16 = Pebbles
+names-scurret-last-dataset-17 = Fishes
+names-scurret-last-dataset-18 = Insects
+names-scurret-last-dataset-19 = Fruits
+names-scurret-last-dataset-20 = Flowers
+names-scurret-last-dataset-21 = Blossoms
+names-scurret-last-dataset-22 = Fogs
+names-scurret-last-dataset-23 = Willows
+names-scurret-last-dataset-24 = Alders
+names-scurret-last-dataset-25 = Birches
+names-scurret-last-dataset-26 = Poplars
+names-scurret-last-dataset-27 = Marigolds
+names-scurret-last-dataset-28 = Rowans
+names-scurret-last-dataset-29 = Orchids
+names-scurret-last-dataset-30 = Rushes
+names-scurret-last-dataset-31 = Lillies
+names-scurret-last-dataset-32 = Violets
+names-scurret-last-dataset-33 = Maples
+names-scurret-last-dataset-34 = Oaks
+names-scurret-last-dataset-35 = Hazels
+# AND SIR GIDEON OFNIR
+names-scurret-last-dataset-36 = the All-Knowing
+names-scurret-last-dataset-37 = Tarns
+names-scurret-last-dataset-38 = Waters
+names-scurret-last-dataset-39 = Reservoirs
+names-scurret-last-dataset-40 = Dams
+names-scurret-last-dataset-41 = Moors
+names-scurret-last-dataset-42 = Fens
+names-scurret-last-dataset-43 = Temples
+names-scurret-last-dataset-44 = Hills
+names-scurret-last-dataset-45 = Copses
+names-scurret-last-dataset-46 = Fields
+names-scurret-last-dataset-47 = Ancestors
+names-scurret-last-dataset-48 = Forests
+names-scurret-last-dataset-49 = Secrets
+# Nobody's quite sure how this one is in the dictionary.
+names-scurret-last-dataset-50 = Space Ferret
diff --git a/Resources/Locale/en-US/emote/emote.ftl b/Resources/Locale/en-US/emote/emote.ftl
new file mode 100644
index 0000000000..11ccd71178
--- /dev/null
+++ b/Resources/Locale/en-US/emote/emote.ftl
@@ -0,0 +1,2 @@
+chat-system-emote-cancelled-generic = You can't {$emote} right now!
+chat-system-emote-cancelled-blocked = You can't {$emote} because of {THE($blocker)}!
diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index f36bbe1ae7..0c96aa6edb 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/markings/undergarment.ftl b/Resources/Locale/en-US/markings/undergarment.ftl
index 4e2c5c91fa..3740d0573d 100644
--- a/Resources/Locale/en-US/markings/undergarment.ftl
+++ b/Resources/Locale/en-US/markings/undergarment.ftl
@@ -1,21 +1,21 @@
-marking-UndergarmentTopTanktop-tanktop = Tanktop
-marking-UndergarmentTopBinder-binder = Binder
-marking-UndergarmentTopBra-classic = Classic Bra
-marking-UndergarmentTopSportsbra-sports = Sports Bra
+marking-UndergarmentTopTanktop = Tanktop
+marking-UndergarmentTopBinder = Binder
+marking-UndergarmentTopBra = Classic Bra
+marking-UndergarmentTopSportsbra = Sports Bra
 
-marking-UndergarmentBottomBoxers-boxers = Boxers
-marking-UndergarmentBottomBriefs-briefs = Briefs
-marking-UndergarmentBottomSatin-satin = Satin
+marking-UndergarmentBottomBoxers = Boxers
+marking-UndergarmentBottomBriefs = Briefs
+marking-UndergarmentBottomSatin = Satin
 
-marking-UndergarmentTopTanktopVox-tanktop_vox = Tanktop
-marking-UndergarmentTopBinderVox-binder_vox = Binder
-marking-UndergarmentTopBraVox-classic_vox = Classic Bra
-marking-UndergarmentTopSportsbraVox-sports_vox = Sports Bra
+marking-UndergarmentTopTanktopVox = Tanktop
+marking-UndergarmentTopBinderVox = Binder
+marking-UndergarmentTopBraVox = Classic Bra
+marking-UndergarmentTopSportsbraVox = Sports Bra
 
-marking-UndergarmentBottomBoxersVox-boxers_vox = Boxers
-marking-UndergarmentBottomBriefsVox-briefs_vox = Briefs
-marking-UndergarmentBottomSatinVox-satin_vox = Satin
+marking-UndergarmentBottomBoxersVox = Boxers
+marking-UndergarmentBottomBriefsVox = Briefs
+marking-UndergarmentBottomSatinVox = Satin
 
-marking-UndergarmentBottomBoxersReptilian-boxers_reptilian = Boxers
-marking-UndergarmentBottomBriefsReptilian-briefs_reptilian = Briefs
-marking-UndergarmentBottomSatinReptilian-satin_reptilian = Satin
+marking-UndergarmentBottomBoxersReptilian = Boxers
+marking-UndergarmentBottomBriefsReptilian = Briefs
+marking-UndergarmentBottomSatinReptilian = Satin
diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl
new file mode 100644
index 0000000000..1ae829ebbf
--- /dev/null
+++ b/Resources/Locale/en-US/markings/vox.ftl
@@ -0,0 +1,56 @@
+marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart)
+marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart)
+
+marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart)
+marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart)
+
+marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive)
+marking-TattooVoxHiveChest = Vox Chest Tattoo (hive)
+
+marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling)
+marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling)
+
+marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar
+marking-VoxScarEyeRight = Eye Scar (Right)
+
+marking-VoxScarEyeLeft-vox_scar_eye_left = Left Eye Scar
+marking-VoxScarEyeLeft = Eye Scar (Left)
+
+marking-VoxScarTopSurgeryShort-vox_scar_top_surgery_short = Thoracotomy Scar
+marking-VoxScarTopSurgeryShort = Thoracotomy Scar
+
+marking-VoxScarTopSurgeryLong-vox_scar_top_surgery_long = Clamshell Scar
+marking-VoxScarTopSurgeryLong = Clamshell Scar
+
+marking-VoxScarChest-vox_scar_chest = Chest Scar
+marking-VoxScarChest = Chest Scar
+
+marking-VoxScarNeck-vox_scar_neck = Neck Scar
+marking-VoxScarNeck = Neck Scar
+
+marking-VoxScarChestBullets-vox_scar_chest_bullets = Bullet Holes Scar
+marking-VoxScarChestBullets = Chest Scar (Bullets)
+
+marking-VoxScarStomachBullets-vox_scar_stomach_bullets = Bullet Holes Scar
+marking-VoxScarStomachBullets = Stomach Scar (Bullets)
+
+marking-VoxScarFace1-vox_scar_face_1 = Face Scar
+marking-VoxScarFace1 = Face Scar (Large)
+
+marking-VoxScarFace2-vox_scar_face_2 = Face Scar
+marking-VoxScarFace2 = Face Scar (Small)
+
+marking-VoxScarEyeRightSmall-vox_scar_eye_right_small = Right Eye Scar (Small)
+marking-VoxScarEyeRightSmall = Small Eye Scar (Right)
+
+marking-VoxScarEyeLeftSmall-vox_scar_eye_left_small = Left Eye Scar (Small)
+marking-VoxScarEyeLeftSmall = Small Eye Scar (Left)
+
+marking-VoxTailShort-vox_tail_small = Vox Tail (Short)
+marking-VoxTailShort = Vox Tail (Short)
+
+marking-VoxTail-vox_tail = Vox Tail (Medium)
+marking-VoxTail = Vox Tail (Medium)
+
+marking-VoxTailBig-vox_tail_big = Vox Tail (Big)
+marking-VoxTailBig = Vox Tail (Big)
\ No newline at end of file
diff --git a/Resources/Locale/en-US/name-identifier.ftl b/Resources/Locale/en-US/name-identifier.ftl
new file mode 100644
index 0000000000..31a3986d2b
--- /dev/null
+++ b/Resources/Locale/en-US/name-identifier.ftl
@@ -0,0 +1,9 @@
+name-identifier-format-monkey = MK-{$number}
+name-identifier-format-kobold = KB-{$number}
+name-identifier-format-holoparasite = HOLO-{$number}
+name-identifier-format-mmi = MMI-{$number}
+name-identifier-format-positronic-brain = PB-{$number}
+name-identifier-format-silicon = Si-{$number}
+name-identifier-format-xenoborg = Xi-{$number}
+name-identifier-format-station-ai = AI-{$number}
+name-identifier-format-telepad = TELE-{$number}
diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 62b03f9436..39d39e7f0c 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -30,12 +30,6 @@ construction-graph-tag-medical-hud = medical hud
 # security
 construction-graph-tag-sun-glasses = sun glasses
 construction-graph-tag-security-helmet = security helmet
-construction-graph-tag-strobe-shield = strobe riot shield
-construction-graph-tag-flash = security flash
-construction-graph-tag-upgradeflaregun = upgrade kit (security flare gun)
-construction-graph-tag-upgradedrozd = upgrade kit (Drozd)
-construction-graph-tag-upgradelecter = upgrade kit (Lecter)
-construction-graph-tag-ModularReceiverAuto = modular auto receiver
 
 # materials
 construction-graph-tag-manipulator = modular machine part
@@ -57,7 +51,6 @@ construction-graph-tag-power-cell-small = power cell small
 construction-graph-tag-power-cell = power cell
 construction-graph-tag-potato-battery = a potato battery
 construction-graph-tag-super-compact-ai-chip = a super-compact AI chip
-construction-graph-tag-paper = paper
 
 # other
 construction-graph-tag-light-bulb = light bulb
@@ -78,7 +71,7 @@ construction-graph-tag-corgi-hide = corgi hide
 construction-graph-tag-apron = an apron
 construction-graph-tag-utility-belt = a utility belt
 soil-construction-graph-any-mushroom = any mushroom
-construction-graph-tag-matchstick = matchstick
+construction-graph-tag-mop-basic = mop
 
 # toys
 construction-graph-tag-rubber-ducky = a rubber ducky
diff --git a/Resources/Locale/en-US/reflect/reflect-component.ftl b/Resources/Locale/en-US/reflect/reflect-component.ftl
new file mode 100644
index 0000000000..bf3f612af3
--- /dev/null
+++ b/Resources/Locale/en-US/reflect/reflect-component.ftl
@@ -0,0 +1,3 @@
+reflect-component-examine = It has a [color=lightblue]{$value}%[/color] chance to [color=cyan]reflect[/color] {$type}.
+reflect-component-nonenergy = bullets
+reflect-component-energy = energy bolts
diff --git a/Resources/Locale/en-US/smartfridge/smartfridge.ftl b/Resources/Locale/en-US/smartfridge/smartfridge.ftl
new file mode 100644
index 0000000000..e7960367b9
--- /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/spray-painter/spray-painter.ftl b/Resources/Locale/en-US/spray-painter/spray-painter.ftl
new file mode 100644
index 0000000000..dc54c5c8b8
--- /dev/null
+++ b/Resources/Locale/en-US/spray-painter/spray-painter.ftl
@@ -0,0 +1,194 @@
+# Components
+spray-painter-ammo-on-examine = It holds {$charges} charges.
+spray-painter-ammo-after-interact-full = The spray painter is full!
+spray-painter-ammo-after-interact-refilled = You refill the spray painter.
+
+spray-painter-interact-no-charges = Not enough paint left.
+spray-painter-interact-nothing-to-remove = Nothing to remove!
+
+spray-painter-on-examined-painted-message = It seems to have been freshly painted.
+spray-painter-style-not-available = Cannot apply the selected style to this object.
+
+spray-painter-verb-toggle-decals = Toggle decal painting
+
+spray-painter-item-status-label = Decals: {$mode}
+spray-painter-item-status-add = [color=green]Add[/color]
+spray-painter-item-status-remove = [color=red]Remove[/color]
+spray-painter-item-status-off = [color=gray]Off[/color]
+
+# UI
+spray-painter-window-title = Spray Painter
+
+spray-painter-selected-style = Selected style:
+
+spray-painter-selected-decals = Selected decal:
+spray-painter-use-custom-color = Use custom color
+spray-painter-use-snap-to-tile = Snap to tile
+
+spray-painter-angle-rotation = Rotation:
+spray-painter-angle-rotation-90-sub = -90°
+spray-painter-angle-rotation-reset = 0°
+spray-painter-angle-rotation-90-add = +90°
+
+spray-painter-selected-color = Selected color:
+spray-painter-color-red = red
+spray-painter-color-yellow = yellow
+spray-painter-color-brown = brown
+spray-painter-color-green = green
+spray-painter-color-cyan = cyan
+spray-painter-color-blue = blue
+spray-painter-color-white = white
+spray-painter-color-black = black
+
+# Categories (tabs)
+spray-painter-tab-category-airlocks = Airlocks
+spray-painter-tab-category-canisters = Canisters
+spray-painter-tab-category-crates = Crates
+spray-painter-tab-category-lockers = Lockers
+spray-painter-tab-category-pipes = Pipes
+spray-painter-tab-category-decals = Decals
+
+# Groups (subtabs)
+spray-painter-tab-group-airlockstandard = Standard
+spray-painter-tab-group-airlockglass = Glass
+
+spray-painter-tab-group-cratesteel = Steel
+spray-painter-tab-group-crateplastic = Plastic
+spray-painter-tab-group-cratesecure = Secure
+
+spray-painter-tab-group-closet = Unlocked
+spray-painter-tab-group-locker = Secure
+spray-painter-tab-group-wallcloset = Unlocked (Wall)
+spray-painter-tab-group-walllocker = Secure (Wall)
+
+# Airlocks
+spray-painter-style-airlockstandard-atmospherics = Atmospheric
+spray-painter-style-airlockstandard-basic = Basic
+spray-painter-style-airlockstandard-cargo = Cargo
+spray-painter-style-airlockstandard-chemistry = Chemistry
+spray-painter-style-airlockstandard-command = Command
+spray-painter-style-airlockstandard-engineering = Engineering
+spray-painter-style-airlockstandard-freezer = Freezer
+spray-painter-style-airlockstandard-hydroponics = Hydroponics
+spray-painter-style-airlockstandard-maintenance = Maintenance
+spray-painter-style-airlockstandard-medical = Medical
+spray-painter-style-airlockstandard-salvage = Salvage
+spray-painter-style-airlockstandard-science = Science
+spray-painter-style-airlockstandard-security = Security
+spray-painter-style-airlockstandard-virology = Virology
+
+spray-painter-style-airlockglass-atmospherics = Atmospherics
+spray-painter-style-airlockglass-basic = Basic
+spray-painter-style-airlockglass-cargo = Cargo
+spray-painter-style-airlockglass-chemistry = Chemistry
+spray-painter-style-airlockglass-command = Command
+spray-painter-style-airlockglass-engineering = Engineering
+spray-painter-style-airlockglass-hydroponics = Hydroponics
+spray-painter-style-airlockglass-maintenance = Maintenance
+spray-painter-style-airlockglass-medical = Medical
+spray-painter-style-airlockglass-salvage = Salvage
+spray-painter-style-airlockglass-science = Science
+spray-painter-style-airlockglass-security = Security
+spray-painter-style-airlockglass-virology = Virology
+
+# Lockers
+spray-painter-style-locker-atmospherics = Atmospherics
+spray-painter-style-locker-basic = Basic
+spray-painter-style-locker-botanist = Botanist
+spray-painter-style-locker-brigmedic = Brigmedic
+spray-painter-style-locker-captain = Captain
+spray-painter-style-locker-ce = CE
+spray-painter-style-locker-chemical = Chemical
+spray-painter-style-locker-clown = Clown
+spray-painter-style-locker-cmo = CMO
+spray-painter-style-locker-doctor = Doctor
+spray-painter-style-locker-electrical = Electrical
+spray-painter-style-locker-engineer = Engineer
+spray-painter-style-locker-evac = Evac repair
+spray-painter-style-locker-hop = HOP
+spray-painter-style-locker-hos = HOS
+spray-painter-style-locker-medicine = Medicine
+spray-painter-style-locker-mime = Mime
+spray-painter-style-locker-paramedic = Paramedic
+spray-painter-style-locker-quartermaster = Quartermaster
+spray-painter-style-locker-rd = RD
+spray-painter-style-locker-representative = Representative
+spray-painter-style-locker-salvage = Salvage
+spray-painter-style-locker-scientist = Scientist
+spray-painter-style-locker-security = Security
+spray-painter-style-locker-welding = Welding
+
+spray-painter-style-closet-basic = Basic
+spray-painter-style-closet-biohazard = Biohazard
+spray-painter-style-closet-biohazard-science = Biohazard (science)
+spray-painter-style-closet-biohazard-virology = Biohazard (virology)
+spray-painter-style-closet-biohazard-security = Biohazard (security)
+spray-painter-style-closet-biohazard-janitor = Biohazard (janitor)
+spray-painter-style-closet-bomb = Bomb suit
+spray-painter-style-closet-bomb-janitor = Bomb suit (janitor)
+spray-painter-style-closet-chef = Chef
+spray-painter-style-closet-fire = Fire-safety
+spray-painter-style-closet-janitor = Janitor
+spray-painter-style-closet-legal = Lawyer
+spray-painter-style-closet-nitrogen = Internals (nitrogen)
+spray-painter-style-closet-oxygen = Internals (oxygen)
+spray-painter-style-closet-radiation = Radiation suit
+spray-painter-style-closet-tool = Tools
+
+spray-painter-style-wallcloset-atmospherics = Atmospherics
+spray-painter-style-wallcloset-basic = Basic
+spray-painter-style-wallcloset-black = Black
+spray-painter-style-wallcloset-blue = Blue
+spray-painter-style-wallcloset-fire = Fire-safety
+spray-painter-style-wallcloset-green = Green
+spray-painter-style-wallcloset-grey = Grey
+spray-painter-style-wallcloset-mixed = Mixed
+spray-painter-style-wallcloset-nitrogen = Internals (nitrogen)
+spray-painter-style-wallcloset-orange = Orange
+spray-painter-style-wallcloset-oxygen = Internals (oxygen)
+spray-painter-style-wallcloset-pink = Pink
+spray-painter-style-wallcloset-white = White
+spray-painter-style-wallcloset-yellow = Yellow
+
+spray-painter-style-walllocker-evac = Evac repair
+spray-painter-style-walllocker-medical = Medical
+
+# Crates
+spray-painter-style-cratesteel-basic = Basic
+spray-painter-style-cratesteel-electrical = Electrical
+spray-painter-style-cratesteel-engineering = Engineering
+spray-painter-style-cratesteel-radiation = Radiation
+spray-painter-style-cratesteel-science = Science
+spray-painter-style-cratesteel-surgery = Surgery
+
+spray-painter-style-crateplastic-basic = Basic
+spray-painter-style-crateplastic-chemistry = Chemistry
+spray-painter-style-crateplastic-command = Command
+spray-painter-style-crateplastic-hydroponics = Hydroponics
+spray-painter-style-crateplastic-medical = Medical
+spray-painter-style-crateplastic-oxygen = Oxygen
+
+spray-painter-style-cratesecure-basic = Basic
+spray-painter-style-cratesecure-chemistry = Chemistry
+spray-painter-style-cratesecure-command = Command
+spray-painter-style-cratesecure-engineering = Engineering
+spray-painter-style-cratesecure-hydroponics = Hydroponics
+spray-painter-style-cratesecure-medical = Medical
+spray-painter-style-cratesecure-plasma = Plasma
+spray-painter-style-cratesecure-private = Private
+spray-painter-style-cratesecure-science = Science
+spray-painter-style-cratesecure-secgear = Secgear
+spray-painter-style-cratesecure-weapon = Weapon
+
+# Canisters
+spray-painter-style-canisters-air = Air
+spray-painter-style-canisters-ammonia = Ammonia
+spray-painter-style-canisters-carbon-dioxide = Carbon dioxide
+spray-painter-style-canisters-frezon = Frezon
+spray-painter-style-canisters-nitrogen = Nitrogen
+spray-painter-style-canisters-nitrous-oxide = Nitrous oxide
+spray-painter-style-canisters-oxygen = Oxygen
+spray-painter-style-canisters-plasma = Plasma
+spray-painter-style-canisters-storage = Storage
+spray-painter-style-canisters-tritium = Tritium
+spray-painter-style-canisters-water-vapor = Water vapor
diff --git a/Resources/Locale/en-US/throwing/catchable.ftl b/Resources/Locale/en-US/throwing/catchable.ftl
new file mode 100644
index 0000000000..8db3befd68
--- /dev/null
+++ b/Resources/Locale/en-US/throwing/catchable.ftl
@@ -0,0 +1,4 @@
+catchable-component-success-self = You catch {THE($item)}!
+catchable-component-success-others = {CAPITALIZE(THE($catcher))} catches {THE($item)}!
+catchable-component-fail-self = You fail to catch {THE($item)}!
+catchable-component-fail-others = {CAPITALIZE(THE($catcher))} fails to catch {THE($item)}!
diff --git a/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl b/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl
new file mode 100644
index 0000000000..acb06bda47
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl
@@ -0,0 +1 @@
+ghost-kick-on-trigger-default = Tripped over a kick mine, crashed through the fourth wall.
diff --git a/Resources/Locale/en-US/triggers/rattle-on-trigger.ftl b/Resources/Locale/en-US/triggers/rattle-on-trigger.ftl
new file mode 100644
index 0000000000..3d090f1ae3
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/rattle-on-trigger.ftl
@@ -0,0 +1,2 @@
+rattle-on-trigger-dead-message = {$user} has died {$position}.
+rattle-on-trigger-critical-message = {$user} life signs critical, immediate assistance required {$position}.
diff --git a/Resources/Locale/en-US/triggers/scramble-on-trigger.ftl b/Resources/Locale/en-US/triggers/scramble-on-trigger.ftl
new file mode 100644
index 0000000000..1e84766032
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/scramble-on-trigger.ftl
@@ -0,0 +1 @@
+scramble-on-trigger-popup = Your appearance shifts and changes!
diff --git a/Resources/Locale/en-US/triggers/timer-trigger.ftl b/Resources/Locale/en-US/triggers/timer-trigger.ftl
new file mode 100644
index 0000000000..5d6d553b45
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/timer-trigger.ftl
@@ -0,0 +1,10 @@
+
+timer-trigger-verb-set = {$time} Seconds
+timer-trigger-verb-set-current = {$time} Seconds (current)
+timer-trigger-verb-cycle = Cycle Time Delay
+
+timer-trigger-examine = The timer is set to {$time} seconds.
+
+timer-trigger-popup-set = Timer set to {$time} seconds.
+
+timer-trigger-activated = You activate {THE($device)}.
diff --git a/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl b/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl
new file mode 100644
index 0000000000..874490686f
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl
@@ -0,0 +1,7 @@
+toggle-trigger-condition-default-verb = Toggle device
+toggle-trigger-condition-default-on = Device enabled.
+toggle-trigger-condition-default-off = Device disabled.
+
+toggle-trigger-condition-stick-verb = Toggle auto-activation
+toggle-trigger-condition-stick-on = The device will now activate automatically when planted.
+toggle-trigger-condition-stick-off = The device will no longer activate automatically when planted.
diff --git a/Resources/Locale/en-US/triggers/trigger-on-verb.ftl b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
new file mode 100644
index 0000000000..d9342e7bdd
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
@@ -0,0 +1,2 @@
+trigger-on-verb-default = Trigger
+trigger-on-verb-detonation = Start detonation
\ No newline at end of file
diff --git a/Resources/Locale/en-US/triggers/trigger-on-voice.ftl b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
new file mode 100644
index 0000000000..7ace486657
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
@@ -0,0 +1,12 @@
+trigger-on-voice-examine = The display reads: "{$keyphrase}"
+trigger-on-voice-uninitialized = The display reads: Uninitialized...
+
+trigger-on-voice-record = Record
+trigger-on-voice-stop = Stop
+trigger-on-voice-clear = Clear recording
+
+trigger-on-voice-start-recording = Started recording.
+trigger-on-voice-stop-recording = Stopped recording.
+trigger-on-voice-record-failed-too-long = Message too long, try again.
+trigger-on-voice-record-failed-too-short = Message too short, try again.
+trigger-on-voice-recorded = Recorded successfully!
diff --git a/Resources/Maps/Nonstations/dm01-entryway.yml b/Resources/Maps/Nonstations/dm01-entryway.yml
index bb252e35ab..2f15189a67 100644
--- a/Resources/Maps/Nonstations/dm01-entryway.yml
+++ b/Resources/Maps/Nonstations/dm01-entryway.yml
@@ -3958,8 +3958,6 @@ entities:
     - type: Transform
       pos: 8.5,27.5
       parent: 2
-    - type: Advertise
-      nextAdvertisementTime: 6277.3942716
 - proto: WallPlastitaniumDiagonalIndestructible
   entities:
   - uid: 171
diff --git a/Resources/Maps/Nonstations/wizardsden.yml b/Resources/Maps/Nonstations/wizardsden.yml
new file mode 100644
index 0000000000..b08dac6b68
--- /dev/null
+++ b/Resources/Maps/Nonstations/wizardsden.yml
@@ -0,0 +1,3886 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 261.1.0
+  forkId: ""
+  forkVersion: ""
+  time: 06/03/2025 05:27:43
+  entityCount: 625
+maps:
+- 411
+grids:
+- 1
+orphans: []
+nullspace: []
+tilemap:
+  3: Space
+  2: FloorBasalt
+  6: FloorDark
+  0: FloorDarkDiagonal
+  5: FloorDarkMono
+  4: FloorDarkPavementVertical
+  17: FloorMiningDark
+  16: FloorMiningLight
+  9: FloorShowroom
+  14: FloorTechMaint
+  13: FloorTechMaint2
+  12: FloorWhite
+  11: FloorWhiteMini
+  15: FloorWhiteMono
+  7: FloorWood
+  8: FloorWoodTile
+  10: Lattice
+  1: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Wizard's Den
+    - type: Transform
+      pos: -0.5138889,-0.4756779
+      parent: 411
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAABAAAAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAIAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAEABQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAYAAAAAAgAFAAAAAAIABgAAAAACAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAEABwAAAAADAAgAAAAAAgAGAAAAAAAABgAAAAADAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAkAAAAAAAABAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAABAAcAAAAAAAAIAAAAAAEACAAAAAADAAYAAAAAAgABAAAAAAAACQAAAAAAAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAAACAAAAAADAAgAAAAAAgAGAAAAAAIAAQAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAAAAAEAAAAAAAAKAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAMABwAAAAACAAgAAAAAAgAIAAAAAAAABgAAAAADAAUAAAAAAwAMAAAAAAIADwAAAAACAAEAAAAAAAABAAAAAAAACgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAIACAAAAAAAAAYAAAAAAQABAAAAAAAADAAAAAACAAwAAAAAAQABAAAAAAAACgAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAAAHAAAAAAMACAAAAAACAAgAAAAAAwAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAAABwAAAAACAAYAAAAAAwAGAAAAAAAABgAAAAADAAEAAAAAAAAKAAAAAAAACgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAACAAcAAAAAAwAGAAAAAAAABgAAAAADAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAABAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAwADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAUAAAAAAgADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAQAAAAAAAAcAAAAAAAAIAAAAAAEACAAAAAACAAEAAAAAAAAGAAAAAAIABgAAAAABAAgAAAAAAQAHAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAEAAAAAAAAHAAAAAAEACAAAAAADAAgAAAAAAQABAAAAAAAABgAAAAAAAAgAAAAAAgAIAAAAAAMABwAAAAABAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAoAAAAAAAABAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAMAAQAAAAAAAAYAAAAAAwAIAAAAAAEACAAAAAABAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAADAAUAAAAAAgAGAAAAAAMACAAAAAACAAgAAAAAAQAHAAAAAAMAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACgAAAAAAAAoAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAQABAAAAAAAABgAAAAABAAgAAAAAAwAIAAAAAAAABwAAAAADAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAIAAAAAAAACAAAAAABAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAACgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAwAHAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEABwAAAAACAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,-1:
+          ind: -1,-1
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAQAAAAAAAAEQAAAAAAABEAAAAAAAAQAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAABAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAEQAAAAAAABAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAIABQAAAAACAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAgABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,-2:
+          ind: -1,-2
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          version: 7
+        0,-2:
+          ind: 0,-2
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt1
+          decals:
+            163: 2.7885406,-1.7337892
+            187: -4.594368,-12.802722
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt2
+          decals:
+            170: 0.8227043,-6.7750106
+            190: -1.1881177,-12.948657
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt3
+          decals:
+            161: -2.8052096,1.6956758
+            165: -5.7114596,2.0292413
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt4
+          decals:
+            169: -1.5106289,-6.201695
+            193: 3.8869796,-12.234362
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt5
+          decals:
+            162: 2.5072906,0.9451544
+            164: -2.6802096,-0.5558883
+            189: -3.365201,-11.843722
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt6
+          decals:
+            198: -0.038194448,-11.283006
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt7
+          decals:
+            192: 1.6265626,-14.944576
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt8
+          decals:
+            191: 0.8743825,-12.125168
+            199: 2.4097223,-8.812541
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt9
+          decals:
+            188: -2.8131177,-9.644279
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNe
+          decals:
+            10: 1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNw
+          decals:
+            9: -1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSe
+          decals:
+            11: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSw
+          decals:
+            12: -1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineE
+          decals:
+            15: 1,0
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
+          decals:
+            16: 0,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineS
+          decals:
+            13: 0,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineW
+          decals:
+            14: -1,0
+        - node:
+            color: '#52B4E996'
+            id: CheckerNWSE
+          decals:
+            107: 6,9
+            108: 7,9
+            109: 8,6
+            110: 8,5
+            111: 6,6
+            112: 6,5
+        - node:
+            color: '#8D03A5FF'
+            id: DiagonalCheckerAOverlay
+          decals:
+            0: -1,1
+            1: -1,0
+            2: -1,-1
+            3: 0,-1
+            4: 1,-1
+            5: 1,0
+            6: 0,0
+            7: 0,1
+            8: 1,1
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            113: -4,5
+            114: -4,6
+            115: -4,7
+            116: -4,8
+            117: -4,9
+            118: -4,10
+            119: -4,11
+            139: -3,4
+            155: -3,11
+            156: -3,12
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            136: -2,4
+            137: -3,4
+            138: -4,5
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            131: 4,5
+            132: 3,4
+            133: 2,4
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            122: 4,5
+            123: 4,6
+            124: 4,7
+            125: 4,8
+            126: 4,9
+            127: 4,10
+            128: 4,11
+            140: 3,4
+            158: 3,11
+            159: 3,12
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Remains
+          decals:
+            18: -6,1
+            185: 0,-13
+            186: -5,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            23: 5.231406,1.6660407
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock07
+          decals:
+            21: -2.8668027,-4.2268343
+            24: -5.185261,-1.8468163
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            60: -3,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            59: 3,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            152: -2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            151: 2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNe
+          decals:
+            61: -3,4
+            66: -4,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNw
+          decals:
+            62: 3,4
+            67: 4,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            68: -4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSw
+          decals:
+            65: 4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            69: -4,10
+            70: -4,9
+            71: -4,8
+            72: -4,7
+            73: -4,6
+            196: -2,12
+            197: -2,13
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            43: -2,4
+            45: 0,4
+            47: 2,4
+            183: -1,4
+            184: 1,4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            79: -7,8
+            80: -6,8
+            149: -3,11
+            150: 3,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            74: 4,6
+            75: 4,7
+            76: 4,8
+            77: 4,9
+            78: 4,10
+            194: 2,12
+            195: 2,13
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 4095
+          0,-1:
+            0: 65295
+          -1,0:
+            0: 3822
+          0,1:
+            0: 65535
+          -1,1:
+            0: 65534
+          0,2:
+            0: 65535
+          -1,2:
+            0: 65535
+          0,3:
+            0: 127
+          -1,3:
+            0: 206
+          1,1:
+            0: 54608
+          1,2:
+            0: 4573
+            1: 49152
+          1,0:
+            0: 3822
+          1,-1:
+            0: 26112
+          2,0:
+            0: 48
+          2,1:
+            0: 4368
+            1: 17408
+          2,2:
+            1: 612
+          -3,1:
+            1: 16384
+          -3,2:
+            1: 2244
+          -2,0:
+            0: 3327
+          -2,1:
+            0: 30576
+          -2,2:
+            0: 102
+            1: 24576
+          -2,-1:
+            0: 60417
+          -1,-1:
+            0: 60942
+          -2,-3:
+            0: 36044
+          -2,-2:
+            0: 3200
+          -2,-4:
+            0: 32768
+          -1,-4:
+            0: 65472
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          0,-4:
+            0: 65392
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          1,-4:
+            0: 4096
+          1,-3:
+            0: 28945
+          1,-2:
+            0: 311
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          temperature: 248.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+    - type: IFF
+      color: '#BF40BFFF'
+    - type: GravityShake
+      shakeTimes: 10
+    - type: NavMap
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+  - uid: 411
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+    - type: Parallax
+      parallax: Wizard
+    - type: MapAtmosphere
+      space: False
+      mixture:
+        volume: 2500
+        immutable: True
+        temperature: 293.2
+        moles:
+        - 21.824879
+        - 82.10312
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: APCHyperCapacity
+  entities:
+  - uid: 199
+    components:
+    - type: MetaData
+      name: Wizard APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,4.5
+      parent: 1
+    - type: BatterySelfRecharger
+      autoRechargeRate: 200000
+      autoRecharge: True
+- proto: BarberScissors
+  entities:
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+- proto: BasaltFive
+  entities:
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+- proto: BasaltFour
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 1
+- proto: BasaltThree
+  entities:
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+- proto: BasaltTwo
+  entities:
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+- proto: BedsheetWiz
+  entities:
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,5.5
+      parent: 1
+- proto: BookNarsieLegend
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -1.9141665,4.7120576
+      parent: 1
+- proto: BookRandomStory
+  entities:
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+- proto: BooksBag
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: Bookshelf
+  entities:
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+- proto: BookshelfFilled
+  entities:
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 1
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 433
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      pos: -6.5,7.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: CandleBlackInfinite
+  entities:
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 0.34585947,8.704459
+      parent: 1
+- proto: CandleBlueSmallInfinite
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.9964747,13.631708
+      parent: 1
+- proto: CandleGreenSmallInfinite
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 0.5854428,8.558525
+      parent: 1
+- proto: CandleInfinite
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 1
+- proto: CandleRedSmallInfinite
+  entities:
+  - uid: 408
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.2612925,4.618674
+      parent: 1
+- proto: CarpetPurple
+  entities:
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 457
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+  - uid: 526
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 1
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 1
+- proto: ChairWood
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,6.5
+      parent: 1
+- proto: ClockworkShield
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -1.4069316,1.4175825
+      parent: 1
+- proto: ClothingBeltWand
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 2.5877786,0.864011
+      parent: 1
+- proto: ClothingHeadHatWitch1
+  entities:
+  - uid: 508
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ClothingHeadHelmetWizardHelm
+  entities:
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+- proto: ClothingMaskGasChameleon
+  entities:
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -0.8681086,13.66298
+      parent: 1
+- proto: ClothingShoesWizard
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 2.508839,1.4894459
+      parent: 1
+- proto: ClothingUniformJumpskirtColorBlack
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ClothingUniformJumpsuitColorBlack
+  entities:
+  - uid: 509
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ComfyChair
+  entities:
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 1
+- proto: CrayonRainbow
+  entities:
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 4.709585,6.241482
+      parent: 1
+- proto: CrystalBlue
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+- proto: CrystalOrange
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+- proto: CrystalPink
+  entities:
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+- proto: CrystalYellow
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+- proto: CurtainsPurpleOpen
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,5.5
+      parent: 1
+- proto: DiceBag
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 0.6952908,8.840469
+      parent: 1
+- proto: DogBed
+  entities:
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+- proto: Dresser
+  entities:
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -7.5,5.5
+      parent: 1
+    - type: Storage
+      storedItems:
+        508:
+          position: 0,0
+          _rotation: East
+        509:
+          position: 2,0
+          _rotation: South
+        510:
+          position: 4,0
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 508
+          - 509
+          - 510
+- proto: DrinkAleBottleFull
+  entities:
+  - uid: 651
+    components:
+    - type: Transform
+      pos: -6.64086,5.9211173
+      parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -6.4131513,5.5922756
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: -6.2777348,5.686091
+      parent: 1
+- proto: FaxMachineSyndie
+  entities:
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+    - type: FaxMachine
+      name: Wizard's Den
+- proto: FigureSpawner
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+- proto: Fireplace
+  entities:
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -7.5,7.5
+      parent: 1
+- proto: FloorDrain
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FloorLavaEntity
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 1
+- proto: FloraGreyStalagmite
+  entities:
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 0.7098959,-14.277794
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -2.3364596,-1.3592265
+      parent: 1
+- proto: FloraStalagmite
+  entities:
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 446
+    components:
+    - type: Transform
+      pos: -5.1672845,-9.665474
+      parent: 1
+- proto: FoodBurgerSpell
+  entities:
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+- proto: FoodMeat
+  entities:
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -2.7996593,-10.547044
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      pos: -0.23715895,-13.278107
+      parent: 1
+- proto: GasPipeStraight
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: LightPostSmall
+  entities:
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+- proto: LuxuryPen
+  entities:
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -1.6541514,-0.17837936
+      parent: 1
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.391187,-0.4181292
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,10.5
+      parent: 1
+- proto: MirrorShield
+  entities:
+  - uid: 87
+    components:
+    - type: Transform
+      pos: -1.7423494,1.6781805
+      parent: 1
+- proto: Paper
+  entities:
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 4.548043,5.679018
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 4.6209593,5.762409
+      parent: 1
+- proto: PaperBin5
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: PersonalAI
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -1.4747214,0.57214147
+      parent: 1
+- proto: PlasmaDoor
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+- proto: PlasmaWindow
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+- proto: PonderingOrbWizard
+  entities:
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 2.3481953,0.30111992
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 403
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,13.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,5.5
+      parent: 1
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 505
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,7.5
+      parent: 1
+- proto: Railing
+  entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+- proto: RailingCorner
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 1
+- proto: RandomStalagmiteOrCrystal
+  entities:
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+- proto: SinkWide
+  entities:
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 1
+- proto: Skub
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+- proto: SoapOmega
+  entities:
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: SpawnMobBear
+  entities:
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 532
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+- proto: SpawnMobLizard
+  entities:
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+- proto: SpawnPointWizard
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+- proto: StealthBox
+  entities:
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 1
+    - type: Stealth
+      enabled: False
+    - type: EntityStorage
+      open: True
+- proto: TableCarpet
+  entities:
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+- proto: TableFancyOrange
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+- proto: TableFancyPurple
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: TableFancyRed
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+- proto: TableStone
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 502
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+- proto: TargetHuman
+  entities:
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+- proto: TargetStrange
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+- proto: ToiletEmpty
+  entities:
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,5.5
+      parent: 1
+- proto: ToyFigurineWizard
+  entities:
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+- proto: VendingMachineDiscount
+  entities:
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+- proto: VendingMachineGames
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+- proto: VendingMachineMagivend
+  entities:
+  - uid: 453
+    components:
+    - type: Transform
+      pos: -2.5,12.5
+      parent: 1
+- proto: WallPlasma
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      pos: -4.5,7.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -4.5,12.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -4.5,9.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: -6.5,10.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: -7.5,10.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: -7.5,9.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      pos: -7.5,8.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: -8.5,8.5
+      parent: 1
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -8.5,7.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: -8.5,6.5
+      parent: 1
+  - uid: 496
+    components:
+    - type: Transform
+      pos: -8.5,5.5
+      parent: 1
+  - uid: 497
+    components:
+    - type: Transform
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 498
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 1
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 9.5,7.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 1
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+- proto: WallRockBasalt
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 9.5,-12.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -7.5,-2.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 7.5,-12.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -7.5,-4.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -9.5,-0.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 8.5,-14.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -7.5,-10.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -7.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -8.5,-8.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -8.5,-7.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -8.5,-6.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -9.5,-5.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -9.5,-6.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -7.5,-11.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: -8.5,-10.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -8.5,-9.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 7.5,-13.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: -9.5,-7.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -9.5,-8.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -9.5,-10.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -8.5,-11.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: -8.5,-13.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: -7.5,-12.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -8.5,-12.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -8.5,0.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -8.5,-0.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: -8.5,-2.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -9.5,6.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -11.5,-0.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -11.5,-1.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: -11.5,-2.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      pos: -11.5,-3.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 11.5,2.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 1
+  - uid: 546
+    components:
+    - type: Transform
+      pos: -9.5,5.5
+      parent: 1
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 1
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: -8.5,1.5
+      parent: 1
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -8.5,2.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      pos: -8.5,3.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -7.5,-7.5
+      parent: 1
+  - uid: 671
+    components:
+    - type: Transform
+      pos: -7.5,-8.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 6.5,-12.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 1
+- proto: WindoorPlasma
+  entities:
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,6.5
+      parent: 1
+- proto: WizardComputerComms
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+- proto: WoodblockInstrument
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 2.5347729,-0.35558593
+      parent: 1
+...
diff --git a/Resources/Maps/Ruins/displaced_telescience.yml b/Resources/Maps/Ruins/displaced_telescience.yml
index 47b13089d7..b5c2690275 100644
--- a/Resources/Maps/Ruins/displaced_telescience.yml
+++ b/Resources/Maps/Ruins/displaced_telescience.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 255.0.0
+  engineVersion: 260.0.0
   forkId: ""
   forkVersion: ""
-  time: 04/30/2025 11:12:40
-  entityCount: 485
+  time: 05/18/2025 11:12:07
+  entityCount: 487
 maps: []
 grids:
 - 1
@@ -33,20 +33,20 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAMAAAAAAAACAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
         0,-1:
           ind: 0,-1
-          tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAQAAAAAAAQAAAAAABAAAAAAABAAAAAAABAAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAQAAAAAABAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAQAAAAAABAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
-          version: 6
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAQAAAAAAAAEAAAAAAAAAQAAAAAAAAEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAgAAAAAAAAIAAAAAAAAEAAAAAAAAAQAAAAAAAAQAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
         -1,-1:
           ind: -1,-1
-          tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAgAAAAAABQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAABAAAAAAABAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAABAAAAAAABAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAA
-          version: 6
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAQAAAAAAAAEAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAEAAAAAAAABAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAA==
+          version: 7
         -1,0:
           ind: -1,0
-          tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAQAAAAAABQAAAAAABQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
-          version: 6
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAABAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
@@ -59,6 +59,7 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      dampingModifier: 0.25
     - type: GridPathfinding
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
@@ -1756,6 +1757,7 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
+    - type: ImplicitRoof
   - uid: 476
     mapInit: true
     paused: true
@@ -1843,7 +1845,7 @@ entities:
       pos: -1.5,-7.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -5362.1104
+      secondsUntilStateChange: -5774.7476
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -4425,6 +4427,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-8.5
       parent: 1
+- proto: PoweredSmallLightEmpty
+  entities:
+  - uid: 486
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 1
 - proto: PoweredStrobeLightEmpty
   entities:
   - uid: 178
@@ -4472,6 +4482,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,0.5
       parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 1
 - proto: Railing
   entities:
   - uid: 362
diff --git a/Resources/Maps/Shuttles/ShuttleEvent/quark.yml b/Resources/Maps/Shuttles/ShuttleEvent/quark.yml
index 49e27e3fa9..d8deb51141 100644
--- a/Resources/Maps/Shuttles/ShuttleEvent/quark.yml
+++ b/Resources/Maps/Shuttles/ShuttleEvent/quark.yml
@@ -1351,6 +1351,8 @@ entities:
         intensity: 50
         type: SingularityDistortion
       - type: ExplodeOnTrigger
+        keysIn:
+        - stageTwo
       triggerDelay: 500
 - proto: GravityGeneratorMini
   entities:
@@ -1479,8 +1481,8 @@ entities:
 
                                            [bold]Crew of the NT-Quark[/bold]
 
-             [bold]Nuclear containment breach detected on long range 
-                 halcyon scanners. Seek immediate shelter. Avoid 
+             [bold]Nuclear containment breach detected on long range
+                 halcyon scanners. Seek immediate shelter. Avoid
                          contaminated materials. Do not panic.[/bold]
 
                               [color=red][bold]Alpha decay rates indicate estimated
diff --git a/Resources/Maps/Shuttles/emergency_exo.yml b/Resources/Maps/Shuttles/emergency_exo.yml
index 4dd4aa96c6..d3c34c6dc5 100644
--- a/Resources/Maps/Shuttles/emergency_exo.yml
+++ b/Resources/Maps/Shuttles/emergency_exo.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 262.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/15/2025 12:24:53
-  entityCount: 1013
+  time: 07/01/2025 12:52:53
+  entityCount: 1020
 maps: []
 grids:
 - 2
@@ -398,7 +398,7 @@ entities:
           2,-2:
             0: 7644
           2,-3:
-            0: 3584
+            2: 3584
           3,-2:
             0: 40951
           3,-3:
@@ -448,6 +448,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 1400.0662
+          - 5266.916
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -923,6 +938,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,1.5
       parent: 2
+- proto: AtmosFixAirMarker
+  entities:
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 2
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 2
+  - uid: 1020
+    components:
+    - type: Transform
+      pos: 11.5,-9.5
+      parent: 2
 - proto: BaseComputer
   entities:
   - uid: 639
@@ -2949,6 +2981,7 @@ entities:
       desc: Glory to NanoTrasen!
       name: beer dispenser
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-2.5
       parent: 2
     - type: SolutionContainerManager
@@ -5396,6 +5429,28 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,0.5
       parent: 2
+- proto: Screen
+  entities:
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 2
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 2
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
 - proto: ShardGlassReinforced
   entities:
   - uid: 999
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index 79a861985a..37a01b7c42 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -6083,7 +6083,7 @@ entities:
     - type: Transform
       pos: 9.5,-23.5
       parent: 2
-- proto: StationAnchor
+- proto: StationAnchorIndestructible
   entities:
   - uid: 887
     components:
diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index 9902e898ac..d00cb05179 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 262.0.0
+  engineVersion: 265.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/15/2025 13:58:26
-  entityCount: 19423
+  time: 07/31/2025 15:20:28
+  entityCount: 20082
 maps:
 - 1
 grids:
@@ -100,95 +100,95 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: YAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAIAYAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YAAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAACAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFgAAAAABABYAAAAAAQAWAAAAAAEAFgAAAAACABYAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABYAAAAAAgAWAAAAAAIAFgAAAAACABYAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAwAWAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFgAAAAADABYAAAAAAgAWAAAAAAEAFgAAAAABABYAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABYAAAAAAQAWAAAAAAEAFgAAAAAAABYAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: JQAAAAADACUAAAAAAwAlAAAAAAEAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAgCBAAAAAAAAYAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAwCBAAAAAAAAKwAAAAABACsAAAAAAgArAAAAAAAAKwAAAAADACsAAAAAAwArAAAAAAMAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAEAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: JQAAAAABACUAAAAAAgAlAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAACBAAAAAAAAYAAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAABAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAIAKwAAAAACACsAAAAAAwArAAAAAAEAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,-1:
           ind: -1,-1
-          tiles: gQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAABAIEAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAgAlAAAAAAIAgQAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAACUAAAAAAwAtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAEYAAAAAAAALQAAAAAAAS4AAAAAAAMlAAAAAAEARAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAEQAAAAAAAAlAAAAAAIAKwAAAAAAACsAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAArAAAAAAMAGAAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAADAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAJQAAAAABAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAARgAAAAAAAAtAAAAAAABLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAABgAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAACAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAIEAAAAAAABgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQCBAAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAgQAAAAAAAGAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAADAIEAAAAAAAAlAAAAAAIAJQAAAAAAACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAIAgQAAAAAAAGAAAAAAAgBgAAAAAAMAgQAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAEYAAAAAAAALQAAAAAAAS4AAAAAAAMlAAAAAAEARAAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAEQAAAAAAAAlAAAAAAEAKwAAAAABACsAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAArAAAAAAEAGAAAAAAAACUAAAAAAAAtAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAJQAAAAACAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAARgAAAAAAAAtAAAAAAABLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAABAGAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAABAIEAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAQCBAAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAABAIEAAAAAAABgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: gQAAAAAAAC4AAAAAAAEuAAAAAAADLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAItAAAAAAAAJQAAAAACAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAMlAAAAAAAAJQAAAAABAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAwCBAAAAAAAAJAAAAAADACQAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHgQAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACACUAAAAAAgAlAAAAAAEAgQAAAAAAACQAAAAAAwAkAAAAAAMAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAAB4EAAAAAAAAgAAAAAAEALgAAAAAAAi0AAAAAAAMuAAAAAAADIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAIAAAAAABAC0AAAAAAAAEAAAAAAAALQAAAAAAACAAAAAAAQAgAAAAAAIAgQAAAAAAAC0AAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHIAAAAAACACAAAAAAAwAuAAAAAAABLQAAAAAAAy4AAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAAAtAAAAAAAAIAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAAByAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAIALQAAAAAAACAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAEAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHRAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAAAtAAAAAAAAGAAAAAAAACQAAAAAAAAkAAAAAAIAJAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAIuAAAAAAACLQAAAAAAAy0AAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAQCBAAAAAAAALQAAAAAAACsAAAAAAAcuAAAAAAAALgAAAAAAAS0AAAAAAAAuAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAkAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAAAkAAAAAAEAJAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACQAAAAAAQCBAAAAAAAAgQAAAAAAACQAAAAAAgAkAAAAAAAAJQAAAAACACUAAAAAAgAlAAAAAAIAJQAAAAABAC4AAAAAAAEtAAAAAAADgQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAEAJAAAAAABAC8AAAAAAAAkAAAAAAEAJQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAADACUAAAAAAgAlAAAAAAAAJQAAAAABAA==
+          tiles: gQAAAAAAAC4AAAAAAAEuAAAAAAADLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAItAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAMlAAAAAAAAJQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALQAAAAAAACsAAAAAAQeBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAJQAAAAAAACUAAAAAAgCBAAAAAAAAJAAAAAAAACQAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAACACUAAAAAAQAlAAAAAAMAgQAAAAAAACQAAAAAAAAkAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAABB4EAAAAAAAAgAAAAAAMALgAAAAAAAi0AAAAAAAMuAAAAAAADIAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAADACAAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAIAAAAAABAC0AAAAAAAAEAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAEAgQAAAAAAAC0AAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHIAAAAAACACAAAAAAAgAuAAAAAAABLQAAAAAAAy4AAAAAAAAgAAAAAAMAIAAAAAADACAAAAAAAgAtAAAAAAAAIAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAACByAAAAAAAgAgAAAAAAAAIAAAAAABACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAAALQAAAAAAACAAAAAAAwAUAAAAAAAAFAAAAAAAABQAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQeBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAEAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAEHRAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAAAtAAAAAAAAGAAAAAAAACQAAAAAAwAkAAAAAAIAJAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAACBy0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAIuAAAAAAACLQAAAAAAAy0AAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAgcuAAAAAAAALgAAAAAAAS0AAAAAAAAuAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAkAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAgAkAAAAAAMAJAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACQAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAgAkAAAAAAMAJQAAAAACACUAAAAAAwAlAAAAAAAAJQAAAAADAC4AAAAAAAEtAAAAAAADgQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAIAJAAAAAAAAC8AAAAAAAAkAAAAAAAAJQAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAACUAAAAAAQAlAAAAAAIAJQAAAAACAA==
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: KwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAACAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAwAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAIALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAADABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwAVAAAAAAAAFQAAAAACABUAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAFQAAAAACABUAAAAAAwAVAAAAAAMAYAAAAAABAGAAAAAAAgBgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAgCBAAAAAAAAYAAAAAABABUAAAAAAwAVAAAAAAAAFQAAAAABAGAAAAAAAgAyAAAAAAAAMgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAEALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAJQAAAAABACUAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAYAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAMAJQAAAAABAIEAAAAAAABEAAAAAAAARAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAACBAAAAAAAAYAAAAAAAAA==
+          tiles: KwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAgAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAADABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgAVAAAAAAAAFQAAAAABABUAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAwAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAFQAAAAACABUAAAAAAAAVAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAYAAAAAABABUAAAAAAAAVAAAAAAMAFQAAAAACAGAAAAAAAAAyAAAAAAAAMgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAMALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAJQAAAAABACUAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAACAIEAAAAAAABgAAAAAAEAJQAAAAACAIEAAAAAAABEAAAAAAAARAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAADAG8AAAAAAACBAAAAAAAAYAAAAAADAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: YAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQCBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAApAAAAAAMAKQAAAAAAACkAAAAAAQApAAAAAAEAKQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAACACkAAAAAAQAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAJQAAAAAAACUAAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMuAAAAAAADgQAAAAAAACkAAAAAAwCBAAAAAAAAKwAAAAABACsAAAAAAQArAAAAAAMAKwAAAAACACsAAAAAAAArAAAAAAMAKwAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAAAACsAAAAAAwAlAAAAAAEALQAAAAAAAIEAAAAAAAApAAAAAAIAKQAAAAACAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy4AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAAMtAAAAAAAAgQAAAAAAACkAAAAAAAApAAAAAAEAKQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAAArAAAAAAADLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAwAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAIAJQAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAMAKwAAAAADACsAAAAAAAArAAAAAAAAKwAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAADACUAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAADAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: YAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAMAgQAAAAAAAC0AAAAAAAAlAAAAAAMALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAwBgAAAAAAMAYAAAAAADAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAApAAAAAAAAKQAAAAAAACUAAAAAAwAlAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAFgAAAAADAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAApAAAAAAIAKQAAAAADACkAAAAAAQAlAAAAAAIAJQAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAABABoAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgCBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAwBgAAAAAAMAKQAAAAABACkAAAAAAAApAAAAAAMAKQAAAAAAACkAAAAAAwApAAAAAAEAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAADACkAAAAAAAApAAAAAAIAKQAAAAADACkAAAAAAwApAAAAAAEAKQAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQCBAAAAAAAAKQAAAAADACkAAAAAAgApAAAAAAIAKQAAAAADACkAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAIAYAAAAAABAGAAAAAAAgCBAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADgQAAAAAAACkAAAAAAgApAAAAAAAAKQAAAAADACkAAAAAAAApAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAEALQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAQApAAAAAAIAKQAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAKQAAAAABACkAAAAAAAApAAAAAAEAKQAAAAAAACkAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAKQAAAAABACkAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAEAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAApAAAAAAIAKQAAAAACACkAAAAAAQApAAAAAAMAKQAAAAABAA==
+          tiles: YAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAKQAAAAADACkAAAAAAwApAAAAAAAAJQAAAAABACUAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACkAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAApAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAKQAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAApAAAAAAEAKQAAAAABACUAAAAAAwAlAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADABYAAAAAAwCBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAAAtAAAAAAAALgAAAAAAAi4AAAAAAAMuAAAAAAABLQAAAAAAAykAAAAAAgApAAAAAAIALQAAAAAAAy0AAAAAAANgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAAAYAAAAAAAAC4AAAAAAAEuAAAAAAAAJQAAAAACACsAAAAAAgArAAAAAAIAKwAAAAACACsAAAAAAwArAAAAAAMAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAQAtAAAAAAADLgAAAAAAAysAAAAAAwMuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAy0AAAAAAAArAAAAAAEDLQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAAAy0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAQApAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwMtAAAAAAAAGAAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIDLQAAAAAAABgAAAAAAAApAAAAAAIAKQAAAAAAACkAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAADAy0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAKQAAAAACAA==
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: IAAAAAACAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAAAJAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAIALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAAABy4AAAAAAAEYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAACACsAAAAAAgArAAAAAAIAKwAAAAADACUAAAAAAAArAAAAAAIAGAAAAAAAACsAAAAAAAArAAAAAAEAKwAAAAADACsAAAAAAAArAAAAAAEAKwAAAAAAACsAAAAAAAArAAAAAAEAKwAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAA==
+          tiles: IAAAAAACAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAQAlAAAAAAIAJQAAAAACACUAAAAAAAAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAALgAAAAAAAi0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAAAJAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAEALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAEHLQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAACBy4AAAAAAAEYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAABACsAAAAAAAArAAAAAAAAKwAAAAABACUAAAAAAQArAAAAAAIAGAAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAgArAAAAAAAAKwAAAAABACsAAAAAAgArAAAAAAMAKwAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAA==
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAADACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAIAAAAAABACsAAAAAAQAgAAAAAAIAgQAAAAAAACUAAAAAAwAlAAAAAAMAJQAAAAABACUAAAAAAQAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAABgAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAAAAC4AAAAAAAItAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAYAAAAAAAAJQAAAAABACUAAAAAAgAlAAAAAAEAJQAAAAACACUAAAAAAAAtAAAAAAAABAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAACACUAAAAAAQAlAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAABACUAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAMAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAAAACUAAAAAAAAlAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAQAAAAAAMAEAAAAAABABAAAAAAAwAQAAAAAAEAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAEAAAAAACABAAAAAAAAAQAAAAAAAAEAAAAAADACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAALgAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAACACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAAAACsAAAAAAQAlAAAAAAEALQAAAAAAAC0AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAuAAAAAAADKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAYAAAAAADAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADFwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAAAACsAAAAAAgAgAAAAAAMAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAADACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAABgAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAQAlAAAAAAIAJQAAAAADAC4AAAAAAAItAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAQAlAAAAAAEAJQAAAAACACUAAAAAAQAtAAAAAAAABAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAACUAAAAAAQAlAAAAAAIALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAACUAAAAAAwAlAAAAAAMAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAACACUAAAAAAwAlAAAAAAIALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAXAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAADABAAAAAAAgAQAAAAAAIAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAADBy0AAAAAAACBAAAAAAAAEAAAAAABABAAAAAAAAAQAAAAAAIAEAAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAALgAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAACACsAAAAAAwArAAAAAAEAKwAAAAAAACsAAAAAAgArAAAAAAEAGAAAAAAAACsAAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAuAAAAAAADKwAAAAACBy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -1,-3:
           ind: -1,-3
-          tiles: gQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAABvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAQCBAAAAAAAAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJAAAAAABACQAAAAAAwAkAAAAAAMAJAAAAAACACQAAAAAAwCBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACQAAAAAAQAkAAAAAAIAJAAAAAADACQAAAAAAgAkAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAOBAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABcAAAAAAAAYAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAJQAAAAADAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACAAAAAAAgCBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAIuAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAEtAAAAAAAHLgAAAAAAAxgAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAWBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADgQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAABAIEAAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC0AAAAAAAArAAAAAAAHgQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAy4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAAKwAAAAAABw==
+          tiles: gQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAABvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAMALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJAAAAAABACQAAAAAAwAkAAAAAAIAJAAAAAABACQAAAAAAQCBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAEAJAAAAAAAACQAAAAAAwAkAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAOBAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABcAAAAAAAAYAAAAAAAALQAAAAAAACUAAAAAAgArAAAAAAMAJQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACAAAAAAAACBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAIuAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAEtAAAAAAAHLgAAAAAAAxgAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAWBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADgQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAABAIEAAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC0AAAAAAAArAAAAAAAHgQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAy4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAAKwAAAAAABw==
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAABAAEAAAAAAwAYAAAAAAAAAAAAAAAAAIEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAwABAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAMAAQAAAAACABgAAAAAAAAmAAAAAAIAJgAAAAABABgAAAAAAAAGAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAgAAAAAAEALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADAAEAAAAAAwABAAAAAAEAAQAAAAADAAYAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwCBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAACAAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMgAAAAAAAALgAAAAAAA4EAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAACAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAAC4AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAQAuAAAAAAADGAAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAAAYAAAAAAAARAAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy4AAAAAAAMuAAAAAAAAGAAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAAEQAAAAAAACBAAAAAAAAIAAAAAADAC0AAAAAAAArAAAAAAAHLQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAEAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAIAAAAAACAAEAAAAAAgAYAAAAAAAAAAAAAAAAAIEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAAABAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAgAAAAAAEAAQAAAAABAAEAAAAAAgAmAAAAAAIAJgAAAAABABgAAAAAAAAGAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABgAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAvAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAABAAYAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAACAAAAAAAQAgAAAAAAIALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMgAAAAAAIALgAAAAAAA4EAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAACAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAADAC4AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAwAuAAAAAAADGAAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAAAYAAAAAAAARAAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy4AAAAAAAMuAAAAAAAAGAAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAAEQAAAAAAACBAAAAAAAAIAAAAAACAC0AAAAAAAArAAAAAAMHLQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAtAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAEAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: IAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABEAAAAAAAARAAAAAAAACAAAAAAAAAgAAAAAAEALQAAAAAAACsAAAAAAActAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMALgAAAAAAAi4AAAAAAAArAAAAAAAHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAEAJQAAAAACACsAAAAAAQArAAAAAAEAKwAAAAAAACsAAAAAAwArAAAAAAAAKwAAAAABACsAAAAAAgArAAAAAAIAKwAAAAABABgAAAAAAAAYAAAAAAAAKwAAAAAAACsAAAAAAgArAAAAAAMAJQAAAAACAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: IAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABEAAAAAAAARAAAAAAAACAAAAAAAgAgAAAAAAIALQAAAAAAACsAAAAAAgctAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIALgAAAAAAAi4AAAAAAAArAAAAAAAHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAMAJQAAAAADACsAAAAAAgArAAAAAAIAKwAAAAAAACsAAAAAAwArAAAAAAEAKwAAAAACACsAAAAAAAArAAAAAAEAKwAAAAADABgAAAAAAAAYAAAAAAAAKwAAAAACACsAAAAAAQArAAAAAAMAJQAAAAACAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
-          tiles: gQAAAAAAAIEAAAAAAAAlAAAAAAEAAQAAAAAAACUAAAAAAgAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAMAIAAAAAADAIEAAAAAAACBAAAAAAAALwAAAAAAAAAAAAAAAACBAAAAAAAAJQAAAAAAAAEAAAAAAwAlAAAAAAMAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAACUAAAAAAAABAAAAAAEAJQAAAAAAACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAlAAAAAAAAAQAAAAACACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAwAgAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAAEAAAAAAQAlAAAAAAIAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAIAJQAAAAAAACUAAAAAAwAgAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAMAGAAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAACACUAAAAAAQAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAIAAAAAADAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAEAIAAAAAABACAAAAAAAgAYAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAMAJQAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAMAIAAAAAADACAAAAAAAQAgAAAAAAEAGAAAAAAAABgAAAAAAAAlAAAAAAMAJQAAAAABACUAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAADABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAAAlAAAAAAEAGAAAAAAAACAAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAACAAYAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAAAJQAAAAABABgAAAAAAAAgAAAAAAAAAQAAAAADABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAABAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAgAYAAAAAAAAIAAAAAAAAAEAAAAAAQABAAAAAAIAJgAAAAACACYAAAAAAAAYAAAAAAAABgAAAAADABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAIAgQAAAAAAACAAAAAAAAABAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAAAgAAAAAAAAAQAAAAACABgAAAAAAAAAAAAAAAAAgQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAABABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAADAC0AAAAAAACBAAAAAAAAIAAAAAACAAEAAAAAAQAYAAAAAAAAAAAAAAAAAIEAAAAAAAArAAAAAAAAKwAAAAADACsAAAAAAQAYAAAAAAAAGAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAlAAAAAAMAAQAAAAABACUAAAAAAwAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAAAAAAAAAACBAAAAAAAAJQAAAAADAAEAAAAAAgAlAAAAAAEAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAACUAAAAAAwABAAAAAAAAJQAAAAACACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAlAAAAAAMAAQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAAEAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACACUAAAAAAQAgAAAAAAMAgQAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAACACAAAAAAAAAgAAAAAAAAGAAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACACUAAAAAAAAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAwAYAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAMAJQAAAAABAIEAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAEAGAAAAAAAABgAAAAAAAAlAAAAAAAAJQAAAAADACUAAAAAAQCBAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAAAgAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAgAlAAAAAAAAGAAAAAAAACAAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAABAAYAAAAAAQABAAAAAAAAAQAAAAACAAEAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMAJQAAAAAAABgAAAAAAAAgAAAAAAIAAQAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAABAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAAAYAAAAAAAAIAAAAAADAAEAAAAAAwABAAAAAAMAJgAAAAAAACYAAAAAAgAYAAAAAAAABgAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAQAlAAAAAAMAgQAAAAAAACAAAAAAAgABAAAAAAMAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAAAJQAAAAABAIEAAAAAAAAgAAAAAAIAAQAAAAADABgAAAAAAAAAAAAAAAAAgQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAIAAAAAADAAEAAAAAAAAYAAAAAAAAAAAAAAAAAIEAAAAAAAArAAAAAAMAKwAAAAABACsAAAAAAgAYAAAAAAAAGAAAAAAAAA==
           version: 7
         0,-4:
           ind: 0,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAArAAAAAAAHKwAAAAAAB4EAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAAABysAAAAAAAeBAAAAAAAAGAAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAADACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAgAtAAAAAAAALQAAAAAAAGAAAAAAAAAwAAAAAAEAGgAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAxAAAAAAEAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAMQAAAAACAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAMALgAAAAAAAi0AAAAAAAMtAAAAAAADGAAAAAAAAC4AAAAAAAAtAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAIAIAAAAAACAC0AAAAAAAAlAAAAAAEAKwAAAAADABgAAAAAAAArAAAAAAEAKwAAAAACACsAAAAAAgArAAAAAAMAKwAAAAADACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAwAtAAAAAAAALQAAAAAAAC4AAAAAAAIYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAACACUAAAAAAwAlAAAAAAMAJQAAAAACAIEAAAAAAAAgAAAAAAEALgAAAAAAAi0AAAAAAAMDAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAgAAAAAAAAJQAAAAABACAAAAAAAAAgAAAAAAAAIAAAAAADACUAAAAAAwCBAAAAAAAAIAAAAAAAAC0AAAAAAAAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACUAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAwAlAAAAAAEAgQAAAAAAACAAAAAAAAAuAAAAAAABLQAAAAAAAw==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAArAAAAAAIHKwAAAAABB4EAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAABBysAAAAAAQeBAAAAAAAAGAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAGAAAAAAAQAwAAAAAAMAGgAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAgCBAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAxAAAAAAMAIAAAAAABACAAAAAAAQAgAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAMQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAgAgAAAAAAIAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAwCBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADGAAAAAAAAC4AAAAAAAAtAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAyAAAAAAAgAgAAAAAAAAIAAAAAACAC0AAAAAAAAlAAAAAAAAKwAAAAABABgAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAgArAAAAAAIAKwAAAAADACsAAAAAAAArAAAAAAIAKwAAAAADACsAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAQAtAAAAAAAALQAAAAAAAC4AAAAAAAIYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAAAAIEAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMDAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAgAAAAAAIAJQAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAADACUAAAAAAACBAAAAAAAAIAAAAAADAC0AAAAAAAAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACUAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAQAlAAAAAAAAgQAAAAAAACAAAAAAAAAuAAAAAAABLQAAAAAAAw==
           version: 7
         1,-4:
           ind: 1,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACsAAAAAAwAgAAAAAAMAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMAGAAAAAAAABgAAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAAAy4AAAAAAAMYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAAGAAAAAAAAAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADABgAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAAC4AAAAAAAEtAAAAAAADGAAAAAAAACsAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMALQAAAAAAAGAAAAAAAgAYAAAAAAAAEwAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAEAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi4AAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAS4AAAAAAANgAAAAAAMALgAAAAAAAi4AAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAADgQAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAAgQAAAAAAACAAAAAAAwAlAAAAAAEALQAAAAAAAIEAAAAAAAAuAAAAAAADLgAAAAAAAS4AAAAAAAMYAAAAAAAAGAAAAAAAACUAAAAAAwAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAALgAAAAAAAoEAAAAAAAAgAAAAAAIALQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAMYAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAIAAAAAACAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAADBy0AAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACsAAAAAAQAgAAAAAAIAgQAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAADACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAEAGAAAAAAAABgAAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAAAy4AAAAAAAMYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAAGAAAAAAAQAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAAC4AAAAAAAEtAAAAAAADGAAAAAAAACsAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAAALQAAAAAAAGAAAAAAAAAYAAAAAAAAEwAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAEAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi4AAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAS4AAAAAAANgAAAAAAAALgAAAAAAAi4AAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAADgQAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAAgQAAAAAAACAAAAAAAwAlAAAAAAIALQAAAAAAAIEAAAAAAAAuAAAAAAADLgAAAAAAAS4AAAAAAAMYAAAAAAAAGAAAAAAAACUAAAAAAgAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAALgAAAAAAAoEAAAAAAAAgAAAAAAIALQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAMYAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAIAAAAAABAA==
           version: 7
         -1,-4:
           ind: -1,-4
-          tiles: gQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAADACAAAAAAAQAgAAAAAAIAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAIAAAAAACACAAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAwBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAABAIEAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAQAgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAAIAAAAAACAC0AAAAAAAMuAAAAAAADLgAAAAAAASAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAHAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAwAlAAAAAAIALgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABwAAAAAAACAAAAAAAgAgAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAAJQAAAAACACUAAAAAAwAuAAAAAAABLgAAAAAAA4EAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAEAIAAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAABAC4AAAAAAAMlAAAAAAIAJQAAAAAAACAAAAAAAQBvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAQAuAAAAAAABLgAAAAAAAyUAAAAAAwAgAAAAAAEAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAC0AAAAAAAArAAAAAAAHIAAAAAABAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAACAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAG8AAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAAAgAAAAAAEAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAACAAAAAAAABvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAABAA==
+          tiles: gQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAwAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAABAIEAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAACACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAIAAAAAABAC0AAAAAAAMuAAAAAAADLwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAHAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAwAlAAAAAAEALgAAAAAAAS4AAAAAAAMvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABwAAAAAAACAAAAAAAAAgAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAJQAAAAAAACUAAAAAAQAuAAAAAAABLgAAAAAAA4EAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAIAIAAAAAAAAC4AAAAAAAMlAAAAAAEAJQAAAAABACAAAAAAAQBvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAwAuAAAAAAABLgAAAAAAAyUAAAAAAQAgAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAEHIAAAAAACAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAACBy0AAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAAG8AAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAACAAAAAAAQBvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAABAA==
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: LwAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy8AAAAAAACBAAAAAAAAGwAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAMAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAACACsAAAAAAgAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAQCBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAAcuAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAKQAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAAAAIEAAAAAAAAuAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAArAAAAAAAHLQAAAAAAABsAAAAAAACBAAAAAAAAKQAAAAABACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAMAKwAAAAABACsAAAAAAAArAAAAAAIAJQAAAAADAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAIAYAAAAAAAAC0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAGAAAAAAAwAgAAAAAAEALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAADAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJAAAAAADACQAAAAAAAAgAAAAAAIAJAAAAAADACAAAAAAAwAtAAAAAAAAJQAAAAADACsAAAAAAgArAAAAAAAAKwAAAAACACsAAAAAAwArAAAAAAEAKwAAAAADACUAAAAAAgAtAAAAAAAAIAAAAAABACAAAAAAAgAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAMALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: LwAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy8AAAAAAACBAAAAAAAAGwAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAQArAAAAAAEAKwAAAAADACsAAAAAAQArAAAAAAMAJQAAAAADACsAAAAAAgAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAAcuAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAEHLQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAACkAAAAAAwCBAAAAAAAAgQAAAAAAACUAAAAAAQAlAAAAAAAAJQAAAAACAIEAAAAAAAAuAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAArAAAAAAEHLQAAAAAAABsAAAAAAACBAAAAAAAAKQAAAAACACkAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAgArAAAAAAMAKwAAAAADACsAAAAAAAArAAAAAAMAJQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAC0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAABAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJAAAAAACACQAAAAAAAAgAAAAAAMAJAAAAAAAACAAAAAAAAAtAAAAAAAAJQAAAAADACsAAAAAAQArAAAAAAMAKwAAAAADACsAAAAAAAArAAAAAAIAKwAAAAAAACUAAAAAAwAtAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAMALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAACAAAAAAAgAgAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-4:
           ind: -2,-4
-          tiles: YAAAAAACAGAAAAAAAwCBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAQCBAAAAAAAAgQAAAAAAACAAAAAAAwBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAIAYAAAAAADAIEAAAAAAABrAAAAAAMAawAAAAACAGsAAAAAAQBrAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAQCBAAAAAAAAYAAAAAABAGAAAAAAAQAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAGAAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAAAACUAAAAAAgAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAIAJQAAAAADACsAAAAAAgArAAAAAAMAKwAAAAADACsAAAAAAgAlAAAAAAAAJQAAAAABAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAEAJQAAAAADAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADJQAAAAADACUAAAAAAgArAAAAAAIAKwAAAAAAACsAAAAAAwAlAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAgAlAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAy4AAAAAAAEYAAAAAAAAGAAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAJQAAAAAAACUAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAAAuAAAAAAADGAAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAACUAAAAAAgAlAAAAAAIAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAGAAAAAAAwAlAAAAAAAAJQAAAAABAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAJQAAAAADACUAAAAAAwBgAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAAAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: YAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAACAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAMAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAABrAAAAAAMAawAAAAAAAGsAAAAAAQBrAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAA8AAAAAAwCBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAMAGAAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAAAlAAAAAAEAJQAAAAADACsAAAAAAwArAAAAAAIAKwAAAAADACsAAAAAAgAlAAAAAAIAJQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMAJQAAAAABAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADJQAAAAABACUAAAAAAAArAAAAAAEAKwAAAAADACsAAAAAAwAlAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAAAACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAwAlAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAy4AAAAAAAEYAAAAAAAAGAAAAAAAACUAAAAAAgAlAAAAAAIAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAJQAAAAAAACUAAAAAAQBgAAAAAAIAgQAAAAAAAIEAAAAAAAAuAAAAAAADGAAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACACUAAAAAAQAlAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAGAAAAAAAwAlAAAAAAAAJQAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAMAJQAAAAADACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAJQAAAAACACUAAAAAAgBgAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAJQAAAAADACUAAAAAAQAlAAAAAAMAJQAAAAABACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -3,-4:
           ind: -3,-4
-          tiles: gQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAABAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAADABgAAAAAAAAuAAAAAAADgQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADIAAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAADABgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAABACAAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAAAlAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAADgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAABAIEAAAAAAAAgAAAAAAMAIAAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAYAAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAAAlAAAAAAEAJQAAAAADAA==
+          tiles: gQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAlAAAAAAEAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAABgAAAAAAAAuAAAAAAADgQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADIAAAAAADAIEAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAAJQAAAAABABgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAIAgQAAAAAAAIEAAAAAAAAlAAAAAAMAGAAAAAAAABgAAAAAAAAtAAAAAAADgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAADAIEAAAAAAAAgAAAAAAEAIAAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAQAYAAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAAAlAAAAAAIAJQAAAAABAA==
           version: 7
         -3,-3:
           ind: -3,-3
-          tiles: LQAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAIAAAAAADAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAAAACQAAAAAAQAgAAAAAAAAgQAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACUAAAAAAAAlAAAAAAEALQAAAAAAAy0AAAAAAAAtAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAwAkAAAAAAIAKQAAAAACACkAAAAAAAAkAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAIAAAAAADAIEAAAAAAAAkAAAAAAAAJAAAAAADAIEAAAAAAACBAAAAAAAAJAAAAAAAACQAAAAAAwAkAAAAAAEAJAAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAEAGAAAAAAAAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAMAGAAAAAAAABgAAAAAAAAtAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACACUAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQAlAAAAAAMAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAA==
+          tiles: LQAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAJAAAAAABACQAAAAAAgAkAAAAAAMAIAAAAAADAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAACACQAAAAAAAAgAAAAAAEAgQAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACUAAAAAAQAlAAAAAAEALQAAAAAAAy0AAAAAAAAtAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAgAkAAAAAAIAKQAAAAABACkAAAAAAgAkAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEALQAAAAAAA4EAAAAAAAAkAAAAAAMAJAAAAAADAIEAAAAAAACBAAAAAAAAJAAAAAADACQAAAAAAwAkAAAAAAAAJAAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAEAGAAAAAAAAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAgAlAAAAAAMAGAAAAAAAABgAAAAAAAAtAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADACUAAAAAAgAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAMAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEALgAAAAAAAS0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAACABYAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAALgAAAAAAAS0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAACABYAAAAAAwCBAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADgQAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAEAFgAAAAAAABYAAAAAAQCBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAoEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAWAAAAAAMAFgAAAAABABYAAAAAAwAWAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAgAAAAAAMALQAAAAAAAC0AAAAAAAAvAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAAAAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAtAAAAAAAAJQAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAABACsAAAAAAgArAAAAAAEAKwAAAAACACsAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAIAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAQAWAAAAAAAAFgAAAAADABYAAAAAAQCBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAoEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAABABYAAAAAAQAWAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAgAAAAAAMALQAAAAAAAC0AAAAAAAAvAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAADAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAtAAAAAAAAJQAAAAAAACsAAAAAAgArAAAAAAAAKwAAAAADACsAAAAAAQArAAAAAAIAKwAAAAAAACsAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABAIEAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAADAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -4,-1:
           ind: -4,-1
@@ -196,7 +196,7 @@ entities:
           version: 7
         -4,-2:
           ind: -4,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAsAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAArAAAAAAMAKwAAAAADACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAALAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAAKwAAAAAAACsAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAACwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAACsAAAAAAQArAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADMAAAAAAAAzAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAMwAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAsAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAArAAAAAAIAKwAAAAADACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAALAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAAKwAAAAADACsAAAAAAQAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAACwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAACsAAAAAAQArAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADMAAAAAAAAzAAAAAAwAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAMwAAAAAJAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -5,-2:
           ind: -5,-2
@@ -204,15 +204,15 @@ entities:
           version: 7
         -4,-4:
           ind: -4,-4
-          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAAAgQAAAAAAAA0AAAAAAAANAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACwAAAAAAAIEAAAAAAAANAAAAAAAADQAAAAAAACsAAAAAAAArAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAsAAAAAAACBAAAAAAAADQAAAAAAAA0AAAAAAAArAAAAAAIAKwAAAAADAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAuAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAAuAAAAAAABLQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALgAAAAAAAi0AAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAy4AAAAAAAAuAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALgAAAAAAAYEAAAAAAACBAAAAAAAALgAAAAAAAQ==
+          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAAAgQAAAAAAAA0AAAAAAAANAAAAAAAAKwAAAAADACsAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACwAAAAAAAIEAAAAAAAANAAAAAAAADQAAAAAAACsAAAAAAAArAAAAAAEAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAsAAAAAAACBAAAAAAAADQAAAAAAAA0AAAAAAAArAAAAAAIAKwAAAAACAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAuAAAAAAABFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAAuAAAAAAABLQAAAAAAAxcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALgAAAAAAAi0AAAAAAAMXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAy4AAAAAAAAuAAAAAAACFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALgAAAAAAAYEAAAAAAACBAAAAAAAALgAAAAAAAQ==
           version: 7
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy4AAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAAAuAAAAAAAALQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAAC0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAi4AAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAACgQAAAAAAAIEAAAAAAAAuAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC4AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAC4AAAAAAAEuAAAAAAADLgAAAAAAAS0AAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAC4AAAAAAAItAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy4AAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAAAuAAAAAAAALQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAAC0AAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAi4AAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAACgQAAAAAAAIEAAAAAAAAuAAAAAAACFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC4AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAARcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAC4AAAAAAAEuAAAAAAADLgAAAAAAAS0AAAAAAAMXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAC4AAAAAAAItAAAAAAADFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALgAAAAAAAhcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC0AAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAxcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -3,-5:
           ind: -3,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAA4EAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAADLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAy0AAAAAAAAuAAAAAAABLgAAAAAAAw8AAAAAAwAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAJQAAAAABAC0AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAy0AAAAAAAAuAAAAAAABLgAAAAAAAw8AAAAAAQAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAA==
           version: 7
         -4,-5:
           ind: -4,-5
@@ -220,11 +220,11 @@ entities:
           version: 7
         -3,-6:
           ind: -3,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -5,-4:
           ind: -5,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
           version: 7
         -5,-5:
           ind: -5,-5
@@ -232,11 +232,11 @@ entities:
           version: 7
         -2,-5:
           ind: -2,-5
-          tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAawAAAAABAGsAAAAAAABrAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAEAgQAAAAAAAAkAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAIEAAAAAAAAJAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAACAIEAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAEAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQCBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAA==
+          tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAawAAAAAAAGsAAAAAAwBrAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAAAkAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAADAIEAAAAAAAAJAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAIEAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAADAA==
           version: 7
         -1,-5:
           ind: -1,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAEALQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAALwAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAMAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAADACAAAAAAAAAgAAAAAAIAIAAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAbAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAAAACAAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAwCBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAwAgAAAAAAMAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAEAIAAAAAABAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAEALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAALwAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAMAIAAAAAADAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAbAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAQCBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAwAgAAAAAAIAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAABAA==
           version: 7
         -1,-6:
           ind: -1,-6
@@ -244,31 +244,31 @@ entities:
           version: 7
         0,-6:
           ind: 0,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAADAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAADABAAAAAAAwCBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAEAAAAAAAABAAAAAAAgAQAAAAAAEAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAIAEAAAAAADAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAIAEAAAAAABABAAAAAAAwCBAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAIAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABAAAAAAAQAQAAAAAAAAEAAAAAADAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAIAEAAAAAAAABAAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAEAAAAAACABAAAAAAAwAQAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABAAAAAAAgAQAAAAAAEAEAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAMAEAAAAAADABAAAAAAAgCBAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAIAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAACAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-7:
           ind: 0,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAABAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAA==
           version: 7
         1,-6:
           ind: 1,-6
-          tiles: YAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAACAGAAAAAAAwAaAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAABABoAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAABgAAAAAAIAYAAAAAACAGsAAAAAAABgAAAAAAMAYAAAAAACAGsAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgBrAAAAAAEAYAAAAAABAGsAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAgCBAAAAAAAAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAEAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAMAYAAAAAABAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: YAAAAAADAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAAAaAAAAAAEAYAAAAAACAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAwBgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABABoAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAABAIEAAAAAAABgAAAAAAEAYAAAAAAAAGsAAAAAAgBgAAAAAAIAYAAAAAACAGsAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAABrAAAAAAAAYAAAAAABAGsAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAABAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAABAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         1,-7:
           ind: 1,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAIEAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAACAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAwCBAAAAAAAAGgAAAAADAGAAAAAAAABgAAAAAAEAgQAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAEAgQAAAAAAABoAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAQAaAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAIEAAAAAAAAaAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAABABoAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQCBAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAACBAAAAAAAAGgAAAAAAAGAAAAAAAABgAAAAAAEAgQAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAIAgQAAAAAAABoAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAgAaAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAIEAAAAAAAAaAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAABAGAAAAAAAgCBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAACABoAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAACAA==
           version: 7
         1,-5:
           ind: 1,-5
-          tiles: LQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACsAAAAAAQArAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAEAKwAAAAADACsAAAAAAwArAAAAAAEAJQAAAAACAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAActAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAoEAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAALgAAAAAAAy0AAAAAAAArAAAAAAAHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAACAA8AAAAAAgAPAAAAAAEAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAIADwAAAAACAA8AAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAADAA8AAAAAAQAPAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAMAIAAAAAADAIEAAAAAAAAPAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAEADwAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAADAA8AAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAMADwAAAAADAA8AAAAAAgAkAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAMAIAAAAAABACAAAAAAAgAgAAAAAAEALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJAAAAAACACAAAAAAAgAgAAAAAAMAJQAAAAABACAAAAAAAQAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAABACUAAAAAAQAgAAAAAAIAIAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAAAIAAAAAADACQAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADAIEAAAAAAAAKAAAAAAAAgQAAAAAAAA==
+          tiles: LQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAABACsAAAAAAQArAAAAAAMAKwAAAAAAACsAAAAAAgArAAAAAAIAJQAAAAADAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAActAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAoEAAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAgCBAAAAAAAALgAAAAAAAy0AAAAAAAArAAAAAAEHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAADAA8AAAAAAAAPAAAAAAIAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAgAPAAAAAAAADwAAAAABAA8AAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAMADwAAAAAAAA8AAAAAAgAPAAAAAAIAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAgAPAAAAAAIADwAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAADAA8AAAAAAgAPAAAAAAAADwAAAAABAA8AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAQAPAAAAAAEADwAAAAADAA8AAAAAAwAkAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAEHLQAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAAAgAAAAAAIALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJAAAAAABACAAAAAAAQAgAAAAAAEAJQAAAAADACAAAAAAAwAgAAAAAAEAgQAAAAAAAC0AAAAAAAArAAAAAAIHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAADACUAAAAAAwAgAAAAAAMAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAADBy4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACQAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAACAIEAAAAAAAAKAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-6:
           ind: 2,-6
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         2,-5:
           ind: 2,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAQCBAAAAAAAACgAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAQCBAAAAAAAACgAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-7:
           ind: 2,-7
@@ -276,63 +276,63 @@ entities:
           version: 7
         3,-5:
           ind: 3,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAeAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         4,-5:
           ind: 4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAHgAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAB4AAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         3,-6:
           ind: 3,-6
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAeAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAA==
           version: 7
         4,-4:
           ind: 4,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAQAsAAAAAAMALAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAJAAAAAACAIEAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAgAgAAAAAAAALAAAAAADACwAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAQAgAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAAAaAAAAAAIAGgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACABAAAAAAAQAQAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAgQAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAgAQAAAAAAAAEAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-4:
           ind: 5,-4
-          tiles: LwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: LwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAA==
           version: 7
         5,-5:
           ind: 5,-5
-          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHQAAAAAAAB0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHQAAAAAAAB0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-4:
           ind: 3,-4
-          tiles: CgAAAAAAAAoAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAADAFAAAAAAAABQAAAAAAAAUAAAAAABAFAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAwCBAAAAAAAAgQAAAAAAAFAAAAAAAgBQAAAAAAEAUAAAAAAAAFAAAAAAAgBQAAAAAAIAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAAAACUAAAAAAwAlAAAAAAMAgQAAAAAAAIEAAAAAAABQAAAAAAAAUAAAAAACAFAAAAAAAwBQAAAAAAMAUAAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAADAIEAAAAAAACBAAAAAAAAUAAAAAAAAFAAAAAAAwBQAAAAAAMAUAAAAAADAFAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAgAlAAAAAAEAJQAAAAAAACUAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAgBQAAAAAAAAUAAAAAABAFAAAAAAAwCBAAAAAAAAgQAAAAAAAC0AAAAAAAOBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMlAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAMAUAAAAAACAFAAAAAAAwBQAAAAAAEAUAAAAAADACAAAAAAAAAgAAAAAAMALQAAAAAAAy4AAAAAAAMuAAAAAAACLQAAAAAAAy4AAAAAAAMtAAAAAAAAJQAAAAACACAAAAAAAQAgAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAACAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAAALQAAAAAAACUAAAAAAgAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAMAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAQCBAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAMAIAAAAAADACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACAA==
+          tiles: CgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAEAJQAAAAACACUAAAAAAQAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAwAlAAAAAAAAJQAAAAADACUAAAAAAQAlAAAAAAEAJQAAAAACAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAACACUAAAAAAAAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAOBAAAAAAAAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAwBEAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABQAAAAAAEAUAAAAAADAFAAAAAAAgBQAAAAAAIAUAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAAAAFAAAAAAAQBQAAAAAAMAUAAAAAABAFAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAwBQAAAAAAAAUAAAAAADAFAAAAAAAABQAAAAAAAAgQAAAAAAAA==
           version: 7
         4,-3:
           ind: 4,-3
-          tiles: gQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAQCBAAAAAAAAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwBEAAAAAAAARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACYAAAAAAAAmAAAAAAIAJgAAAAABACYAAAAAAQAmAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAIAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAIAAAAAABACAAAAAAAwBEAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAgQAAAAAAACAAAAAAAgAgAAAAAAIARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABACAAAAAAAwAgAAAAAAEAIAAAAAABAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: YAAAAAAAAGAAAAAAAwBgAAAAAAEAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAEAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAADAIEAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACYAAAAAAwAmAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAgBgAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAIEAAAAAAACBAAAAAAAAIAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAIAAAAAAAACAAAAAAAwBEAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAARAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACACAAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAgCBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwCBAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-3:
           ind: 5,-3
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAAQAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAAmAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAIEAAAAAAAAEAAAAAAAARwAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAABAAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
+          tiles: IAAAAAADACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAABAAAAAAAABgAAAAAAAAmAAAAAAEAJgAAAAAAACYAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAAgQAAAAAAAAQAAAAAAABHAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAIAAAAAABACAAAAAAAwAgAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAEAAAAAAAAGAAAAAAAACAAAAAAAQAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         3,-3:
           ind: 3,-3
-          tiles: gQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAAAAGAAAAAAAwAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAACUAAAAAAwCBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgAlAAAAAAEAgQAAAAAAAC8AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAJQAAAAABAIEAAAAAAAAvAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAARAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAAAACUAAAAAAwCBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAwCBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAbwAAAAAAAGAAAAAAAgBgAAAAAAIAbwAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAADAG8AAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGQAAAAACABkAAAAAAAAZAAAAAAIAGQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAABAA==
+          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAIAAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAgBQAAAAAAMAUAAAAAADAFAAAAAAAABQAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAACAFAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAAC4AAAAAAAEtAAAAAAABLQAAAAAAAYEAAAAAAACBAAAAAAAAUAAAAAABAFAAAAAAAgBQAAAAAAMAUAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAALgAAAAAAAS4AAAAAAAMgAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAQAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAtAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAgAgAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAABACAAAAAAAQAgAAAAAAEAgQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEARAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAgBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAADAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAACABYAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAABYAAAAAAwAWAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAACABYAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAADAA==
           version: 7
         4,-2:
           ind: 4,-2
-          tiles: YAAAAAABAGAAAAAAAQCBAAAAAAAAIAAAAAACACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAS8AAAAAAAAtAAAAAAABLQAAAAAAAS0AAAAAAAEuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAEvAAAAAAAALQAAAAAAAS0AAAAAAAEuAAAAAAADLgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAGBAAAAAAAALgAAAAAAAS0AAAAAAAEtAAAAAAAALwAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAMAIAAAAAADACAAAAAAAwAgAAAAAAAAgQAAAAAAAEcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAACAIEAAAAAAAAlAAAAAAMAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAMtAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAAAIAAAAAADACAAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAABLgAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAEAgQAAAAAAACUAAAAAAAAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAACACUAAAAAAgAlAAAAAAAAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAAAACUAAAAAAwCBAAAAAAAAIQAAAAABACEAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
+          tiles: YAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAS8AAAAAAAAtAAAAAAABLQAAAAAAAS0AAAAAAAEuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAEvAAAAAAAALQAAAAAAAS0AAAAAAAEuAAAAAAADLgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAGBAAAAAAAALgAAAAAAAS0AAAAAAAEtAAAAAAAALwAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAMAgQAAAAAAAEcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAIAIAAAAAACAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAMtAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAQCBAAAAAAAAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAABLgAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAIAgQAAAAAAACUAAAAAAwAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAIAIAAAAAADACUAAAAAAQAlAAAAAAEAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAgCBAAAAAAAAIQAAAAAAACEAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         3,-2:
           ind: 3,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGQAAAAABABkAAAAAAAAZAAAAAAMAGQAAAAACAIEAAAAAAABgAAAAAAIAYAAAAAADAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwAvAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAABgAAAAAAIAgQAAAAAAAIEAAAAAAABHAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAABLQAAAAAAAS8AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAS0AAAAAAAEvAAAAAAAAIAAAAAACACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAAAlAAAAAAMAJQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAMARwAAAAAAAIEAAAAAAABHAAAAAAAAIAAAAAADACUAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAGAAAAAAAQCBAAAAAAAAIAAAAAABACAAAAAAAwAgAAAAAAMAIAAAAAADACAAAAAAAwAlAAAAAAMAIgAAAAADACIAAAAAAQAiAAAAAAMAIgAAAAADACQAAAAAAgAiAAAAAAMAIgAAAAACACIAAAAAAgBgAAAAAAEAIAAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAgCBAAAAAAAARwAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAgAiAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAfAAAAAAIAgQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAABgAAAAAAAAIgAAAAAAAGAAAAAAAABHAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAABACUAAAAAAwAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQAiAAAAAAMAIgAAAAAAACIAAAAAAQBgAAAAAAEAgQAAAAAAACQAAAAAAgAlAAAAAAAAJQAAAAAAACUAAAAAAQAlAAAAAAMAJQAAAAABAA==
+          tiles: gQAAAAAAAIEAAAAAAAAWAAAAAAIAFgAAAAADABYAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAMAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQCBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAEAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAABHAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAiAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAABLQAAAAAAAS8AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAS0AAAAAAAEvAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAADACUAAAAAAQAlAAAAAAAAJQAAAAABACUAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAwAlAAAAAAAARwAAAAAAAIEAAAAAAABHAAAAAAAAgQAAAAAAACUAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAwAlAAAAAAAAIgAAAAABACIAAAAAAgAiAAAAAAAAIgAAAAADACQAAAAAAAAiAAAAAAIAIgAAAAAAACIAAAAAAwBgAAAAAAIAIAAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAABACAAAAAAAwCBAAAAAAAARwAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAAAiAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAQAfAAAAAAIAgQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAABgAAAAAAMAIgAAAAADAGAAAAAAAQBHAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAQAlAAAAAAEAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAGAAAAAAAwAiAAAAAAEAIgAAAAABACIAAAAAAwBgAAAAAAIAgQAAAAAAACQAAAAAAwAlAAAAAAEAJQAAAAACACUAAAAAAwAlAAAAAAIAJQAAAAABAA==
           version: 7
         2,-2:
           ind: 2,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAQApAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAKQAAAAACAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAgApAAAAAAMAKQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAC4AAAAAAAKBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKQAAAAACAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAAAtAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAADLwAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAABACUAAAAAAwAlAAAAAAIAJQAAAAAAACUAAAAAAwCBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAZAAAAAAIAgQAAAAAAACIAAAAAAQAiAAAAAAMAIgAAAAAAACIAAAAAAAAiAAAAAAMAIgAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAACACIAAAAAAQAiAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgAiAAAAAAMAYAAAAAAAAIEAAAAAAAAfAAAAAAEAHwAAAAADAGAAAAAAAAAfAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAIgAAAAAAAGAAAAAAAgBgAAAAAAMAgQAAAAAAAIEAAAAAAABgAAAAAAIAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALwAAAAAAACUAAAAAAgAlAAAAAAEAJQAAAAADACkAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAApAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACkAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAACACkAAAAAAwApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMuAAAAAAACLgAAAAAAA4EAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAMYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAIrAAAAAAMAGAAAAAAAACsAAAAAAwArAAAAAAIAKwAAAAABACUAAAAAAwAtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAAAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAQAlAAAAAAIAJQAAAAADACUAAAAAAgAlAAAAAAIAJQAAAAADACUAAAAAAgApAAAAAAAAKQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAIAKQAAAAACACkAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAZAAAAAAMAgQAAAAAAACIAAAAAAgAiAAAAAAMAIgAAAAABACIAAAAAAgAiAAAAAAIAIgAAAAADACkAAAAAAwApAAAAAAAAKQAAAAABACkAAAAAAwApAAAAAAEAgQAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAAAACIAAAAAAwAiAAAAAAMAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAwApAAAAAAMAKQAAAAABACkAAAAAAwApAAAAAAIAKQAAAAADAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwAiAAAAAAAAYAAAAAADAIEAAAAAAAAfAAAAAAMAHwAAAAABAGAAAAAAAwAfAAAAAAIAKQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAABAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAIgAAAAACAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAABgAAAAAAIAgQAAAAAAAA==
           version: 7
         2,-3:
           ind: 2,-3
-          tiles: gQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAAAPAAAAAAIADwAAAAABAA8AAAAAAAAPAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAACAIEAAAAAAAABAAAAAAIAAQAAAAABACAAAAAAAgAPAAAAAAMADwAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAgCBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAACACUAAAAAAwAgAAAAAAIAAQAAAAADAAEAAAAAAAAgAAAAAAEADwAAAAAAAA8AAAAAAwAPAAAAAAMADwAAAAAAAA8AAAAAAgAPAAAAAAMAgQAAAAAAACUAAAAAAQAlAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAAAIAAAAAAAAAEAAAAAAQABAAAAAAMAIAAAAAABAA8AAAAAAAAPAAAAAAMADwAAAAAAAA8AAAAAAgAPAAAAAAEADwAAAAAAAIEAAAAAAAAlAAAAAAIAGAAAAAAAACUAAAAAAQAlAAAAAAMAJQAAAAAAACAAAAAAAQABAAAAAAIAAQAAAAABACAAAAAAAQAPAAAAAAIADwAAAAADAA8AAAAAAgAPAAAAAAEADwAAAAACAA8AAAAAAwAPAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAgAgAAAAAAEAAQAAAAAAAAEAAAAAAQAgAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAIADwAAAAABAA8AAAAAAAAPAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAAAACUAAAAAAAAlAAAAAAEAIAAAAAAAAAEAAAAAAwABAAAAAAIAgQAAAAAAAA8AAAAAAwAPAAAAAAEADwAAAAACAA8AAAAAAAAPAAAAAAIADwAAAAABAIEAAAAAAAAlAAAAAAIAJQAAAAACACUAAAAAAQAlAAAAAAAAJQAAAAACAIEAAAAAAAABAAAAAAIAAQAAAAACACAAAAAAAgAPAAAAAAIADwAAAAAAAA8AAAAAAwAPAAAAAAAADwAAAAADAA8AAAAAAgCBAAAAAAAAJQAAAAACACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAIAgQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAwAPAAAAAAAADwAAAAAAAA8AAAAAAwAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAMAJQAAAAACAIEAAAAAAAABAAAAAAMAAQAAAAACACAAAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAQAPAAAAAAIADwAAAAAAAA8AAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAAAACUAAAAAAAAgAAAAAAAAAQAAAAADAAEAAAAAAAAgAAAAAAEADwAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAwAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAQAlAAAAAAMAIAAAAAAAAAEAAAAAAQABAAAAAAIAIAAAAAABAA8AAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAQAPAAAAAAMADwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAAAACAAAAAAAwABAAAAAAEAAQAAAAAAACAAAAAAAQAPAAAAAAEADwAAAAADAA8AAAAAAgAPAAAAAAIADwAAAAAAAA8AAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAADACUAAAAAAAAgAAAAAAMAAQAAAAADAAEAAAAAAQAgAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAMAIAAAAAACAAEAAAAAAAABAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAACAIEAAAAAAAABAAAAAAMAAQAAAAABACAAAAAAAgAPAAAAAAIADwAAAAADAA8AAAAAAAAPAAAAAAMADwAAAAABAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAACACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAgAlAAAAAAMAgQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAwAlAAAAAAEAJQAAAAADACUAAAAAAQCBAAAAAAAAgQAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACACUAAAAAAwAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAAAlAAAAAAMAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAGAAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAABgAAAAAAAAvAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-2:
           ind: 5,-2
-          tiles: gQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAEAgQAAAAAAACAAAAAAAQAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHAAAAAAAABwAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABAIEAAAAAAAAgAAAAAAEAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHAAAAAACABwAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         5,-1:
           ind: 5,-1
@@ -340,7 +340,7 @@ entities:
           version: 7
         3,-1:
           ind: 3,-1
-          tiles: YAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADACIAAAAAAwAiAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAMARwAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAADACUAAAAAAgCBAAAAAAAAgQAAAAAAACIAAAAAAQAiAAAAAAIAIgAAAAABACIAAAAAAQAiAAAAAAIAIwAAAAAAACMAAAAAAAAjAAAAAAAAIwAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAAAACMAAAAAAAAjAAAAAAAAHwAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAADACIAAAAAAgAiAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAEARwAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAADACUAAAAAAwCBAAAAAAAAgQAAAAAAACIAAAAAAwAiAAAAAAIAIgAAAAAAACIAAAAAAQAiAAAAAAMAIwAAAAAAACMAAAAAAAAjAAAAAAAAIwAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADACMAAAAAAAAjAAAAAAAAHwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,-1:
           ind: 4,-1
@@ -348,15 +348,15 @@ entities:
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAIgAAAAADAGAAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAACIAAAAAAgAiAAAAAAMAIgAAAAACACIAAAAAAAAiAAAAAAAAIgAAAAACACIAAAAAAwCBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: KQAAAAABACkAAAAAAwApAAAAAAAAKQAAAAAAACkAAAAAAwCBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAIgAAAAADAGAAAAAAAQCBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADACkAAAAAAAApAAAAAAAAKQAAAAACACkAAAAAAwApAAAAAAIAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAABACIAAAAAAAAiAAAAAAEAIgAAAAAAACIAAAAAAgAiAAAAAAMAIgAAAAABACIAAAAAAgCBAAAAAAAAgQAAAAAAACkAAAAAAQApAAAAAAEAKQAAAAABAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAAAKQAAAAACAIEAAAAAAAApAAAAAAMAKQAAAAABACkAAAAAAQCBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAgCBAAAAAAAAKQAAAAABACkAAAAAAgApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,-4:
           ind: 2,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAALQAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAAGgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAABBgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAAy4AAAAAAAEtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAAAgAAAAAAIAIAAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAgAYAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAQAgAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAMAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAALQAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAAGgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAABBgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAAy4AAAAAAAEtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAyAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAEAIAAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAgAYAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAwAgAAAAAAEAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAgAYAAAAAAAAGAAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAIAIAAAAAAAACAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-6:
           ind: -2,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
           version: 7
         -4,-6:
           ind: -4,-6
@@ -372,19 +372,23 @@ entities:
           version: 7
         6,-3:
           ind: 6,-3
-          tiles: gQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: GAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-2:
           ind: 6,-2
-          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-4:
           ind: 6,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-7:
           ind: 3,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAwBgAAAAAAAAYAAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAADAGAAAAAAAwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAIAYAAAAAADAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+        -5,-3:
+          ind: -5,-3
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
     - type: Broadphase
     - type: Physics
@@ -407,6 +411,12 @@ entities:
       chunkCollection:
         version: 2
         nodes:
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            4809: 52,-97
         - node:
             color: '#FFFFFFFF'
             id: Arrows
@@ -516,65 +526,60 @@ entities:
             173: 11,-58
             174: 11,-59
             175: 11,-60
-            455: 50,-97
-            456: 51,-97
-            457: 52,-97
             458: 54,-102
-            459: 53,-102
-            463: 49,-101
             1726: 40,-14
             1727: 41,-14
             1890: -7,-78
             1891: -6,-78
             3321: 60,-16
             3322: 61,-16
-            3326: 49,-72
-            3327: 50,-72
-            3328: 51,-72
-            3329: 52,-72
-            3330: 53,-72
-            3331: 54,-72
-            3332: 54,-73
-            3333: 53,-73
-            3334: 52,-73
-            3335: 51,-73
-            3336: 50,-73
-            3337: 49,-73
-            3338: 54,-70
-            3339: 54,-69
-            3385: 68,-41
-            3386: 67,-41
-            3387: 57,-37
-            3388: 57,-38
-            3389: 57,-39
-            3390: 57,-40
             3412: 63,-27
             3413: 65,-27
             3414: 65,-23
             3415: 57,-18
             3416: 57,-16
-            3438: 66,-28
             3665: -4,-18
             3666: -5,-18
             3667: -6,-18
             3679: -8,-18
             3680: -7,-18
             3961: 53,-97
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            1011: 31,-20
-            1012: 31,-21
-            1013: 31,-22
+            4053: 39,-73
+            4054: 39,-74
+            4055: 40,-74
+            4056: 40,-73
+            4057: 41,-73
+            4058: 41,-74
+            4059: 42,-74
+            4060: 42,-73
+            4061: 43,-73
+            4062: 43,-74
+            4067: 54,-72
+            4068: 54,-73
+            4416: 36,-18
+            4417: 36,-19
+            4418: 36,-15
+            4419: 29,-18
+            4420: 29,-21
+            4495: 23,-19
+            4496: 23,-20
+            4497: 15,-17
+            4498: 15,-18
+            4645: 68,-39
+            4646: 69,-39
+            4647: 70,-39
+            4648: 71,-39
+            4649: 72,-39
+            4671: 54,-37
+            4672: 56,-37
+            4776: 54,-97
+            4780: 53,-102
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
             441: 36,-74
-            442: 35,-74
             451: 31,-77
             452: 32,-77
             453: 30,-65
@@ -619,17 +624,10 @@ entities:
             66: -27,-61
             67: -13,-62
             68: -12,-62
-            460: 55,-99
-            461: 55,-100
-            462: 55,-101
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BotLeft
-          decals:
-            1014: 27,-22
-            1015: 27,-21
-            1016: 27,-20
+            4772: 56,-99
+            4773: 56,-100
+            4774: 56,-101
+            4781: 55,-98
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -663,14 +661,11 @@ entities:
             2253: 30,-74
             2254: 31,-74
             2255: 33,-74
-            3392: 57,-35
-            3431: 67,-28
-            3432: 68,-28
-            3433: 69,-28
-            3434: 69,-30
-            3435: 68,-30
-            3436: 67,-30
-            3437: 66,-30
+            4413: 32,-21
+            4414: 33,-18
+            4415: 34,-18
+            4593: 33,-20
+            4644: 68,-42
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -697,10 +692,11 @@ entities:
             305: 23,-103
             306: 24,-103
             307: 25,-103
-            464: 49,-102
             615: 18,-69
             616: 17,-69
             2003: -24,-82
+            4777: 49,-102
+            4778: 55,-102
         - node:
             color: '#00FFFFFF'
             id: BoxGreyscale
@@ -730,6 +726,11 @@ entities:
           decals:
             947: 9,-76
             948: 8,-76
+        - node:
+            color: '#2E99FF96'
+            id: BrickBoxOverlay
+          decals:
+            4494: 18,-16
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlayNE
@@ -748,6 +749,11 @@ entities:
             1862: 53,-16
             1863: 55,-17
             1865: 42,-19
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlayNW
+          decals:
+            4488: 23,-17
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlayNW
@@ -763,6 +769,11 @@ entities:
             id: BrickCornerOverlayNW
           decals:
             1860: 41,-15
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlaySE
+          decals:
+            4489: 22,-16
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlaySE
@@ -778,6 +789,12 @@ entities:
             id: BrickCornerOverlaySE
           decals:
             1864: 55,-20
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlaySW
+          decals:
+            4486: 19,-16
+            4487: 23,-18
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlaySW
@@ -821,10 +838,18 @@ entities:
             2986: 13,-31
             2987: 17,-30
         - node:
-            color: '#724276FF'
+            color: '#334E6DC8'
             id: BrickLineOverlayE
           decals:
-            8: -13,-49
+            4899: -35,-49
+            4900: -35,-43
+            4903: -35,-44
+            4904: -35,-48
+        - node:
+            color: '#8C347F96'
+            id: BrickLineOverlayE
+          decals:
+            4945: -13,-49
         - node:
             color: '#95FF6F72'
             id: BrickLineOverlayE
@@ -895,6 +920,12 @@ entities:
             3538: 10,-43
             3539: 9,-43
             3540: 8,-43
+        - node:
+            color: '#DE3A3A96'
+            id: BrickLineOverlayN
+          decals:
+            4616: 61,-42
+            4617: 62,-42
         - node:
             color: '#FA750096'
             id: BrickLineOverlayN
@@ -926,6 +957,12 @@ entities:
             1843: 50,-15
             1844: 51,-15
             1845: 54,-17
+        - node:
+            color: '#52B4E996'
+            id: BrickLineOverlayS
+          decals:
+            4490: 20,-16
+            4491: 21,-16
         - node:
             color: '#95FF6F72'
             id: BrickLineOverlayS
@@ -943,11 +980,6 @@ entities:
             534: 2,-7
             535: 8,-7
             537: 1,-7
-        - node:
-            color: '#9FED5896'
-            id: BrickLineOverlayS
-          decals:
-            2001: 39,-47
         - node:
             color: '#D381C926'
             id: BrickLineOverlayS
@@ -967,6 +999,12 @@ entities:
             938: 8,-74
             939: 9,-74
             940: 10,-74
+        - node:
+            color: '#DE3A3A96'
+            id: BrickLineOverlayS
+          decals:
+            4618: 55,-26
+            4619: 56,-26
         - node:
             color: '#EFB34196'
             id: BrickLineOverlayS
@@ -1024,11 +1062,6 @@ entities:
             503: -4,-6
             504: 6,2
             580: 4,-6
-        - node:
-            color: '#9FED5896'
-            id: BrickLineOverlayW
-          decals:
-            2000: 40,-48
         - node:
             color: '#A4610696'
             id: BrickLineOverlayW
@@ -1067,14 +1100,9 @@ entities:
             1429: -12,-38
             2904: -18,-26
             3512: 7,-42
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNe
-          decals:
-            381: 92,-44
-            382: 91,-43
-            383: 90,-42
+            4137: 92,-42
+            4138: 93,-43
+            4139: 94,-44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
@@ -1083,13 +1111,8 @@ entities:
             2903: -25,-26
             3508: 6,-42
             3892: -7,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNw
-          decals:
-            361: 90,-49
-            362: 91,-48
+            4142: 92,-49
+            4143: 93,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
@@ -1098,47 +1121,31 @@ entities:
             2905: -18,-27
             3513: 7,-44
             3896: -4,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerSe
-          decals:
-            356: 90,-50
-            357: 91,-49
-            358: 92,-48
+            4134: 92,-50
+            4135: 93,-49
+            4136: 94,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
             2902: -25,-27
             3509: 6,-44
+            4140: 93,-44
+            4141: 92,-43
         - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerSw
-          decals:
-            379: 90,-43
-            380: 91,-44
-        - node:
-            zIndex: 2
             color: '#FFFFFFFF'
             id: BrickTileDarkEndW
           decals:
-            391: 87,-50
-            392: 87,-42
+            4165: 89,-42
+            4166: 89,-50
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
             1435: -12,-39
             2208: 23,-55
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNe
-          decals:
-            389: 90,-43
-            390: 91,-44
+            4163: 92,-43
+            4164: 93,-44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
@@ -1147,15 +1154,10 @@ entities:
             1430: -3,-39
             2207: 25,-55
             3894: -6,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNw
-          decals:
-            363: 90,-50
-            364: 91,-49
-            365: 92,-48
-            371: 92,-46
+            4153: 92,-50
+            4154: 93,-49
+            4155: 94,-48
+            4156: 94,-46
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
@@ -1163,13 +1165,8 @@ entities:
             1432: -12,-33
             2209: 23,-53
             3893: -7,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSe
-          decals:
-            368: 91,-48
-            369: 90,-49
+            4161: 92,-49
+            4162: 93,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
@@ -1177,15 +1174,10 @@ entities:
             758: -4,-34
             1431: -3,-33
             2210: 25,-53
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSw
-          decals:
-            370: 92,-46
-            386: 90,-42
-            387: 91,-43
-            388: 92,-44
+            4157: 93,-43
+            4158: 92,-42
+            4159: 94,-44
+            4160: 94,-46
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -1193,14 +1185,18 @@ entities:
             14: -4,-26
             2205: 23,-54
             3835: 10,-67
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
-          decals:
-            367: 92,-47
-            374: 92,-46
-            375: 92,-45
+            4146: 94,-45
+            4147: 94,-46
+            4148: 94,-47
+            4896: -35,-49
+            4897: -35,-43
+            4901: -35,-48
+            4902: -35,-44
+            4930: -48,-51
+            4931: -48,-50
+            4932: -48,-42
+            4933: -48,-41
+            4944: -13,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -1241,17 +1237,11 @@ entities:
             3519: 13,-43
             3520: 14,-43
             3532: 15,-43
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
-          decals:
-            359: 88,-50
-            360: 89,-50
-            373: 91,-46
-            384: 89,-42
-            385: 88,-42
-            407: 87,-46
+            4132: 90,-50
+            4133: 91,-50
+            4150: 93,-46
+            4151: 90,-42
+            4152: 91,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1271,7 +1261,6 @@ entities:
             1423: -10,-33
             1424: -11,-33
             2206: 24,-53
-            2786: -29,-50
             2787: -28,-50
             2906: -24,-27
             2907: -23,-27
@@ -1296,17 +1285,12 @@ entities:
             3529: 8,-43
             3531: 15,-43
             3895: -6,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineS
-          decals:
-            354: 88,-50
-            355: 89,-50
-            372: 91,-46
-            377: 88,-42
-            378: 89,-42
-            408: 87,-46
+            4128: 90,-42
+            4129: 91,-42
+            4130: 90,-50
+            4131: 91,-50
+            4149: 93,-46
+            4925: -29,-50
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -1331,13 +1315,12 @@ entities:
             3181: -4,-37
             3507: 6,-43
             3837: 23,-69
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineW
-          decals:
-            366: 92,-47
-            376: 92,-45
+            4144: 94,-47
+            4145: 94,-45
+            4926: -45,-41
+            4927: -45,-42
+            4928: -45,-50
+            4929: -45,-51
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
@@ -1392,7 +1375,6 @@ entities:
             1796: 53,-16
             1797: 52,-15
             1798: 55,-17
-            1999: 40,-47
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
@@ -1463,7 +1445,6 @@ entities:
             1778: 51,-20
             1779: 53,-20
             1780: 54,-20
-            1997: 39,-47
             2375: 10,-83
             2376: 9,-83
             2377: 11,-83
@@ -1488,7 +1469,6 @@ entities:
             1750: 41,-16
             1753: 55,-18
             1754: 55,-19
-            1998: 40,-48
             2120: -8,-2
             2121: -8,-4
             2488: 14,-87
@@ -1594,6 +1574,7 @@ entities:
             id: Caution
           decals:
             991: -26,-74
+            4516: 19,-26
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -1612,22 +1593,20 @@ entities:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            189: 18,-26
             1915: -26,-75
         - node:
-            color: '#00B6FF28'
+            color: '#334E6DC8'
             id: CheckerNESW
           decals:
-            430: 28,-24
+            4934: -41,-40
+            4935: -40,-40
         - node:
-            color: '#00E26A4E'
+            color: '#43995C96'
             id: CheckerNESW
           decals:
-            425: 27,-19
-            426: 28,-19
-            427: 29,-19
-            428: 30,-19
-            429: 31,-19
+            4380: 32,-18
+            4381: 31,-18
+            4382: 30,-18
         - node:
             color: '#52B4E996'
             id: CheckerNESW
@@ -1667,43 +1646,53 @@ entities:
             1621: 47,-23
             1622: 48,-23
             1623: 49,-23
-            1624: 53,-23
             1625: 54,-23
             1626: 55,-23
             1627: 56,-23
-            3269: 62,-47
-            3270: 62,-46
-            3271: 63,-46
-            3272: 63,-47
-            3273: 58,-39
-            3274: 58,-38
-            3275: 58,-37
-            3276: 58,-36
-            3277: 59,-36
-            3278: 59,-37
-            3279: 59,-38
-            3280: 59,-39
-            3362: 63,-33
-            3363: 63,-34
-            3364: 64,-35
-            3365: 64,-36
-            3366: 63,-37
-            3367: 63,-38
-            3368: 64,-39
-            3369: 64,-40
-            3370: 63,-41
-            3371: 63,-42
-            3442: 62,-49
-            3443: 63,-49
-            3448: 62,-45
-            3449: 63,-45
-            3450: 63,-48
-            3451: 62,-48
-            3460: 57,-32
-            3461: 57,-33
-            3462: 60,-32
-            3463: 60,-33
-            3495: 64,-43
+            4206: 50,-23
+            4210: 50,-32
+            4213: 50,-35
+            4229: 51,-35
+            4231: 52,-32
+            4283: 61,-39
+            4284: 61,-40
+            4285: 62,-40
+            4286: 62,-39
+            4287: 56,-28
+            4288: 55,-29
+            4289: 56,-29
+            4290: 55,-28
+            4291: 61,-41
+            4292: 62,-41
+            4293: 62,-38
+            4294: 61,-38
+            4295: 55,-30
+            4296: 56,-30
+            4297: 56,-27
+            4298: 55,-27
+            4325: 56,-34
+            4326: 56,-33
+            4327: 57,-33
+            4328: 57,-34
+            4329: 58,-33
+            4330: 58,-34
+            4331: 59,-34
+            4332: 59,-33
+            4637: 69,-41
+            4638: 70,-41
+            4639: 71,-41
+            4640: 71,-40
+            4641: 70,-40
+            4642: 69,-40
+            4733: 65,-39
+            4734: 65,-40
+            4735: 65,-41
+            4736: 65,-42
+            4738: 65,-44
+            4739: 65,-45
+            4740: 65,-46
+            4741: 65,-47
+            4744: 65,-43
         - node:
             color: '#EFB34196'
             id: CheckerNESW
@@ -1715,11 +1704,6 @@ entities:
             3875: 26,-70
             3876: 26,-71
             3878: 29,-70
-        - node:
-            color: '#00B6FF28'
-            id: CheckerNWSE
-          decals:
-            431: 28,-24
         - node:
             color: '#3E92D883'
             id: CheckerNWSE
@@ -1766,7 +1750,6 @@ entities:
             1968: 41,-43
             1969: 42,-43
             1970: 43,-47
-            1971: 40,-47
             1972: 40,-42
             1973: 43,-42
             1974: 43,-41
@@ -1786,12 +1769,12 @@ entities:
             1988: 39,-44
             1989: 39,-45
             1990: 39,-46
-            1991: 40,-48
             1992: 41,-48
             1993: 42,-48
             1994: 43,-48
-            1995: 39,-47
-            1996: 45,-44
+            4827: 40,-47
+            4828: 40,-48
+            4829: 39,-47
         - node:
             color: '#DE3A3A49'
             id: CheckerNWSE
@@ -1802,21 +1785,6 @@ entities:
             3804: 9,-50
             3805: 8,-49
             3806: 10,-49
-        - node:
-            color: '#DE3A3A96'
-            id: CheckerNWSE
-          decals:
-            3372: 64,-38
-            3373: 64,-37
-            3374: 63,-36
-            3375: 63,-35
-            3376: 64,-34
-            3377: 64,-33
-            3378: 63,-39
-            3379: 63,-40
-            3380: 64,-41
-            3381: 64,-42
-            3496: 63,-43
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -1851,9 +1819,6 @@ entities:
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            5: -13,-54
-            6: -13,-53
-            7: -13,-52
             57: -25,-74
             58: -24,-74
             59: -23,-74
@@ -1880,12 +1845,15 @@ entities:
             988: -23,-75
             3319: 59,-15
             3320: 58,-15
+            4946: -13,-52
+            4947: -13,-53
+            4948: -13,-54
         - node:
             color: '#DE3A3AFF'
             id: DeliveryGreyscale
           decals:
-            3217: 60,-45
-            3384: 66,-41
+            4660: 59,-38
+            4753: 67,-44
         - node:
             color: '#00000056'
             id: DiagonalCheckerAOverlay
@@ -1912,6 +1880,11 @@ entities:
             3720: -19,-28
             3721: -18,-28
             3722: -17,-28
+        - node:
+            color: '#00000066'
+            id: DiagonalCheckerAOverlay
+          decals:
+            4107: -24,-30
         - node:
             color: '#00000067'
             id: DiagonalCheckerAOverlay
@@ -1983,26 +1956,16 @@ entities:
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            949: 58,-77
             950: 80,-68
-            951: 78,-62
             953: 74,-38
             954: 77,-40
             955: 76,-31
             956: 76,-27
             957: 76,-28
             958: 80,-29
-            959: 79,-28
             960: 80,-27
             961: 79,-34
-            962: 76,-33
-            1469: 57,-77
             1477: 28,-36
-            1480: 40,-38
-            1481: 41,-39
-            1482: 47,-36
-            1483: 48,-36
-            1484: 44,-33
             1498: -12,-80
             1499: -6,-73
             1506: 3,-77
@@ -2018,6 +1981,8 @@ entities:
             1934: 50,-16
             1935: 40,-16
             3408: 73,-28
+            4754: 67,-70
+            4755: 63,-62
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2060,7 +2025,8 @@ entities:
             1936: 41,-32
             2122: -8,-7
             2403: 10,-84
-            3409: 62,-22
+            4756: 67,-58
+            4850: 65,-69
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2121,6 +2087,8 @@ entities:
             3405: 65,-22
             3406: 57,-16
             3407: 57,-18
+            4760: 78,-60
+            4851: 63,-66
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2143,7 +2111,6 @@ entities:
             965: 59,-65
             1474: 44,-50
             1476: 41,-50
-            1485: 33,-24
             1487: 37,-13
             1488: 72,-28
             1494: 78,-33
@@ -2187,7 +2154,10 @@ entities:
             2415: 12,-84
             2417: 23,-82
             3054: 31,-99
-            3397: 61,-49
+            4758: 69,-70
+            4761: 73,-57
+            4853: 57,-73
+            4854: 55,-76
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2204,7 +2174,6 @@ entities:
           decals:
             963: 57,-65
             1475: 39,-50
-            1486: 35,-17
             1497: 77,-50
             1524: -42,-29
             1552: 12,-14
@@ -2223,22 +2192,25 @@ entities:
             2418: 25,-83
             3051: 30,-90
             3052: 17,-92
-            3394: 63,-50
-            3395: 56,-50
-            3396: 59,-49
+            4757: 71,-66
+            4759: 78,-71
+            4763: 49,-17
+            4852: 61,-74
         - node:
             color: '#334E6DC8'
             id: FullTileOverlayGreyscale
           decals:
             3808: 9,-60
         - node:
-            color: '#52B4E996'
+            color: '#43995C96'
             id: FullTileOverlayGreyscale
           decals:
-            3940: -41,-15
-            3941: -38,-17
-            3942: -39,-17
-            3943: -41,-16
+            4385: 31,-17
+        - node:
+            color: '#9FED5896'
+            id: FullTileOverlayGreyscale
+          decals:
+            3981: 6,-59
         - node:
             color: '#A4610696'
             id: FullTileOverlayGreyscale
@@ -2255,11 +2227,9 @@ entities:
             color: '#DE3A3A96'
             id: FullTileOverlayGreyscale
           decals:
-            3202: 66,-44
-            3452: 61,-42
-            3453: 61,-43
-            3454: 61,-44
-            3455: 66,-45
+            4336: 65,-49
+            4731: 63,-34
+            4732: 63,-35
         - node:
             color: '#EFB34196'
             id: FullTileOverlayGreyscale
@@ -2310,7 +2280,6 @@ entities:
             1075: 12,-20
             1571: 13,-70
             3832: 14,-70
-            3950: -38,-15
             3951: -39,-15
             3952: -40,-15
         - node:
@@ -2324,11 +2293,11 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
           decals:
-            3425: 59,-27
-            3426: 58,-27
-            3439: 58,-49
-            3440: 59,-49
-            3441: 60,-49
+            4565: 57,-42
+            4566: 58,-42
+            4567: 59,-42
+            4686: 59,-27
+            4726: 63,-33
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale
@@ -2361,6 +2330,12 @@ entities:
             2579: -20,-43
             2580: -19,-43
             2581: -18,-43
+        - node:
+            color: '#43995C96'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            4386: 30,-21
+            4387: 31,-21
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
@@ -2368,16 +2343,24 @@ entities:
             1076: 12,-18
             1573: 14,-71
             1574: 13,-71
+            3978: -40,-16
+            4408: 28,-25
+            4409: 29,-25
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
           decals:
-            3203: 65,-44
-            3204: 67,-44
-            3423: 58,-30
-            3424: 59,-30
-            3429: 63,-30
-            3430: 64,-30
+            4337: 66,-49
+            4338: 64,-49
+            4685: 59,-30
+            4693: 63,-30
+            4694: 64,-30
+            4723: 63,-36
+        - node:
+            color: '#FA750096'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            4510: 20,-25
         - node:
             color: '#00000067'
             id: HalfTileOverlayGreyscale270
@@ -2405,18 +2388,26 @@ entities:
             id: HalfTileOverlayGreyscale270
           decals:
             228: -5,0
+        - node:
+            color: '#43995C96'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            4388: 29,-20
+            4389: 29,-19
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            3566: 23,-23
-            3567: 23,-24
+            4579: 23,-23
+            4580: 23,-24
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            3421: 57,-28
-            3422: 57,-29
+            4683: 58,-29
+            4684: 58,-28
+            4724: 62,-34
+            4725: 62,-35
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
@@ -2428,13 +2419,6 @@ entities:
             id: HalfTileOverlayGreyscale270
           decals:
             229: -5,-6
-        - node:
-            color: '#00000026'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            25: -44,-55
-            26: -44,-54
-            27: -44,-53
         - node:
             color: '#00000067'
             id: HalfTileOverlayGreyscale90
@@ -2455,10 +2439,16 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            3568: 25,-23
-            3569: 25,-24
             3621: 10,-31
             3622: 10,-30
+            3979: -38,-16
+        - node:
+            color: '#8C347F96'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            4941: -13,-52
+            4942: -13,-53
+            4943: -13,-54
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale90
@@ -2468,20 +2458,29 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
           decals:
-            3427: 60,-28
-            3428: 60,-29
+            4569: 62,-43
+            4570: 62,-44
+            4687: 60,-29
+            4688: 60,-28
+            4727: 64,-34
+            4728: 64,-35
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
           decals:
             3690: -28,-70
+        - node:
+            color: '#FA750096'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            4509: 19,-26
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1565: 97,-58
-            1566: 97,-34
+            4125: 96,-58
+            4127: 96,-34
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
@@ -2493,6 +2492,14 @@ entities:
             2327: 33,-39
             3298: 65,-24
             3299: 65,-28
+            3964: 0,-10
+            3965: -1,-10
+            3966: -2,-10
+            3967: -3,-10
+            3968: 3,-10
+            3969: 4,-10
+            3970: 5,-10
+            3971: 6,-10
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -2530,6 +2537,46 @@ entities:
             id: LoadingAreaGreyscale
           decals:
             3903: -11,-70
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#00000019'
+            id: MarkupRectangle1x2
+          decals:
+            4962: -44,-55
+            4963: -44,-54
+            4964: -44,-53
+        - node:
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4837: 51,-39
+            4842: 50,-39
+            4843: 52,-39
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4838: 52,-38
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4839: 51,-37
+            4840: 50,-37
+            4841: 52,-37
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4844: 50,-38
+        - node:
+            color: '#0000003F'
+            id: MarkupSquare
+          decals:
+            4845: 49,-37
         - node:
             zIndex: 1
             color: '#5283FF37'
@@ -2563,6 +2610,29 @@ entities:
             2895: -19,-27
             2896: -18,-27
             2897: -18,-26
+        - node:
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4846: 52,-37
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4847: 52,-39
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4848: 50,-39
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4849: 50,-37
         - node:
             color: '#FF800066'
             id: MiniTileBoxOverlay
@@ -2646,7 +2716,6 @@ entities:
             161: -33,-38
             162: -33,-56
             200: 29,-73
-            215: 33,-75
             223: 40,-76
             638: 26,-50
             639: 27,-51
@@ -2655,15 +2724,14 @@ entities:
             647: 22,-57
             761: 35,-54
             764: 37,-54
-            1197: 46,-32
-            1199: 49,-34
-            1202: 51,-41
-            1219: 50,-36
             1246: -30,-36
             1247: -31,-35
             1263: -30,-54
             1264: -31,-53
             1296: -32,-50
+            4177: 34,-28
+            4201: 42,-50
+            4602: 33,-75
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkCornerNw
@@ -2677,22 +2745,21 @@ entities:
             627: 27,-56
             763: 36,-54
             767: 40,-53
-            793: 42,-50
             1250: -34,-36
             1251: -33,-35
             1258: -33,-53
             1260: -34,-54
             1285: -40,-42
+            4174: 28,-28
+            4601: 35,-76
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkCornerSe
           decals:
-            98: 34,-29
             136: -53,-47
             158: -33,-36
             164: -33,-54
             224: 40,-77
-            621: 27,-30
             628: 26,-58
             629: 27,-57
             630: 28,-56
@@ -2701,13 +2768,13 @@ entities:
             762: 36,-55
             766: 40,-55
             768: 42,-53
-            794: 43,-50
             1248: -30,-38
             1249: -31,-39
             1261: -31,-57
             1262: -30,-56
             1270: -32,-42
             3726: -32,-59
+            4176: 34,-30
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkCornerSw
@@ -2728,26 +2795,26 @@ entities:
             637: 27,-52
             765: 37,-55
             769: 35,-55
-            1195: 44,-32
-            1198: 46,-34
-            1200: 49,-36
-            1201: 50,-41
             1244: -33,-39
             1245: -34,-38
             1257: -34,-56
             1259: -33,-57
-            1288: -40,-50
+            4175: 28,-30
+            4202: 41,-50
+            4868: -40,-50
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndN
           decals:
             157: -31,-21
             3867: -35,-58
+            4205: 41,-49
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndS
           decals:
             156: -31,-22
+            4961: 37,-78
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndW
@@ -2757,10 +2824,7 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerNe
           decals:
-            105: 35,-28
-            112: 46,-46
             201: 29,-75
-            216: 33,-76
             641: 27,-52
             642: 26,-51
             643: 21,-57
@@ -2772,18 +2836,18 @@ entities:
             1167: -34,-56
             1174: -33,-39
             1175: -34,-38
-            1213: 50,-41
-            1224: 46,-34
-            1225: 49,-36
-            1226: 44,-32
             1256: -31,-36
             1265: -31,-54
-            1305: -40,-50
             2761: 22,-77
             2773: 7,-66
             2784: -31,-52
             2840: -23,-55
             3868: -35,-59
+            4191: 34,-29
+            4198: 44,-39
+            4204: 41,-50
+            4607: 33,-77
+            4879: -40,-50
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerNw
@@ -2797,7 +2861,6 @@ entities:
             780: 40,-55
             786: 36,-55
             788: 42,-53
-            796: 43,-50
             1170: -31,-57
             1171: -30,-56
             1172: -31,-39
@@ -2810,14 +2873,12 @@ entities:
             2774: 10,-66
             2839: -20,-55
             3729: -32,-59
+            4518: 7,-56
+            4606: 35,-77
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerSe
           decals:
-            102: 35,-26
-            104: 34,-27
-            111: 46,-44
-            622: 27,-29
             680: 20,-52
             681: 21,-51
             682: 22,-50
@@ -2825,7 +2886,6 @@ entities:
             684: 27,-56
             783: 36,-54
             785: 40,-53
-            795: 42,-50
             1168: -34,-54
             1169: -33,-53
             1176: -34,-36
@@ -2837,6 +2897,9 @@ entities:
             2783: -31,-40
             2841: -23,-53
             3728: -34,-59
+            4190: 34,-29
+            4517: 5,-52
+            4960: 37,-77
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerSw
@@ -2855,20 +2918,16 @@ entities:
             1166: -30,-54
             1178: -31,-35
             1179: -30,-36
-            1212: 51,-41
-            1218: 50,-36
-            1232: 49,-34
-            1233: 46,-32
             1253: -33,-38
             1268: -33,-56
             1297: -32,-50
             2842: -20,-53
+            4203: 42,-50
+            4959: 37,-77
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            99: 34,-28
-            108: 46,-45
             122: -12,-12
             123: -12,-13
             124: -12,-14
@@ -2897,16 +2956,6 @@ entities:
             1183: -32,-40
             1184: -32,-35
             1185: -32,-34
-            1204: 51,-44
-            1205: 51,-43
-            1206: 51,-42
-            1214: 50,-40
-            1215: 50,-37
-            1228: 46,-33
-            1229: 49,-35
-            1236: 50,-39
-            1237: 50,-38
-            1239: 44,-31
             1252: -30,-37
             1269: -30,-55
             1306: -40,-49
@@ -2934,9 +2983,15 @@ entities:
             2844: 14,-13
             2863: 25,-45
             2864: 25,-44
-            3015: 44,-30
-            3016: 44,-29
             3681: -8,-18
+            4194: 44,-37
+            4195: 44,-38
+            4421: 32,-23
+            4422: 32,-24
+            4423: 32,-25
+            4603: 33,-76
+            4635: 66,-48
+            4771: -17,-38
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkLineN
@@ -2946,20 +3001,6 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
           decals:
-            81: 23,-27
-            82: 25,-27
-            84: 24,-27
-            85: 27,-27
-            86: 28,-27
-            87: 29,-27
-            88: 30,-27
-            89: 32,-27
-            90: 31,-27
-            91: 33,-27
-            100: 34,-27
-            101: 35,-27
-            106: 48,-46
-            107: 47,-46
             113: 23,-73
             114: 24,-73
             115: 25,-73
@@ -2974,7 +3015,6 @@ entities:
             203: 30,-75
             204: 31,-75
             214: 32,-75
-            217: 35,-76
             218: 36,-76
             219: 34,-76
             220: 37,-76
@@ -2999,11 +3039,6 @@ entities:
             1188: -34,-37
             1189: -35,-37
             1190: -36,-37
-            1207: 52,-46
-            1208: 51,-46
-            1222: 48,-34
-            1223: 47,-34
-            1227: 45,-32
             1278: -33,-42
             1279: -34,-42
             1280: -35,-42
@@ -3013,11 +3048,6 @@ entities:
             1284: -39,-42
             1298: -33,-50
             1299: -34,-50
-            1300: -35,-50
-            1301: -36,-50
-            1302: -37,-50
-            1303: -38,-50
-            1304: -39,-50
             2213: 26,-54
             2214: 27,-54
             2541: -21,-34
@@ -3061,12 +3091,30 @@ entities:
             2867: 28,-49
             2868: 29,-49
             2955: 34,-38
-            2958: 22,-27
-            2961: 26,-27
             3724: -34,-59
             3725: -33,-59
             3730: -35,-61
             3731: -34,-61
+            4178: 29,-28
+            4179: 30,-28
+            4180: 31,-28
+            4181: 32,-28
+            4182: 33,-28
+            4193: 35,-29
+            4200: 45,-39
+            4353: 23,-28
+            4354: 24,-28
+            4355: 25,-28
+            4383: 35,-18
+            4590: 25,-18
+            4591: 26,-18
+            4592: 27,-18
+            4604: 34,-77
+            4869: -39,-50
+            4870: -38,-50
+            4871: -37,-50
+            4872: -36,-50
+            4873: -35,-50
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkLineS
@@ -3077,15 +3125,6 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
           decals:
-            92: 28,-29
-            93: 29,-29
-            94: 30,-29
-            95: 31,-29
-            96: 32,-29
-            97: 33,-29
-            103: 35,-27
-            109: 47,-44
-            110: 48,-44
             133: -55,-47
             134: -54,-47
             137: -52,-45
@@ -3095,11 +3134,7 @@ entities:
             205: 31,-77
             206: 32,-77
             207: 33,-77
-            208: 34,-77
-            209: 35,-77
             210: 36,-77
-            211: 37,-77
-            212: 38,-77
             213: 39,-77
             617: 23,-30
             618: 24,-30
@@ -3122,11 +3157,6 @@ entities:
             1191: -34,-37
             1192: -35,-37
             1193: -36,-37
-            1196: 45,-32
-            1203: 52,-44
-            1220: 47,-34
-            1221: 48,-34
-            1238: 44,-25
             1271: -33,-42
             1272: -34,-42
             1273: -35,-42
@@ -3134,11 +3164,6 @@ entities:
             1275: -37,-42
             1276: -38,-42
             1277: -39,-42
-            1289: -39,-50
-            1290: -38,-50
-            1291: -37,-50
-            1292: -36,-50
-            1293: -35,-50
             1294: -34,-50
             1295: -33,-50
             1599: -23,-19
@@ -3185,6 +3210,24 @@ entities:
             2959: 25,-30
             2960: 26,-30
             3727: -33,-59
+            4183: 29,-30
+            4184: 30,-30
+            4185: 31,-30
+            4186: 32,-30
+            4187: 33,-30
+            4192: 35,-29
+            4587: 25,-16
+            4588: 26,-16
+            4589: 27,-16
+            4600: 35,-77
+            4605: 34,-77
+            4636: 72,-45
+            4874: -35,-50
+            4875: -36,-50
+            4876: -37,-50
+            4877: -38,-50
+            4878: -39,-50
+            4958: 38,-77
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkLineW
@@ -3225,19 +3268,8 @@ entities:
             1186: -32,-35
             1187: -32,-34
             1194: -30,-37
-            1209: 51,-44
-            1210: 51,-43
-            1211: 51,-42
-            1216: 50,-40
-            1217: 50,-37
-            1230: 49,-35
-            1231: 46,-33
-            1234: 50,-39
-            1235: 50,-38
-            1240: 44,-31
             1286: -40,-43
             1287: -40,-49
-            1913: 23,-33
             2702: 7,-37
             2703: 7,-36
             2704: 7,-35
@@ -3265,10 +3297,12 @@ entities:
             2880: -9,-12
             2921: -27,-56
             2922: -27,-58
-            3017: 44,-30
-            3018: 44,-29
             3682: -7,-18
             3866: -35,-59
+            4188: 28,-29
+            4424: 34,-23
+            4425: 34,-24
+            4426: 34,-25
         - node:
             color: '#00000054'
             id: MiniTileDiagonalCheckerAOverlay
@@ -3296,6 +3330,12 @@ entities:
             id: MiniTileEndOverlayW
           decals:
             3677: -8,-18
+        - node:
+            color: '#334E6DC8'
+            id: MiniTileInnerOverlayNE
+          decals:
+            4906: -35,-50
+            4907: -35,-42
         - node:
             color: '#52B4E996'
             id: MiniTileInnerOverlayNE
@@ -3319,7 +3359,7 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileInnerOverlayNE
           decals:
-            3201: 69,-47
+            4750: 69,-53
         - node:
             color: '#EFB34196'
             id: MiniTileInnerOverlayNE
@@ -3371,16 +3411,17 @@ entities:
             id: MiniTileInnerOverlayNW
           decals:
             3685: -7,-18
-        - node:
-            color: '#DE3A3A96'
-            id: MiniTileInnerOverlayNW
-          decals:
-            3210: 58,-43
         - node:
             color: '#FF940093'
             id: MiniTileInnerOverlayNW
           decals:
             1875: 55,-20
+        - node:
+            color: '#334E6DC8'
+            id: MiniTileInnerOverlaySE
+          decals:
+            4905: -35,-50
+            4908: -35,-42
         - node:
             color: '#52B4E996'
             id: MiniTileInnerOverlaySE
@@ -3404,6 +3445,12 @@ entities:
             id: MiniTileInnerOverlaySE
           decals:
             3683: -8,-18
+        - node:
+            color: '#DE3A3A96'
+            id: MiniTileInnerOverlaySE
+          decals:
+            4659: 54,-39
+            4749: 69,-51
         - node:
             color: '#EFB34196'
             id: MiniTileInnerOverlaySE
@@ -3437,11 +3484,6 @@ entities:
           decals:
             554: -3,-7
             556: 3,-7
-        - node:
-            color: '#9FED5896'
-            id: MiniTileInnerOverlaySW
-          decals:
-            2002: 40,-47
         - node:
             color: '#A4610696'
             id: MiniTileInnerOverlaySW
@@ -3457,6 +3499,11 @@ entities:
             id: MiniTileInnerOverlaySW
           decals:
             3684: -7,-18
+        - node:
+            color: '#DE3A3A96'
+            id: MiniTileInnerOverlaySW
+          decals:
+            4658: 56,-39
         - node:
             color: '#EFB34196'
             id: MiniTileInnerOverlaySW
@@ -3485,7 +3532,8 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayE
           decals:
-            3198: 69,-46
+            4623: 69,-52
+            4657: 54,-40
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayE
@@ -3509,6 +3557,19 @@ entities:
           decals:
             255: 22,-92
             256: 26,-92
+        - node:
+            color: '#334E6DC8'
+            id: MiniTileLineOverlayN
+          decals:
+            4884: -34,-45
+            4885: -35,-45
+            4886: -36,-45
+            4887: -37,-45
+        - node:
+            color: '#43995C96'
+            id: MiniTileLineOverlayN
+          decals:
+            4384: 35,-18
         - node:
             color: '#52B4E996'
             id: MiniTileLineOverlayN
@@ -3521,10 +3582,9 @@ entities:
             id: MiniTileLineOverlayN
           decals:
             1442: -27,-12
-            1452: 51,-24
             3399: 66,-24
-            3401: 53,-50
             3411: 4,-35
+            4209: 52,-24
         - node:
             color: '#D10000A3'
             id: MiniTileLineOverlayN
@@ -3540,9 +3600,8 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayN
           decals:
-            3199: 70,-47
-            3200: 71,-47
-            3209: 57,-43
+            4751: 70,-53
+            4752: 71,-53
         - node:
             color: '#00000056'
             id: MiniTileLineOverlayS
@@ -3555,6 +3614,10 @@ entities:
             id: MiniTileLineOverlayS
           decals:
             3809: 11,-55
+            4880: -35,-47
+            4881: -36,-47
+            4882: -37,-47
+            4883: -34,-47
         - node:
             color: '#3C44AA33'
             id: MiniTileLineOverlayS
@@ -3578,6 +3641,12 @@ entities:
             id: MiniTileLineOverlayS
           decals:
             2229: -5,-20
+        - node:
+            color: '#DE3A3A96'
+            id: MiniTileLineOverlayS
+          decals:
+            4621: 65,-49
+            4656: 55,-39
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayS
@@ -3593,11 +3662,6 @@ entities:
             3043: 18,-101
             3044: 18,-100
             3045: 18,-99
-        - node:
-            color: '#43990996'
-            id: MiniTileLineOverlayW
-          decals:
-            495: 17,-93
         - node:
             color: '#9FED5896'
             id: MiniTileLineOverlayW
@@ -3605,7 +3669,9 @@ entities:
             1440: -35,-57
             1454: -15,-35
             1912: 8,-71
-            1914: 23,-33
+            4109: 17,-93
+            4586: 25,-20
+            4957: 23,-32
         - node:
             color: '#D381C926'
             id: MiniTileLineOverlayW
@@ -3616,7 +3682,7 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayW
           decals:
-            3208: 58,-42
+            4655: 56,-40
         - node:
             color: '#FF800066'
             id: MiniTileLineOverlayW
@@ -3636,7 +3702,7 @@ entities:
             1115: -28,-67
             1885: 43,-19
             1886: 46,-19
-            3197: 69,-47
+            4746: 69,-53
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerNw
@@ -3644,7 +3710,6 @@ entities:
             1883: 46,-19
             1884: 49,-19
             3042: 18,-102
-            3207: 58,-43
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerSe
@@ -3654,6 +3719,8 @@ entities:
             1145: -18,-57
             1888: 46,-17
             3814: 15,-85
+            4654: 54,-39
+            4745: 69,-51
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerSw
@@ -3664,6 +3731,7 @@ entities:
             2967: 19,-19
             3041: 18,-98
             3815: 14,-85
+            4653: 56,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineE
@@ -3672,8 +3740,10 @@ entities:
             1443: 29,-51
             1597: 7,-17
             1882: 46,-18
-            3196: 69,-46
-            3502: 68,-43
+            4342: 66,-40
+            4343: 66,-41
+            4622: 69,-52
+            4652: 54,-40
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineN
@@ -3683,20 +3753,23 @@ entities:
             253: 19,-92
             254: 28,-92
             1441: -27,-12
-            1451: 51,-24
             1877: 44,-19
             1878: 45,-19
             1879: 47,-19
             1880: 48,-19
-            3194: 70,-47
-            3195: 71,-47
-            3205: 57,-43
             3398: 66,-24
-            3400: 53,-50
             3410: 4,-35
             3623: 14,-35
             3624: 15,-35
             3625: 16,-35
+            4208: 52,-24
+            4344: 71,-45
+            4347: 58,-32
+            4348: 59,-32
+            4349: 63,-32
+            4350: 64,-32
+            4747: 70,-53
+            4748: 71,-53
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineS
@@ -3715,11 +3788,14 @@ entities:
             2964: 18,-19
             3040: 17,-98
             3807: 11,-55
+            4351: 55,-35
+            4352: 52,-35
+            4620: 65,-49
+            4651: 55,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineW
           decals:
-            494: 17,-93
             1439: -35,-57
             1453: -15,-35
             1722: 53,-14
@@ -3729,12 +3805,11 @@ entities:
             3037: 18,-101
             3038: 18,-100
             3039: 18,-99
-            3206: 58,-42
-            3497: 62,-39
-            3498: 62,-38
-            3501: 62,-42
-            3503: 62,-43
-            3504: 62,-44
+            4108: 17,-93
+            4346: 61,-37
+            4585: 25,-20
+            4650: 56,-40
+            4956: 23,-32
         - node:
             color: '#1488C2FF'
             id: MiniTileWhiteInnerNe
@@ -3770,11 +3845,21 @@ entities:
             id: MiniTileWhiteInnerSe
           decals:
             600: -1,-52
+        - node:
+            color: '#48AC56FF'
+            id: MiniTileWhiteInnerSe
+          decals:
+            4834: 38,-47
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteInnerSe
           decals:
             593: -1,-57
+        - node:
+            color: '#48AC56FF'
+            id: MiniTileWhiteInnerSw
+          decals:
+            4833: 40,-47
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteInnerSw
@@ -3815,6 +3900,11 @@ entities:
             id: MiniTileWhiteLineN
           decals:
             612: 15,-67
+        - node:
+            color: '#48AC56FF'
+            id: MiniTileWhiteLineS
+          decals:
+            4832: 39,-47
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteLineS
@@ -3845,11 +3935,17 @@ entities:
             id: MiniTileWhiteLineW
           decals:
             611: 16,-66
+            4831: 40,-48
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteLineW
           decals:
             591: 1,-58
+        - node:
+            color: '#334E6DC8'
+            id: MonoOverlay
+          decals:
+            4894: -34,-43
         - node:
             color: '#D381C971'
             id: MonoOverlay
@@ -3881,8 +3977,8 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            3261: 58,-52
-            3262: 59,-52
+            4559: 58,-44
+            4560: 59,-44
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale
@@ -3903,18 +3999,12 @@ entities:
             52: -23,-52
             53: -23,-53
             54: -23,-50
-        - node:
-            color: '#00B6FF28'
-            id: QuarterTileOverlayGreyscale180
-          decals:
-            432: 27,-24
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            3003: 21,-24
-            3004: 20,-24
-            3005: 19,-24
+            4405: 21,-24
+            4406: 20,-24
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale180
@@ -3925,18 +4015,22 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
           decals:
-            3265: 62,-52
-            3266: 62,-53
+            4564: 62,-45
+        - node:
+            color: '#FA750096'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            4512: 19,-25
         - node:
             color: '#00000067'
             id: QuarterTileOverlayGreyscale270
           decals:
             2588: -23,-40
         - node:
-            color: '#00B6FF28'
+            color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
           decals:
-            433: 29,-24
+            3977: -39,-16
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale270
@@ -3947,8 +4041,8 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            3259: 57,-53
-            3260: 57,-52
+            4557: 57,-45
+            4558: 57,-44
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
@@ -3961,9 +4055,9 @@ entities:
             1069: 15,-20
             1070: 14,-20
             1071: 13,-20
-            3000: 21,-23
-            3001: 20,-23
-            3002: 19,-23
+            4398: 19,-23
+            4401: 20,-23
+            4402: 21,-23
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
@@ -3973,8 +4067,8 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            3263: 60,-52
-            3264: 61,-52
+            4561: 60,-44
+            4562: 61,-44
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
@@ -4013,8 +4107,8 @@ entities:
             2422: 23,-81
             2423: 24,-81
             2424: 25,-81
-            3257: 59,-53
-            3258: 60,-53
+            4555: 59,-45
+            4556: 60,-45
         - node:
             color: '#00000067'
             id: ThreeQuarterTileOverlayGreyscale
@@ -4025,11 +4119,13 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale
           decals:
             1568: 12,-70
+            3973: -41,-15
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            3420: 57,-27
+            4692: 58,-27
+            4720: 62,-33
         - node:
             color: '#00000067'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -4040,11 +4136,13 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
             1570: 15,-71
+            3974: -38,-17
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            3417: 60,-30
+            4689: 60,-30
+            4722: 64,-36
         - node:
             color: '#00000067'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -4056,21 +4154,26 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
             1569: 12,-71
+            3972: -41,-16
+            3975: -39,-17
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            3419: 57,-30
+            4690: 58,-30
+            4719: 62,-36
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
             1567: 15,-70
+            3976: -38,-15
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            3418: 60,-27
+            4691: 60,-27
+            4721: 64,-33
         - node:
             color: '#FFFFFFFF'
             id: WarnBox
@@ -4078,8 +4181,9 @@ entities:
             584: 17,-66
             586: 0,-58
             587: 0,-53
-            601: 19,-26
             608: 15,-66
+            4356: 20,-26
+            4835: 39,-48
         - node:
             color: '#41AC28FF'
             id: WarnBoxGreyscale
@@ -4090,16 +4194,17 @@ entities:
             id: WarnBoxGreyscale
           decals:
             609: 15,-66
+            4836: 39,-48
         - node:
             color: '#70D7FFFF'
             id: WarnBoxGreyscale
           decals:
             585: 17,-66
         - node:
-            color: '#FF8B00FF'
+            color: '#FA7500FF'
             id: WarnBoxGreyscale
           decals:
-            602: 19,-26
+            4357: 20,-26
         - node:
             color: '#FF9C00FF'
             id: WarnBoxGreyscale
@@ -4120,8 +4225,8 @@ entities:
             color: '#DE3A3AFF'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            3216: 60,-46
-            3288: 65,-35
+            4666: 59,-39
+            4702: 65,-36
         - node:
             color: '#D381C9FF'
             id: WarnCornerSmallGreyscaleNW
@@ -4140,9 +4245,9 @@ entities:
             color: '#DE3A3AFF'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            3215: 60,-44
-            3256: 57,-52
-            3287: 65,-32
+            4553: 57,-44
+            4665: 59,-37
+            4701: 65,-33
         - node:
             color: '#D381C9FF'
             id: WarnCornerSmallGreyscaleSW
@@ -4153,7 +4258,7 @@ entities:
             color: '#DE3A3AFF'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            3255: 62,-52
+            4572: 62,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
@@ -4162,9 +4267,10 @@ entities:
             2241: 22,-12
             3013: 16,-44
             3122: -18,-24
-            3213: 60,-46
-            3283: 65,-35
             3472: -18,-20
+            4098: 45,-72
+            4663: 59,-39
+            4698: 65,-36
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
@@ -4174,20 +4280,22 @@ entities:
             3119: -8,-24
             3121: -18,-24
             3473: -16,-20
+            4100: 47,-72
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
             247: 26,-83
             1130: -26,-64
-            3006: 18,-25
             3014: 16,-42
             3092: -18,-22
             3117: -10,-22
-            3212: 60,-44
-            3234: 57,-52
-            3284: 65,-32
             3471: -18,-17
+            4099: 45,-68
+            4515: 19,-25
+            4540: 57,-44
+            4662: 59,-37
+            4697: 65,-33
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
@@ -4197,32 +4305,39 @@ entities:
             3011: 18,-42
             3091: -18,-22
             3113: -8,-22
-            3233: 62,-52
+            4101: 47,-68
+            4571: 62,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnEndE
           decals:
-            3222: 61,-53
+            4528: 61,-45
         - node:
             color: '#DE3A3AFF'
             id: WarnEndGreyscaleE
           decals:
-            3254: 61,-53
+            4548: 61,-45
         - node:
             color: '#DE3A3AFF'
             id: WarnEndGreyscaleW
           decals:
-            3253: 58,-53
+            4547: 58,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnEndW
           decals:
-            3221: 58,-53
+            4527: 58,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnFull
           decals:
             3159: -11,-36
+            4765: 82,-46
+        - node:
+            color: '#D381C9FF'
+            id: WarnFullGreyscale
+          decals:
+            4768: 82,-46
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -4236,7 +4351,6 @@ entities:
             183: -56,-30
             184: -56,-29
             185: -56,-28
-            186: 18,-26
             233: -17,-68
             234: -17,-67
             235: -17,-66
@@ -4244,28 +4358,33 @@ entities:
             246: 26,-84
             1124: -26,-65
             1560: 20,-64
-            2242: 80,-47
-            2243: 80,-46
-            2244: 80,-45
             2529: -56,-64
             2530: -56,-63
             2531: -56,-62
             3090: -18,-23
-            3219: 60,-45
-            3232: 57,-53
-            3281: 65,-33
-            3282: 65,-34
             3315: 56,-20
             3323: 66,-22
             3324: 66,-20
             3325: 66,-21
-            3340: 61,-70
-            3341: 61,-69
             3468: -18,-19
             3469: -18,-18
             3554: 16,-43
             3818: 28,-62
             3819: 28,-61
+            4090: 45,-71
+            4091: 45,-70
+            4092: 45,-69
+            4167: 76,-65
+            4168: 76,-66
+            4169: 76,-64
+            4513: 19,-26
+            4538: 57,-45
+            4661: 59,-38
+            4695: 65,-35
+            4696: 65,-34
+            4764: 76,-44
+            4766: 82,-45
+            4767: 82,-47
         - node:
             color: '#33A9E7FF'
             id: WarnLineGreyscaleE
@@ -4276,20 +4395,19 @@ entities:
             color: '#D381C9FF'
             id: WarnLineGreyscaleE
           decals:
-            2245: 80,-47
-            2246: 80,-46
-            2247: 80,-45
             3106: -18,-23
             3475: -18,-19
             3476: -18,-18
+            4769: 82,-45
+            4770: 82,-47
         - node:
             color: '#DE3A3AFF'
             id: WarnLineGreyscaleE
           decals:
-            3220: 60,-45
-            3251: 57,-53
-            3285: 65,-34
-            3286: 65,-33
+            4546: 57,-45
+            4664: 59,-38
+            4699: 65,-35
+            4700: 65,-34
         - node:
             color: '#70FFB3FF'
             id: WarnLineGreyscaleN
@@ -4309,12 +4427,12 @@ entities:
             color: '#DE3A3AFF'
             id: WarnLineGreyscaleN
           decals:
-            3239: 58,-54
-            3240: 59,-54
-            3241: 60,-54
-            3242: 61,-54
-            3243: 59,-53
-            3244: 60,-53
+            4119: 58,-22
+            4120: 59,-22
+            4121: 61,-22
+            4239: 51,-32
+            4551: 59,-45
+            4552: 60,-45
         - node:
             color: '#70FFB3FF'
             id: WarnLineGreyscaleS
@@ -4352,12 +4470,15 @@ entities:
             1640: 54,-21
             1641: 55,-21
             1642: 56,-21
-            3245: 59,-53
-            3246: 60,-53
-            3247: 58,-52
-            3248: 59,-52
-            3249: 60,-52
-            3250: 61,-52
+            4122: 58,-22
+            4123: 59,-22
+            4124: 61,-22
+            4542: 61,-44
+            4543: 60,-44
+            4544: 59,-44
+            4545: 58,-44
+            4549: 59,-45
+            4550: 60,-45
         - node:
             color: '#D381C9FF'
             id: WarnLineGreyscaleW
@@ -4368,7 +4489,7 @@ entities:
             color: '#DE3A3AFF'
             id: WarnLineGreyscaleW
           decals:
-            3252: 62,-53
+            4541: 62,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -4413,13 +4534,6 @@ entities:
             3087: -17,-22
             3088: -16,-22
             3111: -9,-22
-            3223: 60,-53
-            3224: 59,-53
-            3227: 58,-52
-            3228: 59,-52
-            3229: 60,-52
-            3230: 61,-52
-            3346: 60,-66
             3470: -17,-17
             3908: -28,-71
             3909: -29,-71
@@ -4427,6 +4541,19 @@ entities:
             3911: -20,-71
             3912: -19,-71
             3913: -18,-71
+            4096: 46,-68
+            4112: 59,-22
+            4113: 58,-22
+            4114: 61,-22
+            4172: 74,-61
+            4173: 75,-61
+            4514: 20,-25
+            4531: 59,-45
+            4532: 60,-45
+            4534: 61,-44
+            4535: 60,-44
+            4536: 59,-44
+            4537: 58,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -4442,10 +4569,13 @@ entities:
             3089: -18,-23
             3112: -8,-23
             3160: -10,-36
-            3231: 62,-53
             3316: 58,-20
             3901: -31,-71
             3906: -13,-70
+            4093: 47,-69
+            4094: 47,-70
+            4095: 47,-71
+            4533: 62,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -4459,16 +4589,20 @@ entities:
             2337: 10,-83
             2366: 12,-83
             3007: 17,-44
-            3225: 59,-53
-            3226: 60,-53
-            3235: 58,-54
-            3236: 59,-54
-            3237: 60,-54
-            3238: 61,-54
-            3347: 60,-68
             3465: -18,-17
             3466: -17,-17
             3467: -17,-20
+            4097: 46,-72
+            4110: 61,-22
+            4111: 59,-22
+            4115: 58,-22
+            4170: 75,-63
+            4171: 74,-63
+            4529: 59,-45
+            4530: 60,-45
+            4806: 49,-98
+            4807: 50,-98
+            4808: 51,-98
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
@@ -4479,12 +4613,23 @@ entities:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
-            3192: 71,-53
+            4625: 72,-49
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNw
           decals:
             313: 31,-40
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            4634: 71,-48
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            4630: 71,-49
+            4631: 71,-50
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -4493,14 +4638,46 @@ entities:
             309: 29,-40
             310: 30,-40
             314: 27,-40
-            3193: 72,-53
+            4626: 73,-49
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            4632: 73,-48
+            4633: 72,-48
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
             311: 31,-39
             312: 31,-38
-            3191: 71,-54
+            4627: 72,-50
+        - node:
+            cleanable: True
+            color: '#008CE9FF'
+            id: arrow
+          decals:
+            4085: 51,-69
+        - node:
+            cleanable: True
+            angle: 3.141592653589793 rad
+            color: '#008CE9FF'
+            id: arrow
+          decals:
+            4087: 47,-66
+        - node:
+            cleanable: True
+            color: '#D54E00FF'
+            id: arrow
+          decals:
+            4089: 49,-66
+        - node:
+            cleanable: True
+            angle: 3.141592653589793 rad
+            color: '#D54E00FF'
+            id: arrow
+          decals:
+            4088: 50,-68
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -4508,38 +4685,49 @@ entities:
           decals:
             2861: 50,-66
             2862: 50,-65
-            3484: 38,-71
-            3490: 39,-69
-            3491: 37,-72
-            3492: 38,-73
             3493: 53,-66
             3494: 53,-67
+            4102: 45,-71
+            4106: 47,-72
+            4951: -37,-80
+            4952: -37,-81
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: burnt2
           decals:
-            3486: 38,-72
-            3487: 39,-73
+            4071: 51,-67
+            4084: 48,-71
+            4105: 47,-71
+            4950: -37,-79
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: burnt3
           decals:
-            3485: 39,-72
+            3991: 51,-64
+            3992: 52,-64
+            3993: 52,-63
+            3994: 51,-63
+            3995: 53,-62
+            3996: 52,-62
+            3997: 53,-63
+            3998: 53,-64
+            4069: 51,-68
+            4070: 50,-67
+            4073: 44,-71
+            4103: 46,-72
+            4949: -38,-80
+            4955: -36,-81
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: burnt4
           decals:
-            3488: 39,-71
-            3489: 39,-70
-        - node:
-            cleanable: True
-            color: '#FF0000FF'
-            id: danger
-          decals:
-            2485: -39.515587,-77.16985
+            4076: 46,-71
+            4104: 45,-72
+            4953: -36,-80
+            4954: -39,-80
         - node:
             angle: 1.5707963267948966 rad
             color: '#262626FF'
@@ -4570,12 +4758,6 @@ entities:
             id: heart
           decals:
             1889: 68.50545,-17.796177
-        - node:
-            cleanable: True
-            color: '#FF0000FF'
-            id: radiation
-          decals:
-            2484: -40.09371,-76.7011
         - node:
             cleanable: True
             zIndex: 2
@@ -4583,12 +4765,6 @@ entities:
             id: shop
           decals:
             409: 70.97659,-23.924938
-        - node:
-            cleanable: True
-            color: '#FF0000FF'
-            id: skull
-          decals:
-            2483: -40.171837,-77.79485
         - node:
             cleanable: True
             color: '#FFFF00FF'
@@ -4836,56 +5012,63 @@ entities:
           4,-5:
             0: 65535
           5,-4:
-            0: 65481
+            0: 65287
           5,-3:
             0: 2191
           5,-5:
-            0: 48059
+            0: 65535
           6,-4:
-            0: 65339
+            0: 65534
           6,-3:
             0: 559
           6,-5:
-            0: 46011
+            0: 61166
           7,-4:
-            0: 54735
+            0: 48014
           7,-3:
-            0: 13
-            1: 3072
+            0: 11
+            1: 2048
           7,-5:
-            0: 63487
+            0: 52991
+          8,-4:
+            0: 56575
+          8,-3:
+            0: 13
+            1: 256
           4,-9:
             0: 14591
           5,-8:
             0: 48059
           5,-7:
-            0: 36041
+            0: 39305
           5,-6:
-            0: 47359
+            0: 28927
           5,-9:
             0: 35839
           6,-8:
-            0: 47923
+            0: 48051
           6,-7:
-            0: 15291
+            0: 63291
           6,-6:
-            0: 48127
+            0: 61439
           6,-9:
             0: 32631
           7,-8:
-            0: 65311
+            0: 65521
           7,-7:
-            0: 8191
+            0: 62463
           7,-6:
-            0: 65535
+            0: 60671
           7,-9:
-            0: 39743
+            0: 64319
           8,-8:
-            0: 65295
+            0: 65520
           8,-7:
-            0: 4095
+            0: 61695
           8,-6:
-            0: 61182
+            0: 47359
+          8,-5:
+            0: 40955
           0,-12:
             0: 119
             1: 24576
@@ -4919,33 +5102,33 @@ entities:
           2,-11:
             0: 61166
           3,-10:
-            0: 61440
-            1: 4
+            0: 61638
+            1: 32
+          3,-12:
+            1: 32
+            0: 9920
           3,-11:
-            0: 32992
+            0: 8416
           3,-13:
             0: 61164
-          3,-12:
-            1: 1024
-            0: 32768
+          4,-12:
+            0: 240
           4,-11:
-            0: 34679
+            0: 1911
           4,-10:
-            0: 61440
+            0: 61680
           4,-13:
             0: 15288
-          4,-12:
-            0: 32768
           5,-12:
-            1: 256
-            0: 34952
+            0: 43928
+            1: 32
           5,-10:
-            1: 1
-            0: 63624
+            0: 63643
+            1: 32
           5,-13:
             0: 65535
           5,-11:
-            0: 34952
+            0: 43690
           6,-12:
             0: 64435
           6,-11:
@@ -5036,12 +5219,12 @@ entities:
             0: 56799
           -7,-4:
             0: 65523
+          -6,-8:
+            0: 1800
           -6,-7:
             0: 65535
           -6,-5:
             0: 45942
-          -6,-8:
-            0: 1544
           -6,-6:
             0: 58980
           -6,-9:
@@ -5097,9 +5280,9 @@ entities:
           -1,-16:
             0: 4095
           0,-16:
-            0: 58976
+            0: 26208
           0,-15:
-            0: 30471
+            0: 30479
           -1,-15:
             0: 65295
           0,-14:
@@ -5113,7 +5296,7 @@ entities:
           1,-16:
             0: 55607
           1,-15:
-            0: 47581
+            0: 47583
           1,-14:
             0: 65529
           2,-16:
@@ -5182,7 +5365,7 @@ entities:
           -5,-15:
             0: 63949
           -4,-14:
-            0: 65527
+            0: 65535
           -5,-14:
             0: 40191
           -4,-17:
@@ -5220,7 +5403,7 @@ entities:
           1,-20:
             0: 30711
           1,-19:
-            0: 18023
+            0: 9831
           1,-17:
             0: 4095
           1,-18:
@@ -5304,7 +5487,7 @@ entities:
           -11,-13:
             0: 65520
           -11,-16:
-            0: 3816
+            0: 3812
           -11,-12:
             0: 48051
           -11,-17:
@@ -5433,8 +5616,10 @@ entities:
             1: 53040
           -17,-5:
             1: 206
+          -16,-9:
+            1: 36214
           -15,-8:
-            1: 1
+            1: 3
             0: 47872
           -15,-7:
             0: 16283
@@ -5444,6 +5629,8 @@ entities:
           -15,-5:
             0: 255
             1: 65280
+          -15,-9:
+            1: 4096
           -14,-8:
             0: 65280
           -14,-7:
@@ -5461,14 +5648,28 @@ entities:
           -18,-6:
             1: 2246
             0: 8
+          -17,-9:
+            1: 51200
           -16,-16:
             0: 4095
           -17,-16:
             0: 2184
+          -16,-15:
+            1: 32128
+          -17,-15:
+            1: 2240
+          -16,-14:
+            1: 13158
+          -16,-13:
+            1: 4403
+          -17,-13:
+            1: 34944
+          -16,-12:
+            1: 4369
           -15,-16:
             0: 3003
           -15,-15:
-            1: 1
+            1: 19
           -15,-17:
             0: 40944
           -14,-16:
@@ -5481,6 +5682,14 @@ entities:
             0: 34816
           -13,-17:
             0: 65399
+          -17,-12:
+            1: 34952
+          -16,-11:
+            1: 12561
+          -17,-11:
+            1: 34952
+          -16,-10:
+            1: 25395
           -14,-11:
             0: 52430
           -14,-10:
@@ -5492,7 +5701,7 @@ entities:
           -12,-18:
             0: 61440
           -11,-20:
-            0: 56607
+            0: 32767
           -11,-19:
             1: 61696
             0: 12
@@ -5502,9 +5711,9 @@ entities:
             0: 32768
             1: 49
           -10,-20:
-            0: 64415
+            0: 61439
           -10,-19:
-            0: 34987
+            0: 36015
           -10,-18:
             1: 817
           -10,-21:
@@ -5600,22 +5809,21 @@ entities:
           -7,-18:
             0: 57309
           -7,-20:
-            1: 7709
-            0: 256
+            1: 7701
+            0: 264
           -7,-21:
-            1: 21853
-            0: 35456
+            1: 22365
+            0: 34976
           -6,-20:
-            0: 1
-            1: 7958
+            1: 7959
           -6,-19:
             1: 15
             0: 2032
           -6,-18:
             0: 63351
           -6,-21:
-            0: 15153
-            1: 17478
+            0: 45874
+            1: 19525
           -5,-20:
             0: 256
             1: 55441
@@ -5812,25 +6020,25 @@ entities:
             0: 8738
             1: 2176
           9,-20:
-            0: 62579
+            0: 62067
           10,-22:
             1: 12561
           10,-21:
             1: 24234
           11,-21:
-            1: 57215
+            1: 57343
           11,-22:
             1: 49152
           11,-24:
             1: 136
           12,-24:
-            1: 36848
+            1: 4080
           12,-22:
-            1: 65228
+            1: 65160
           12,-21:
             1: 65535
           9,-19:
-            0: 65327
+            0: 47919
           9,-18:
             0: 65535
           9,-17:
@@ -5854,7 +6062,7 @@ entities:
           11,-20:
             0: 65024
           11,-19:
-            0: 61902
+            0: 62990
           11,-18:
             0: 65535
           11,-17:
@@ -5866,9 +6074,9 @@ entities:
           12,-20:
             0: 65280
           12,-19:
-            0: 57599
+            0: 61695
           12,-18:
-            0: 65534
+            0: 65535
           12,-17:
             0: 16383
           8,-26:
@@ -5906,47 +6114,46 @@ entities:
           13,-17:
             0: 10928
           13,-21:
-            1: 16177
+            1: 16179
           13,-16:
             4: 819
             1: 8
           14,-20:
-            0: 61704
+            0: 53504
             1: 4
           14,-19:
-            0: 39743
+            0: 65247
           14,-18:
-            0: 56829
+            0: 65535
           14,-17:
-            0: 43933
+            0: 59311
           14,-16:
-            0: 238
+            0: 24814
           14,-21:
-            1: 16708
-            0: 36352
+            1: 20292
           15,-19:
-            0: 14563
+            0: 15347
           15,-18:
             0: 30583
           15,-17:
-            0: 49527
+            0: 64695
           15,-20:
             1: 2222
-          15,-16:
-            0: 119
           15,-21:
-            1: 47247
+            1: 47503
+          15,-16:
+            0: 64550
           16,-20:
             1: 44728
           16,-19:
             0: 62208
             1: 8
           16,-18:
-            0: 52700
+            0: 65436
           16,-17:
-            0: 24060
+            0: 57297
           16,-16:
-            0: 26231
+            0: 61917
           16,-21:
             1: 50736
           17,-20:
@@ -5955,31 +6162,34 @@ entities:
             0: 12288
             1: 136
           17,-18:
-            0: 60943
+            0: 26351
           17,-17:
-            0: 61070
+            0: 56660
           17,-16:
-            0: 28671
+            0: 43229
           17,-21:
             1: 12288
           18,-20:
-            1: 240
+            1: 4336
           18,-19:
-            1: 243
+            0: 17
+            1: 226
           18,-18:
-            0: 32015
+            0: 61663
           18,-17:
-            0: 65293
+            0: 65263
           18,-16:
-            0: 20479
+            0: 52974
           19,-20:
             1: 37244
           19,-19:
             1: 253
           19,-18:
-            0: 35755
+            0: 36603
           19,-17:
-            0: 34959
+            0: 48059
+          19,-16:
+            0: 35771
           20,-20:
             1: 65223
           20,-19:
@@ -5989,112 +6199,105 @@ entities:
             0: 57297
           20,-17:
             0: 4445
-          19,-16:
-            0: 52616
           13,-24:
-            1: 6136
-          12,-23:
-            1: 34952
-          13,-23:
-            1: 4369
+            1: 32752
           13,-22:
-            1: 7985
+            1: 16179
           13,-25:
-            0: 14335
+            0: 32767
+          13,-23:
+            1: 13107
           14,-24:
-            1: 1
+            1: 19
           14,-22:
             1: 61696
           14,-25:
-            1: 4096
+            1: 8192
+            0: 17
           15,-22:
             1: 4096
           16,-15:
-            0: 61038
+            0: 65273
           16,-14:
-            0: 45678
+            0: 64515
+          15,-15:
+            0: 63255
           16,-13:
-            0: 33727
-          15,-14:
-            0: 61447
-          15,-13:
-            0: 65535
+            0: 29439
           16,-12:
-            0: 20206
+            0: 63359
           17,-15:
-            0: 30696
+            0: 32138
           17,-14:
-            0: 65287
+            0: 65280
           17,-13:
-            0: 61695
+            0: 63551
           17,-12:
-            0: 4095
+            0: 61695
           18,-15:
-            0: 45311
-          18,-14:
-            0: 56777
+            0: 63989
           18,-13:
-            0: 19487
+            0: 47884
           18,-12:
-            0: 19524
+            0: 63931
+          18,-14:
+            0: 52416
           19,-15:
-            0: 47870
+            0: 61438
           19,-14:
-            0: 30583
+            0: 30578
           19,-13:
-            0: 1815
+            0: 5911
           19,-12:
-            0: 65535
+            0: 57309
           20,-16:
             0: 35225
-          20,-13:
-            1: 3584
+          20,-12:
+            0: 63475
           20,-15:
             1: 49356
             0: 3072
+          20,-13:
+            1: 2048
           21,-15:
             1: 61680
             0: 3840
           21,-13:
-            0: 3968
-          20,-12:
-            0: 65016
+            1: 800
+            0: 3072
           21,-12:
-            0: 65535
+            0: 65534
           22,-15:
             1: 61680
             0: 3840
           22,-13:
-            0: 65520
+            0: 53216
           22,-12:
-            0: 36495
+            0: 15167
           23,-15:
-            1: 28912
-            0: 36608
+            1: 61680
+            0: 3840
           23,-13:
-            0: 12544
-          23,-14:
-            1: 18724
-            0: 9928
+            0: 63280
           23,-12:
-            0: 22359
+            0: 28527
+          23,-14:
+            1: 1152
+            0: 34816
           24,-15:
-            1: 35063
-            0: 30464
+            1: 4343
+            0: 61184
           24,-14:
-            0: 61431
-            1: 4104
-          24,-13:
-            1: 8977
-            0: 52462
+            0: 36350
+            1: 20993
           21,-20:
             1: 65534
           21,-18:
             0: 10024
             1: 34944
           21,-17:
-            0: 4680
-            1: 8320
+            0: 4672
+            1: 9352
           21,-19:
             0: 33280
             1: 3072
@@ -6104,6 +6307,8 @@ entities:
             1: 4403
           22,-19:
             1: 273
+          22,-18:
+            1: 4368
           22,-21:
             1: 30188
           12,-15:
@@ -6118,74 +6323,73 @@ entities:
             1: 12
             0: 65280
           12,-13:
-            0: 3823
+            0: 56575
           11,-13:
-            0: 61262
+            0: 26382
           12,-12:
-            0: 43215
-            6: 4352
+            0: 56799
           13,-15:
             0: 65280
             1: 4
           13,-14:
-            0: 61695
+            0: 55351
           13,-13:
-            0: 36863
+            0: 56799
           13,-12:
-            0: 53747
-          14,-14:
-            0: 61452
-          14,-13:
-            0: 65535
+            0: 65465
           14,-15:
+            0: 57102
+          14,-14:
+            0: 5116
+          14,-13:
             0: 52424
           14,-12:
-            0: 61164
-          15,-15:
+            0: 61452
+          15,-14:
+            0: 119
+          15,-13:
             0: 30579
           15,-12:
-            0: 56797
+            0: 28679
           16,-11:
-            0: 65535
+            0: 63359
           15,-11:
-            0: 53247
+            0: 26623
           16,-10:
-            0: 15347
-          15,-10:
-            0: 57341
+            0: 14207
           16,-9:
-            0: 65467
+            0: 49147
+          15,-10:
+            0: 63078
           15,-9:
-            0: 56541
+            0: 65534
           16,-8:
-            0: 65307
+            0: 65427
           17,-11:
-            0: 24061
+            0: 65481
           17,-10:
-            0: 3952
+            0: 12543
           17,-9:
-            0: 4915
-          17,-8:
-            0: 15241
+            0: 13107
           18,-11:
-            0: 19797
+            0: 7096
           18,-10:
-            0: 38397
+            0: 56413
           18,-9:
-            0: 46047
+            0: 20375
           18,-8:
-            0: 61323
+            0: 53015
           19,-11:
-            0: 18191
+            0: 5917
           19,-10:
-            0: 29286
+            0: 13895
           19,-9:
-            0: 63701
+            0: 36311
           19,-8:
-            0: 43932
+            0: 60383
           20,-11:
-            1: 3584
-            0: 8
+            0: 3
+            1: 2048
           20,-9:
             1: 49344
             0: 3072
@@ -6193,69 +6397,72 @@ entities:
             1: 12
             0: 39296
           21,-11:
-            0: 36623
+            1: 8960
+            0: 3086
           21,-9:
             1: 61680
             0: 3840
           22,-11:
-            0: 65535
+            0: 61391
           22,-9:
             1: 61680
             0: 3840
           23,-11:
-            0: 311
+            0: 14335
           23,-9:
-            1: 61556
-            0: 3976
+            1: 61680
+            0: 3840
           23,-10:
-            1: 10560
-            0: 50720
+            1: 33792
+            0: 2176
+          24,-12:
+            0: 4369
+            1: 34952
           24,-11:
-            1: 4898
-            0: 60620
+            0: 32769
+            1: 19592
           24,-10:
-            0: 65518
-            1: 17
+            1: 596
+            0: 64904
           24,-9:
-            0: 1911
-            1: 63624
+            1: 61457
+            0: 4078
           11,-12:
-            0: 4508
-            6: 52224
+            0: 54740
           12,-11:
-            6: 4369
-            0: 52424
+            0: 65437
           11,-11:
-            6: 52428
-            0: 4371
+            0: 21853
           12,-10:
-            0: 17748
+            0: 60625
           11,-10:
-            0: 22512
+            0: 34944
+            6: 13104
           12,-9:
-            0: 30567
+            0: 56784
           11,-9:
-            0: 56589
+            0: 65416
+            6: 2
           12,-8:
-            0: 4082
+            0: 57117
           13,-11:
-            0: 56793
+            0: 7407
           13,-10:
-            0: 61944
+            0: 56797
           13,-9:
-            0: 61945
+            0: 65529
           13,-8:
-            0: 35768
+            0: 48043
           14,-11:
-            0: 20206
+            0: 61439
           14,-10:
-            0: 61166
+            0: 65535
           14,-9:
-            0: 60654
+            0: 65526
           14,-8:
-            0: 61134
+            0: 64991
           15,-8:
-            0: 57229
+            0: 57231
           16,-7:
             0: 65327
           15,-7:
@@ -6263,13 +6470,15 @@ entities:
           16,-6:
             0: 60967
           15,-6:
-            0: 65167
+            0: 64143
           16,-5:
             0: 1918
           15,-5:
             0: 65419
+          17,-8:
+            0: 30576
           17,-7:
-            0: 29579
+            0: 29447
           17,-6:
             0: 56783
           17,-5:
@@ -6289,7 +6498,7 @@ entities:
           18,-4:
             1: 61443
           19,-7:
-            0: 411
+            0: 3475
           19,-6:
             0: 65439
           19,-5:
@@ -6303,30 +6512,32 @@ entities:
             0: 57293
           20,-5:
             0: 193
+          11,-8:
+            0: 18024
           12,-7:
-            0: 63247
+            0: 61681
           11,-7:
-            0: 38365
+            0: 63590
           12,-6:
-            0: 65343
+            0: 65407
           11,-6:
             0: 65535
           12,-5:
-            0: 3583
+            0: 11775
           11,-5:
             0: 20479
           12,-4:
             0: 4095
           13,-7:
-            0: 61693
+            0: 64952
           13,-6:
-            0: 65519
+            0: 65487
           13,-5:
             0: 65023
           13,-4:
             0: 4095
           14,-7:
-            0: 61678
+            0: 61919
           14,-6:
             0: 57119
           14,-5:
@@ -6336,38 +6547,32 @@ entities:
           15,-4:
             0: 3
             1: 43008
-          8,-5:
-            0: 61156
-          8,-4:
-            0: 61166
-          9,-8:
-            0: 60999
+          9,-7:
+            0: 65030
           9,-6:
             0: 4991
           9,-5:
-            0: 4368
+            0: 272
             1: 68
           9,-9:
-            0: 23887
-          9,-7:
-            0: 57568
+            0: 15091
+          9,-8:
+            0: 57574
           9,-4:
             0: 4369
             1: 17408
           10,-8:
-            0: 30576
+            0: 40176
           10,-7:
-            0: 30896
+            0: 64461
           10,-6:
             0: 53215
           10,-5:
             0: 63485
           10,-9:
-            0: 32013
+            0: 65520
           10,-4:
             0: 4087
-          11,-8:
-            0: 5399
           11,-4:
             0: 4095
           9,-12:
@@ -6375,7 +6580,7 @@ entities:
           9,-11:
             0: 64511
           9,-10:
-            0: 30578
+            0: 28530
           9,-13:
             0: 16307
           10,-12:
@@ -6383,20 +6588,23 @@ entities:
           10,-11:
             0: 65535
           10,-10:
-            0: 22384
+            6: 65520
+            0: 4
           10,-13:
             0: 12276
           20,-4:
             1: 53247
           21,-7:
             0: 16912
-            1: 32800
+            1: 33824
           21,-6:
-            0: 10024
-            1: 34944
+            0: 10016
+            1: 34952
           21,-5:
             0: 648
             1: 3072
+          22,-6:
+            1: 4368
           22,-5:
             1: 4352
           22,-4:
@@ -6433,8 +6641,6 @@ entities:
             1: 16008
           17,-3:
             1: 62
-          8,-3:
-            0: 14
           9,-3:
             0: 1
             1: 3072
@@ -6472,40 +6678,52 @@ entities:
             1: 8031
           -5,-24:
             1: 12288
-          24,-12:
-            1: 8738
-            0: 52428
           24,-8:
             1: 3927
+          24,-13:
+            1: 35908
+            0: 136
           25,-12:
-            0: 4369
-            1: 28270
+            0: 30583
+            1: 2056
           25,-11:
-            0: 273
-            1: 63086
+            0: 14199
+            1: 49160
           25,-10:
-            1: 48051
+            0: 13107
+            1: 34952
           25,-9:
-            1: 22431
+            0: 273
+            1: 24142
           25,-13:
-            0: 4352
-            1: 26355
-          26,-12:
-            1: 4369
-          26,-11:
-            1: 4369
-          26,-13:
-            1: 4369
-          26,-10:
-            1: 1
+            0: 30515
+            1: 200
           25,-8:
-            1: 256
+            1: 785
+          26,-12:
+            1: 22359
+          26,-11:
+            1: 30039
+          26,-9:
+            1: 4387
+          26,-13:
+            1: 21876
+          26,-10:
+            1: 8740
           24,-16:
             1: 24320
+          25,-16:
+            1: 4864
           25,-15:
-            1: 38736
+            1: 20049
+            0: 4352
           25,-14:
-            1: 48063
+            0: 13105
+            1: 34958
+          26,-15:
+            1: 8464
+          26,-14:
+            1: 8739
           12,-26:
             0: 61064
           12,-27:
@@ -6513,7 +6731,9 @@ entities:
           13,-27:
             0: 4096
           13,-26:
-            0: 63249
+            0: 65299
+          14,-26:
+            0: 4096
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -6626,26 +6846,43 @@ entities:
     - type: BecomesStation
       id: Exo
     - type: ImplicitRoof
-- proto: AcousticGuitarInstrument
-  entities:
-  - uid: 1616
-    components:
-    - type: Transform
-      pos: -61.538322,-25.478237
-      parent: 2
-  - uid: 19232
-    components:
-    - type: Transform
-      pos: 46.37038,-29.595928
-      parent: 2
 - proto: ActionStethoscope
   entities:
   - uid: 6661
     components:
     - type: Transform
       parent: 6660
+- proto: ActionToggleBlock
+  entities:
+  - uid: 6618
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 13842
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 13842
+  - uid: 6619
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 13901
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 13901
 - proto: ActionToggleInternals
   entities:
+  - uid: 3031
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 7689
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 7689
   - uid: 7333
     components:
     - type: Transform
@@ -6709,15 +6946,6 @@ entities:
     components:
     - type: Transform
       parent: 18755
-  - uid: 19416
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 19415
-    - type: Action
-      originalIconColor: '#FFFFFFFF'
-      container: 19415
 - proto: ActionToggleJetpack
   entities:
   - uid: 7161
@@ -6745,22 +6973,34 @@ entities:
       parent: 17933
 - proto: ActionToggleLight
   entities:
-  - uid: 517
-    components:
-    - type: Transform
-      parent: 33
-  - uid: 2230
+  - uid: 167
     mapInit: true
     paused: true
     components:
     - type: Transform
-      parent: 2223
+      parent: 33
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 33
+  - uid: 517
+    components:
+    - type: Transform
+      parent: 33
   - uid: 3844
     mapInit: true
     paused: true
     components:
     - type: Transform
       parent: 17536
+  - uid: 4915
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 10499
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 10499
   - uid: 5672
     components:
     - type: Transform
@@ -6773,6 +7013,15 @@ entities:
     components:
     - type: Transform
       parent: 5848
+  - uid: 7566
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 15343
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 15343
   - uid: 8005
     components:
     - type: Transform
@@ -6781,12 +7030,6 @@ entities:
     components:
     - type: Transform
       parent: 16318
-  - uid: 15464
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 15463
 - proto: AirAlarm
   entities:
   - uid: 364
@@ -6803,11 +7046,11 @@ entities:
       - 18775
       - 530
       - 8920
-      - 5203
-      - 2388
       - 18544
       - 18545
       - 19139
+      - 19838
+      - 19837
   - uid: 459
     components:
     - type: Transform
@@ -6816,118 +7059,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8541
-      - 8540
-      - 8539
       - 10476
       - 10477
       - 10478
       - 16422
       - 1099
       - 16423
-  - uid: 3446
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-27.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3551
-      - 9351
-      - 3447
-      - 7119
-      - 7117
-  - uid: 7104
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-39.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 4174
-      - 4175
-      - 10754
-      - 7117
-      - 7119
-      - 3552
-      - 4200
-  - uid: 7131
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-53.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 13816
-      - 275
-      - 9287
-      - 7733
-      - 9363
-      - 3531
-      - 17963
-      - 3399
-      - 3400
-      - 6164
-      - 3396
-      - 3397
-      - 13917
-      - 3398
-  - uid: 7950
-    components:
-    - type: Transform
-      pos: 69.5,-49.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 13910
-      - 13894
-      - 17963
-  - uid: 7952
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-44.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3553
-      - 9357
-  - uid: 7953
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-35.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 7954
-      - 2157
-      - 9293
-      - 8403
-      - 4175
-      - 4174
-      - 8404
-      - 7987
-      - 9213
-      - 10298
-      - 7105
-      - 7114
-      - 7103
-  - uid: 8124
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-56.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 10796
-      - 10267
-      - 275
-      - 13816
+      - 19831
+      - 19832
+      - 19833
   - uid: 8767
     components:
     - type: Transform
@@ -6935,15 +7075,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8525
-      - 8524
-      - 8873
-      - 8526
-      - 8870
-      - 872
-      - 8891
-      - 9463
       - 8655
+      - 9463
+      - 8870
+      - 8873
+      - 4972
+      - 872
+      - 6667
+      - 13188
+      - 4984
   - uid: 8816
     components:
     - type: Transform
@@ -6968,17 +7108,6 @@ entities:
       devices:
       - 6133
       - 9819
-  - uid: 10295
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-49.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 7751
-      - 5415
-      - 10298
   - uid: 14458
     components:
     - type: Transform
@@ -7082,7 +7211,8 @@ entities:
       - 8664
       - 2516
       - 8665
-      - 12821
+      - 15401
+      - 8712
   - uid: 14642
     components:
     - type: Transform
@@ -7091,7 +7221,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 18546
       - 14657
       - 14656
       - 14654
@@ -7156,7 +7285,9 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 579
+      - 19924
+      - 9080
+      - 12242
   - uid: 14778
     components:
     - type: Transform
@@ -7171,6 +7302,101 @@ entities:
       - 14547
       - 14549
       - 14545
+  - uid: 16343
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-49.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17517
+      - 17518
+  - uid: 16344
+    components:
+    - type: Transform
+      pos: 67.5,-49.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17943
+      - 17926
+  - uid: 16345
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-43.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17695
+      - 17700
+  - uid: 16346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-38.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19900
+      - 19901
+      - 19902
+      - 19908
+      - 19907
+      - 17956
+      - 17957
+  - uid: 16353
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-36.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17908
+      - 17909
+  - uid: 16354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-32.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16247
+      - 16252
+      - 16259
+      - 16431
+      - 16433
+      - 16240
+      - 16239
+      - 16238
+      - 16448
+      - 16437
+      - 17907
+      - 2157
+      - 7954
+      - 19908
+      - 19907
+      - 17906
+      - 17997
+  - uid: 16356
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-45.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16240
+      - 16239
+      - 16238
+      - 19903
+      - 19904
+      - 17601
+      - 17516
+      - 17996
   - uid: 17282
     components:
     - type: Transform
@@ -7186,6 +7412,16 @@ entities:
       - 18547
       - 2334
       - 2406
+  - uid: 17993
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-36.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17992
+      - 17990
   - uid: 18013
     components:
     - type: Transform
@@ -7218,6 +7454,8 @@ entities:
       - 13846
       - 14728
       - 7109
+      - 2155
+      - 4170
   - uid: 18493
     components:
     - type: Transform
@@ -7240,7 +7478,7 @@ entities:
       - 11725
       - 11724
       - 11723
-      - 11722
+      - 7979
       - 11721
       - 11720
       - 11719
@@ -7253,44 +7491,95 @@ entities:
       - 8778
       - 18055
       - 18056
+      - 4171
+      - 13846
+      - 9297
+      - 7800
+      - 8607
+      - 9082
+      - 9066
+      - 19872
   - uid: 19220
     components:
     - type: Transform
       pos: -29.5,-58.5
       parent: 2
-- proto: AirAlarmFreezer
-  entities:
-  - uid: 164
+    - type: DeviceList
+      devices:
+      - 19267
+      - 8020
+  - uid: 19835
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-42.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-18.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8793
-      - 14697
-- proto: AirAlarmXeno
-  entities:
-  - uid: 467
+      - 8665
+      - 19834
+      - 8832
+      - 8831
+  - uid: 19836
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-23.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8757
+      - 8666
+      - 14635
+      - 14634
+      - 10070
+  - uid: 19905
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 95.5,-45.5
+      pos: 63.5,-48.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8709
-      - 10421
-      - 8586
-      - 8587
-      - 8588
-      - 8589
-      - 8590
-      - 8591
-      - 7498
-      - 7654
-      - 18834
+      - 17267
+      - 17265
+  - uid: 19909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-30.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 3551
+      - 9351
+      - 3449
+      - 19906
+      - 19912
+      - 3447
+  - uid: 19911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-35.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16259
+      - 16252
+      - 16247
+      - 17913
+      - 17911
+- proto: AirAlarmFreezer
+  entities:
+  - uid: 7344
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-39.5
+      parent: 2
+- proto: AirAlarmXeno
+  entities:
   - uid: 469
     components:
     - type: Transform
@@ -7300,29 +7589,28 @@ entities:
       devices:
       - 10003
       - 10002
-      - 7443
+      - 19818
       - 9649
       - 9620
       - 7957
       - 567
-      - 8532
-      - 8531
-      - 8530
-      - 8520
-      - 8519
-      - 8518
-      - 8514
-      - 8513
-      - 8512
       - 8524
       - 8525
       - 8526
-      - 8453
-      - 8452
-      - 8451
-      - 8445
-      - 8446
-      - 8447
+      - 19817
+      - 19816
+      - 9878
+      - 15243
+      - 15173
+      - 4096
+      - 19820
+      - 19821
+      - 19822
+      - 19823
+      - 19824
+      - 19825
+      - 19826
+      - 19827
   - uid: 569
     components:
     - type: Transform
@@ -7333,18 +7621,17 @@ entities:
       - 8687
       - 3185
       - 18862
-      - 6614
+      - 19889
       - 18801
-      - 14832
-      - 14831
       - 8442
       - 8441
       - 8440
       - 8439
       - 8438
-      - 8390
-      - 8391
-      - 8392
+      - 19890
+      - 19893
+      - 19894
+      - 19895
   - uid: 572
     components:
     - type: Transform
@@ -7360,6 +7647,26 @@ entities:
       - 9613
       - 6422
       - 18812
+  - uid: 579
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 14728
+      - 7109
+      - 11725
+      - 11724
+      - 11723
+      - 9877
+      - 9383
+      - 16452
+      - 16453
+      - 19871
+      - 19870
+      - 8480
   - uid: 1075
     components:
     - type: Transform
@@ -7389,12 +7696,12 @@ entities:
       - 518
       - 8765
       - 18859
-      - 8529
-      - 8528
-      - 8527
       - 10479
       - 10480
       - 10481
+      - 4096
+      - 19820
+      - 19821
   - uid: 1751
     components:
     - type: Transform
@@ -7405,12 +7712,12 @@ entities:
       devices:
       - 8647
       - 9796
-      - 8548
-      - 8549
-      - 8550
       - 19402
       - 12859
       - 19401
+      - 19841
+      - 19840
+      - 19839
   - uid: 1876
     components:
     - type: Transform
@@ -7448,6 +7755,8 @@ entities:
       - 18880
       - 9715
       - 2462
+      - 19815
+      - 811
   - uid: 2197
     components:
     - type: Transform
@@ -7466,15 +7775,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 9287
-      - 7733
-      - 9363
-      - 3531
       - 14283
       - 12148
       - 3402
-      - 3403
       - 8745
+      - 8547
+      - 8548
+      - 8549
+      - 16872
   - uid: 3897
     components:
     - type: Transform
@@ -7501,13 +7809,11 @@ entities:
       - 10479
       - 10480
       - 10481
-      - 8533
-      - 8534
-      - 8535
-      - 8831
-      - 8832
-      - 8665
+      - 19829
+      - 19828
+      - 8107
       - 16242
+      - 19830
   - uid: 5107
     components:
     - type: Transform
@@ -7545,7 +7851,8 @@ entities:
       - 14798
       - 9493
       - 9494
-      - 8744
+      - 14797
+      - 19819
   - uid: 5862
     components:
     - type: Transform
@@ -7585,35 +7892,6 @@ entities:
       - 8439
       - 8438
       - 18862
-  - uid: 6353
-    components:
-    - type: Transform
-      pos: 34.5,-24.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8781
-      - 6670
-      - 8685
-      - 8789
-  - uid: 6354
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-23.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8797
-      - 8777
-      - 8774
-      - 8783
-      - 8784
-      - 8789
-      - 8785
-      - 8788
-      - 8787
-      - 8786
   - uid: 6358
     components:
     - type: Transform
@@ -7622,18 +7900,11 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8592
-      - 8818
-      - 8740
-  - uid: 6360
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-66.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8746
+      - 19875
+      - 14730
+      - 3448
+      - 19873
+      - 19874
   - uid: 6406
     components:
     - type: Transform
@@ -7647,6 +7918,7 @@ entities:
       - 8681
       - 8433
       - 8434
+      - 19885
   - uid: 6407
     components:
     - type: Transform
@@ -7659,6 +7931,7 @@ entities:
       - 8495
       - 8860
       - 8859
+      - 8721
   - uid: 6410
     components:
     - type: Transform
@@ -7671,12 +7944,6 @@ entities:
       - 8613
       - 8776
       - 8493
-      - 8456
-      - 8455
-      - 8454
-      - 8459
-      - 8458
-      - 8457
       - 8862
       - 8863
   - uid: 6411
@@ -7688,15 +7955,16 @@ entities:
       devices:
       - 8750
       - 8654
-      - 8466
-      - 8468
-      - 8467
-      - 8460
-      - 8461
-      - 8462
       - 8471
       - 8469
       - 8470
+      - 19802
+      - 19803
+      - 19804
+      - 19799
+      - 19800
+      - 19801
+      - 8751
   - uid: 6413
     components:
     - type: Transform
@@ -7714,6 +7982,10 @@ entities:
       - 8472
       - 8473
       - 8474
+      - 19806
+      - 19805
+      - 19807
+      - 19808
   - uid: 6416
     components:
     - type: Transform
@@ -7725,17 +7997,6 @@ entities:
       - 8713
       - 8714
       - 8715
-  - uid: 6418
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-55.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 12148
-      - 14283
-      - 8745
   - uid: 6646
     components:
     - type: Transform
@@ -7744,17 +8005,16 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8463
-      - 8464
-      - 8465
-      - 8598
-      - 8597
-      - 8596
-      - 8856
-      - 8857
+      - 19800
+      - 19801
       - 8753
       - 8756
       - 8661
+      - 19799
+      - 19796
+      - 19797
+      - 19798
+      - 4002
   - uid: 7245
     components:
     - type: Transform
@@ -7778,8 +8038,21 @@ entities:
       - 8976
       - 8400
       - 8399
-      - 19289
+      - 3081
       - 18842
+      - 19920
+  - uid: 7582
+    components:
+    - type: Transform
+      pos: 34.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19854
+      - 19851
+      - 18293
+      - 18312
+      - 6423
   - uid: 7875
     components:
     - type: Transform
@@ -7799,26 +8072,6 @@ entities:
     - type: DeviceList
       devices:
       - 1112
-  - uid: 9040
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-30.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8644
-      - 9840
-      - 8703
-      - 8545
-      - 8546
-      - 8547
-      - 8551
-      - 8552
-      - 8553
-      - 18860
-      - 18861
-      - 9822
   - uid: 9180
     components:
     - type: Transform
@@ -7849,13 +8102,18 @@ entities:
       devices:
       - 8741
       - 8742
-      - 8743
+      - 19809
       - 5571
       - 5570
       - 5569
       - 5573
       - 5572
       - 5574
+      - 19810
+      - 19811
+      - 19812
+      - 19814
+      - 19813
   - uid: 9195
     components:
     - type: Transform
@@ -7873,6 +8131,8 @@ entities:
       - 5578
       - 10154
       - 10030
+      - 20047
+      - 20048
   - uid: 9198
     components:
     - type: Transform
@@ -7881,7 +8141,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 18781
       - 16964
       - 18782
       - 8604
@@ -7890,6 +8149,7 @@ entities:
       - 9541
       - 11336
       - 18786
+      - 8605
   - uid: 9199
     components:
     - type: Transform
@@ -7900,12 +8160,12 @@ entities:
       devices:
       - 8768
       - 8770
-      - 8536
-      - 8537
-      - 8538
       - 8601
       - 8600
       - 8599
+      - 19830
+      - 19829
+      - 19828
   - uid: 9216
     components:
     - type: Transform
@@ -7917,14 +8177,14 @@ entities:
       - 9962
       - 8673
       - 8507
-      - 8504
-      - 8503
-      - 8502
       - 8505
       - 8506
-      - 1809
-      - 1807
-      - 9834
+      - 19888
+      - 19887
+      - 19886
+      - 19892
+      - 19891
+      - 8759
   - uid: 9234
     components:
     - type: Transform
@@ -7936,15 +8196,16 @@ entities:
       - 14799
       - 14800
       - 14798
-      - 8448
-      - 8449
-      - 8450
       - 8498
       - 8497
       - 8496
       - 8716
       - 16897
       - 8401
+      - 9878
+      - 15243
+      - 15173
+      - 14797
   - uid: 9235
     components:
     - type: Transform
@@ -7953,16 +8214,16 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8551
-      - 8552
-      - 8553
-      - 8423
-      - 8422
-      - 8421
       - 8554
       - 8555
       - 8638
       - 8639
+      - 19850
+      - 19849
+      - 19848
+      - 19877
+      - 19878
+      - 19879
   - uid: 9236
     components:
     - type: Transform
@@ -7973,20 +8234,22 @@ entities:
       devices:
       - 8616
       - 8615
-      - 8429
-      - 8428
-      - 8427
-      - 8393
-      - 8394
-      - 8395
-      - 8418
-      - 8419
-      - 8420
-      - 8423
-      - 8422
-      - 8421
       - 6602
       - 15637
+      - 19879
+      - 19878
+      - 19877
+      - 8430
+      - 8431
+      - 8432
+      - 8398
+      - 8397
+      - 8396
+      - 8415
+      - 8416
+      - 8417
+      - 8424
+      - 8556
   - uid: 9239
     components:
     - type: Transform
@@ -8001,18 +8264,19 @@ entities:
       - 8676
       - 8678
       - 8677
-      - 8389
-      - 12781
-      - 8387
-      - 8384
-      - 8385
-      - 8386
       - 6976
       - 6977
       - 6978
       - 17153
       - 17130
       - 17129
+      - 19896
+      - 19897
+      - 19898
+      - 19893
+      - 19894
+      - 19895
+      - 19899
   - uid: 9240
     components:
     - type: Transform
@@ -8024,14 +8288,14 @@ entities:
       - 1732
       - 8612
       - 6616
-      - 4276
-      - 8382
-      - 8383
       - 8398
       - 8397
       - 8396
       - 10326
       - 9410
+      - 19896
+      - 19897
+      - 19898
   - uid: 9241
     components:
     - type: Transform
@@ -8046,7 +8310,8 @@ entities:
       - 7017
       - 15635
       - 8790
-      - 10059
+      - 19882
+      - 1800
   - uid: 9243
     components:
     - type: Transform
@@ -8065,7 +8330,6 @@ entities:
       - 7011
       - 7012
       - 9833
-      - 18811
       - 7056
   - uid: 9248
     components:
@@ -8081,6 +8345,7 @@ entities:
       - 8402
       - 9410
       - 10326
+      - 19920
   - uid: 9262
     components:
     - type: Transform
@@ -8090,14 +8355,15 @@ entities:
     - type: DeviceList
       devices:
       - 8735
-      - 8736
-      - 8730
+      - 8732
+      - 8734
       - 8737
       - 8728
       - 8729
-      - 8732
+      - 8628
+      - 8730
+      - 8479
       - 8731
-      - 8734
   - uid: 9403
     components:
     - type: Transform
@@ -8109,18 +8375,17 @@ entities:
       - 8667
       - 8668
       - 3440
-      - 8499
-      - 8500
-      - 8501
       - 8430
       - 8431
       - 8432
-      - 7930
-      - 7926
       - 8433
       - 8434
-      - 10370
-      - 10371
+      - 19888
+      - 19885
+      - 19887
+      - 19886
+      - 19889
+      - 19890
   - uid: 10429
     components:
     - type: Transform
@@ -8130,12 +8395,74 @@ entities:
       devices:
       - 8622
       - 9834
+  - uid: 10761
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18702
+      - 18703
+      - 18704
+      - 914
+      - 913
+      - 19831
+      - 19832
+      - 19833
+      - 18399
+      - 18398
+      - 15636
+  - uid: 10839
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 97.5,-45.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10811
+      - 10788
+      - 15191
+      - 15192
+      - 15193
+      - 15194
+      - 19914
+      - 19915
+      - 3747
+      - 9311
+      - 7594
+  - uid: 12980
+    components:
+    - type: Transform
+      pos: -4.5,-46.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10474
+      - 10473
   - uid: 15885
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-15.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 8602
+      - 8603
+      - 8604
+      - 8601
+      - 8600
+      - 8599
+      - 19798
+      - 19797
+      - 19796
+      - 18795
+      - 14692
+      - 18794
+      - 18793
   - uid: 16120
     components:
     - type: Transform
@@ -8152,6 +8479,94 @@ entities:
       - 9963
       - 8717
       - 4002
+  - uid: 16312
+    components:
+    - type: Transform
+      pos: 53.5,-41.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19903
+      - 19904
+      - 16450
+      - 16451
+      - 19902
+      - 19901
+      - 19900
+      - 8549
+      - 8548
+      - 8547
+      - 16910
+      - 16911
+      - 17995
+  - uid: 16342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-54.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10595
+      - 10279
+  - uid: 16362
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18706
+      - 18707
+      - 18708
+      - 18724
+      - 18723
+      - 18709
+      - 18705
+      - 18554
+      - 18525
+      - 18731
+  - uid: 16363
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18724
+      - 18723
+      - 18709
+      - 18726
+      - 18725
+      - 18735
+  - uid: 16367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-27.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19845
+      - 19846
+      - 19847
+      - 19838
+      - 19837
+      - 18702
+      - 18703
+      - 18704
+      - 18705
+      - 18706
+      - 18707
+      - 18708
+      - 8550
+      - 8551
+      - 8552
+      - 19854
+      - 19851
+      - 15526
+      - 1104
+      - 18400
   - uid: 16603
     components:
     - type: Transform
@@ -8175,31 +8590,23 @@ entities:
       - 7893
       - 17678
       - 18800
-      - 8515
-      - 8516
-      - 8517
-      - 1438
-      - 1806
-  - uid: 18598
+      - 19827
+      - 19826
+      - 19825
+      - 19892
+      - 19891
+  - uid: 18736
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-12.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8764
-      - 14668
-      - 14669
-      - 8542
-      - 8543
-      - 8544
-      - 914
-      - 913
-      - 9643
-      - 15636
-      - 9496
-      - 14601
+      - 18735
+      - 18731
+      - 18665
+      - 18666
   - uid: 18783
     components:
     - type: Transform
@@ -8224,54 +8631,6 @@ entities:
       - 8677
       - 8678
       - 262
-  - uid: 18869
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-11.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 17679
-      - 8426
-  - uid: 18873
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-25.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 18828
-      - 11721
-      - 8572
-      - 8571
-      - 11720
-      - 11719
-      - 11718
-      - 11717
-      - 11716
-      - 11715
-      - 11712
-      - 18827
-      - 8785
-  - uid: 18874
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-25.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 18061
-      - 8571
-      - 8572
-      - 11722
-      - 11723
-      - 11724
-      - 11725
-      - 7109
-      - 14728
   - uid: 19200
     components:
     - type: Transform
@@ -8297,21 +8656,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,-65.5
       parent: 2
-  - uid: 19354
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-15.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8426
-      - 16879
-      - 13106
-      - 8779
-      - 8788
-      - 8787
-      - 8786
   - uid: 19400
     components:
     - type: Transform
@@ -8322,14 +8666,14 @@ entities:
       devices:
       - 1796
       - 531
-      - 8523
-      - 8522
-      - 8521
       - 19401
       - 12859
       - 19402
       - 4972
       - 872
+      - 19822
+      - 19823
+      - 19824
   - uid: 19419
     components:
     - type: Transform
@@ -8343,49 +8687,251 @@ entities:
       - 18786
       - 9596
       - 11935
+  - uid: 19853
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-31.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19841
+      - 19840
+      - 19839
+      - 19848
+      - 19849
+      - 19850
+      - 19845
+      - 19846
+      - 19847
+      - 8644
+      - 9840
+  - uid: 19856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8552
+      - 8551
+      - 8550
+      - 9383
+      - 9877
+      - 7979
+      - 11721
+      - 11720
+      - 11719
+      - 11718
+      - 11717
+      - 11716
+      - 11715
+      - 11712
+      - 18681
+      - 18673
+      - 18828
+  - uid: 19876
+    components:
+    - type: Transform
+      pos: 76.5,-18.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19875
+      - 8592
+      - 8818
+      - 2646
+      - 8740
+  - uid: 19880
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-46.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7009
+      - 7056
+      - 7010
+      - 7011
+      - 7012
+      - 7017
+      - 7016
+      - 7015
+      - 7014
+      - 7013
+      - 10646
+      - 18789
+      - 18811
+      - 19882
+  - uid: 19883
+    components:
+    - type: Transform
+      pos: 42.5,-48.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9247
+      - 582
+  - uid: 19884
+    components:
+    - type: Transform
+      pos: 13.5,-47.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10371
+      - 10370
+  - uid: 19916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-47.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19913
+      - 19914
+      - 19915
+      - 18832
+      - 591
+  - uid: 19917
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 72.5,-63.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19064
+  - uid: 19922
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-72.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19923
+  - uid: 19961
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.5,-62.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9696
+      - 9699
+  - uid: 19962
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-62.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 11944
+      - 10832
+  - uid: 19963
+    components:
+    - type: Transform
+      pos: -44.5,-67.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9702
+      - 14581
+  - uid: 19964
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-61.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 5830
+      - 9701
 - proto: AirCanister
   entities:
-  - uid: 3933
+  - uid: 6560
+    components:
+    - type: Transform
+      pos: 59.5,-63.5
+      parent: 2
+  - uid: 10815
+    components:
+    - type: Transform
+      pos: 62.5,-54.5
+      parent: 2
+  - uid: 15475
+    components:
+    - type: Transform
+      pos: 58.5,-60.5
+      parent: 2
+  - uid: 16265
+    components:
+    - type: Transform
+      pos: 57.5,-60.5
+      parent: 2
+  - uid: 19079
+    components:
+    - type: Transform
+      pos: 74.5,-51.5
+      parent: 2
+  - uid: 19307
     components:
     - type: Transform
       pos: 54.5,-72.5
       parent: 2
-  - uid: 7241
+  - uid: 19493
     components:
     - type: Transform
       pos: 54.5,-71.5
       parent: 2
-  - uid: 8805
+  - uid: 19970
     components:
     - type: Transform
-      pos: 64.5,-62.5
+      pos: -54.5,-25.5
       parent: 2
-  - uid: 15140
+- proto: AirGrenade
+  entities:
+  - uid: 20007
     components:
     - type: Transform
-      pos: 71.5,-69.5
-      parent: 2
-  - uid: 17695
+      parent: 20005
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 20021
     components:
     - type: Transform
-      pos: 70.5,-55.5
-      parent: 2
-  - uid: 19227
-    components:
-    - type: Transform
-      pos: 51.5,-30.5
+      pos: 57.73585,-59.328594
       parent: 2
 - proto: AirlockArmoryGlassLocked
   entities:
-  - uid: 7307
+  - uid: 3617
     components:
     - type: Transform
-      pos: 58.5,-40.5
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-33.5
       parent: 2
-  - uid: 9258
+  - uid: 5427
     components:
     - type: Transform
-      pos: 61.5,-41.5
+      pos: 60.5,-36.5
+      parent: 2
+  - uid: 7279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-34.5
+      parent: 2
+  - uid: 7951
+    components:
+    - type: Transform
+      pos: 55.5,-35.5
       parent: 2
 - proto: AirlockAtmosphericsLocked
   entities:
@@ -8404,6 +8950,17 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 2
+  - uid: 8225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-59.5
+      parent: 2
+  - uid: 15488
+    components:
+    - type: Transform
+      pos: -52.5,-25.5
+      parent: 2
 - proto: AirlockBarLocked
   entities:
   - uid: 3879
@@ -8418,25 +8975,45 @@ entities:
       parent: 2
 - proto: AirlockBrigGlassLocked
   entities:
-  - uid: 3065
+  - uid: 3469
     components:
     - type: Transform
-      pos: 63.5,-44.5
+      pos: 61.5,-37.5
       parent: 2
-  - uid: 3094
+  - uid: 3525
     components:
     - type: Transform
-      pos: 62.5,-47.5
+      pos: 56.5,-26.5
       parent: 2
-  - uid: 3101
+  - uid: 4379
     components:
     - type: Transform
-      pos: 63.5,-47.5
+      pos: 62.5,-37.5
       parent: 2
-  - uid: 8413
+  - uid: 4712
     components:
     - type: Transform
-      pos: 62.5,-44.5
+      pos: 62.5,-40.5
+      parent: 2
+  - uid: 4874
+    components:
+    - type: Transform
+      pos: 55.5,-29.5
+      parent: 2
+  - uid: 4907
+    components:
+    - type: Transform
+      pos: 55.5,-26.5
+      parent: 2
+  - uid: 6125
+    components:
+    - type: Transform
+      pos: 61.5,-40.5
+      parent: 2
+  - uid: 9229
+    components:
+    - type: Transform
+      pos: 56.5,-29.5
       parent: 2
 - proto: AirlockBrigLocked
   entities:
@@ -8506,6 +9083,14 @@ entities:
     - type: Transform
       pos: -19.5,-34.5
       parent: 2
+- proto: AirlockChemistryGlassLocked
+  entities:
+  - uid: 173
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-69.5
+      parent: 2
 - proto: AirlockChemistryLocked
   entities:
   - uid: 91
@@ -8513,11 +9098,6 @@ entities:
     - type: Transform
       pos: 22.5,-68.5
       parent: 2
-  - uid: 13207
-    components:
-    - type: Transform
-      pos: 19.5,-69.5
-      parent: 2
   - uid: 14009
     components:
     - type: Transform
@@ -8551,29 +9131,10 @@ entities:
       parent: 2
 - proto: AirlockCommandGlassLocked
   entities:
-  - uid: 2146
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,-46.5
-      parent: 2
-  - uid: 17853
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,-44.5
-      parent: 2
-- proto: AirlockCommandLocked
-  entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: -46.5,-36.5
-      parent: 2
   - uid: 155
     components:
     - type: Transform
-      pos: -30.5,-42.5
+      pos: -30.5,-41.5
       parent: 2
   - uid: 157
     components:
@@ -8605,33 +9166,53 @@ entities:
     - type: Transform
       pos: -33.5,-42.5
       parent: 2
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -30.5,-42.5
+      parent: 2
+  - uid: 3188
+    components:
+    - type: Transform
+      pos: 83.5,-46.5
+      parent: 2
+  - uid: 5321
+    components:
+    - type: Transform
+      pos: 83.5,-44.5
+      parent: 2
+- proto: AirlockCommandLocked
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -46.5,-36.5
+      parent: 2
   - uid: 276
     components:
     - type: Transform
       pos: -5.5,-2.5
       parent: 2
-  - uid: 797
+  - uid: 7597
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-45.5
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-45.5
       parent: 2
-  - uid: 5425
+- proto: AirlockDetectiveGlassLocked
+  entities:
+  - uid: 10249
     components:
     - type: Transform
-      pos: -30.5,-41.5
+      pos: 67.5,-47.5
       parent: 2
 - proto: AirlockDetectiveLocked
   entities:
-  - uid: 9247
+  - uid: 7307
     components:
     - type: Transform
-      pos: 66.5,-51.5
-      parent: 2
-  - uid: 15386
-    components:
-    - type: Transform
-      pos: 73.5,-51.5
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-45.5
       parent: 2
 - proto: AirlockEngineering
   entities:
@@ -8670,11 +9251,6 @@ entities:
     - type: Transform
       pos: 4.5,-61.5
       parent: 2
-  - uid: 325
-    components:
-    - type: Transform
-      pos: 47.5,-38.5
-      parent: 2
   - uid: 350
     components:
     - type: Transform
@@ -8730,6 +9306,12 @@ entities:
     - type: Transform
       pos: -26.5,-69.5
       parent: 2
+  - uid: 3461
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-29.5
+      parent: 2
   - uid: 4725
     components:
     - type: Transform
@@ -8740,10 +9322,10 @@ entities:
     - type: Transform
       pos: -60.5,-66.5
       parent: 2
-  - uid: 7165
+  - uid: 12988
     components:
     - type: Transform
-      pos: 71.5,-37.5
+      pos: 46.5,-42.5
       parent: 2
   - uid: 14122
     components:
@@ -8783,6 +9365,34 @@ entities:
         1200:
         - - DoorStatus
           - DoorBolt
+- proto: AirlockExternalCommandLocked
+  entities:
+  - uid: 797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-41.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15197:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-49.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15198:
+        - - DoorStatus
+          - DoorBolt
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 5774
@@ -8826,24 +9436,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,-62.5
       parent: 2
-  - uid: 11938
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-64.5
-      parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        18769:
+        6008:
         - - DoorStatus
           - DoorBolt
-  - uid: 14294
-    components:
-    - type: Transform
-      pos: 31.5,-60.5
-      parent: 2
   - uid: 18769
     components:
     - type: Transform
@@ -8854,7 +9453,7 @@ entities:
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        11938:
+        5673:
         - - DoorStatus
           - DoorBolt
 - proto: AirlockExternalGlassCargoLocked
@@ -8996,6 +9595,34 @@ entities:
         18352:
         - - DoorStatus
           - InputB
+- proto: AirlockExternalGlassCommandLocked
+  entities:
+  - uid: 15197
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-41.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        797:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 15198
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-49.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        799:
+        - - DoorStatus
+          - DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 5745
@@ -9075,6 +9702,30 @@ entities:
         201:
         - - DoorStatus
           - DoorBolt
+  - uid: 5673
+    components:
+    - type: Transform
+      pos: 53.5,-64.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        18769:
+        - - DoorStatus
+          - DoorBolt
+  - uid: 6008
+    components:
+    - type: Transform
+      pos: 31.5,-60.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4443:
+        - - DoorStatus
+          - DoorBolt
   - uid: 6303
     components:
     - type: Transform
@@ -9125,18 +9776,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-7.5
       parent: 2
-  - uid: 7770
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-9.5
-      parent: 2
-  - uid: 18401
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-9.5
-      parent: 2
 - proto: AirlockExternalGlassShuttleEscape
   entities:
   - uid: 1106
@@ -9163,6 +9802,18 @@ entities:
       parent: 2
 - proto: AirlockExternalGlassShuttleLocked
   entities:
+  - uid: 616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-9.5
+      parent: 2
+  - uid: 738
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-9.5
+      parent: 2
   - uid: 6945
     components:
     - type: Transform
@@ -9173,48 +9824,6 @@ entities:
     - type: Transform
       pos: 27.5,-102.5
       parent: 2
-- proto: AirlockExternalLocked
-  entities:
-  - uid: 7451
-    components:
-    - type: Transform
-      pos: 84.5,-49.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        7452:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 7452
-    components:
-    - type: Transform
-      pos: 86.5,-49.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        7451:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 7453
-    components:
-    - type: Transform
-      pos: 84.5,-41.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        7454:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 7454
-    components:
-    - type: Transform
-      pos: 86.5,-41.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        7453:
-        - - DoorStatus
-          - DoorBolt
 - proto: AirlockExternalShuttleLocked
   entities:
   - uid: 6871
@@ -9229,15 +9838,17 @@ entities:
       parent: 2
 - proto: AirlockFreezerLocked
   entities:
-  - uid: 4273
+  - uid: 800
     components:
     - type: Transform
-      pos: 45.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-39.5
       parent: 2
-  - uid: 4274
+  - uid: 3473
     components:
     - type: Transform
-      pos: 47.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-37.5
       parent: 2
 - proto: AirlockGlass
   entities:
@@ -9307,11 +9918,21 @@ entities:
     - type: Transform
       pos: 6.5,-35.5
       parent: 2
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 2
   - uid: 923
     components:
     - type: Transform
       pos: -27.5,-40.5
       parent: 2
+  - uid: 924
+    components:
+    - type: Transform
+      pos: 33.5,-24.5
+      parent: 2
   - uid: 926
     components:
     - type: Transform
@@ -9637,11 +10258,29 @@ entities:
     - type: Transform
       pos: 23.5,-38.5
       parent: 2
+  - uid: 5417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-16.5
+      parent: 2
+  - uid: 5835
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-16.5
+      parent: 2
   - uid: 5887
     components:
     - type: Transform
       pos: 24.5,-38.5
       parent: 2
+  - uid: 6140
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-16.5
+      parent: 2
   - uid: 7112
     components:
     - type: Transform
@@ -9657,6 +10296,37 @@ entities:
     - type: Transform
       pos: 15.5,-13.5
       parent: 2
+  - uid: 8682
+    components:
+    - type: Transform
+      pos: 33.5,-22.5
+      parent: 2
+  - uid: 8774
+    components:
+    - type: Transform
+      pos: 31.5,-21.5
+      parent: 2
+  - uid: 8994
+    components:
+    - type: Transform
+      pos: 28.5,-18.5
+      parent: 2
+  - uid: 9259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-28.5
+      parent: 2
+  - uid: 9291
+    components:
+    - type: Transform
+      pos: 30.5,-21.5
+      parent: 2
+  - uid: 9417
+    components:
+    - type: Transform
+      pos: 28.5,-19.5
+      parent: 2
   - uid: 10733
     components:
     - type: Transform
@@ -9689,6 +10359,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-59.5
       parent: 2
+  - uid: 19843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-28.5
+      parent: 2
+  - uid: 19844
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-28.5
+      parent: 2
 - proto: AirlockHeadOfPersonnelLocked
   entities:
   - uid: 1491
@@ -9708,10 +10390,11 @@ entities:
       parent: 2
 - proto: AirlockHeadOfSecurityGlassLocked
   entities:
-  - uid: 17245
+  - uid: 4099
     components:
     - type: Transform
-      pos: 66.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-49.5
       parent: 2
 - proto: AirlockHydroGlassLocked
   entities:
@@ -9825,11 +10508,19 @@ entities:
       parent: 2
 - proto: AirlockMaintKitchenLocked
   entities:
-  - uid: 2279
+  - uid: 4713
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 41.5,-48.5
       parent: 2
+- proto: AirlockMaintLawyerLocked
+  entities:
+  - uid: 9615
+    components:
+    - type: Transform
+      pos: 57.5,-57.5
+      parent: 2
 - proto: AirlockMaintLocked
   entities:
   - uid: 156
@@ -9847,23 +10538,37 @@ entities:
     - type: Transform
       pos: 81.5,-21.5
       parent: 2
-  - uid: 4609
+  - uid: 9899
     components:
     - type: Transform
-      pos: 79.5,-30.5
+      pos: 80.5,-27.5
       parent: 2
 - proto: AirlockMaintMedLocked
   entities:
-  - uid: 295
-    components:
-    - type: Transform
-      pos: 28.5,-30.5
-      parent: 2
   - uid: 3673
     components:
     - type: Transform
       pos: 3.5,-21.5
       parent: 2
+  - uid: 4147
+    components:
+    - type: Transform
+      pos: 28.5,-31.5
+      parent: 2
+- proto: AirlockMaintSecLocked
+  entities:
+  - uid: 601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-44.5
+      parent: 2
+  - uid: 714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-39.5
+      parent: 2
 - proto: AirlockMaintServiceLocked
   entities:
   - uid: 689
@@ -9871,16 +10576,6 @@ entities:
     - type: Transform
       pos: -34.5,-24.5
       parent: 2
-  - uid: 1711
-    components:
-    - type: Transform
-      pos: 44.5,-49.5
-      parent: 2
-  - uid: 1803
-    components:
-    - type: Transform
-      pos: 42.5,-51.5
-      parent: 2
 - proto: AirlockMedicalGlassLocked
   entities:
   - uid: 357
@@ -9906,7 +10601,7 @@ entities:
       pos: 11.5,-30.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -95458.39
+      secondsUntilStateChange: -221892.55
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -9916,16 +10611,16 @@ entities:
     - type: Transform
       pos: 18.5,-26.5
       parent: 2
-  - uid: 5213
+  - uid: 3059
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 1.5707963267948966 rad
       pos: 16.5,-24.5
       parent: 2
-  - uid: 5214
+  - uid: 3062
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 1.5707963267948966 rad
       pos: 16.5,-23.5
       parent: 2
   - uid: 6253
@@ -9936,42 +10631,34 @@ entities:
       parent: 2
 - proto: AirlockMedicalLocked
   entities:
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 26.5,-23.5
-      parent: 2
-  - uid: 237
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 2
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 22.5,-23.5
-      parent: 2
-  - uid: 284
-    components:
-    - type: Transform
-      pos: 22.5,-22.5
-      parent: 2
   - uid: 286
     components:
     - type: Transform
       pos: -5.5,0.5
       parent: 2
+  - uid: 2388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-23.5
+      parent: 2
+  - uid: 7795
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-22.5
+      parent: 2
 - proto: AirlockMedicalMorgueLocked
   entities:
-  - uid: 296
+  - uid: 3714
     components:
     - type: Transform
-      pos: 28.5,-24.5
+      pos: 28.5,-25.5
       parent: 2
-  - uid: 297
+  - uid: 9409
     components:
     - type: Transform
-      pos: 32.5,-22.5
+      pos: 29.5,-25.5
       parent: 2
 - proto: AirlockQuartermasterGlassLocked
   entities:
@@ -10078,18 +10765,6 @@ entities:
     - type: Transform
       pos: -26.5,-26.5
       parent: 2
-- proto: AirlockSecurityGlass
-  entities:
-  - uid: 3032
-    components:
-    - type: Transform
-      pos: 66.5,-33.5
-      parent: 2
-  - uid: 15136
-    components:
-    - type: Transform
-      pos: 66.5,-32.5
-      parent: 2
 - proto: AirlockSecurityGlassLocked
   entities:
   - uid: 1881
@@ -10097,21 +10772,21 @@ entities:
     - type: Transform
       pos: 63.5,-30.5
       parent: 2
+  - uid: 2725
+    components:
+    - type: Transform
+      pos: 67.5,-39.5
+      parent: 2
+  - uid: 3033
+    components:
+    - type: Transform
+      pos: 67.5,-40.5
+      parent: 2
   - uid: 3102
     components:
     - type: Transform
       pos: 64.5,-30.5
       parent: 2
-  - uid: 4176
-    components:
-    - type: Transform
-      pos: 61.5,-37.5
-      parent: 2
-  - uid: 5386
-    components:
-    - type: Transform
-      pos: 61.5,-38.5
-      parent: 2
   - uid: 7190
     components:
     - type: Transform
@@ -10124,10 +10799,10 @@ entities:
       parent: 2
 - proto: AirlockSecurityLawyerLocked
   entities:
-  - uid: 7301
+  - uid: 7238
     components:
     - type: Transform
-      pos: 69.5,-42.5
+      pos: 52.5,-35.5
       parent: 2
 - proto: AirlockSecurityLocked
   entities:
@@ -10151,26 +10826,21 @@ entities:
     - type: Transform
       pos: 57.5,-19.5
       parent: 2
-  - uid: 4612
+  - uid: 3023
     components:
     - type: Transform
-      pos: 59.5,-33.5
+      pos: 71.5,-43.5
+      parent: 2
+  - uid: 3541
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
       parent: 2
   - uid: 6267
     components:
     - type: Transform
       pos: 61.5,-29.5
       parent: 2
-  - uid: 8651
-    components:
-    - type: Transform
-      pos: 66.5,-38.5
-      parent: 2
-  - uid: 8691
-    components:
-    - type: Transform
-      pos: 58.5,-33.5
-      parent: 2
 - proto: AirlockServiceGlassLocked
   entities:
   - uid: 3529
@@ -10232,15 +10902,22 @@ entities:
       parent: 2
 - proto: AirlockVirologyGlassLocked
   entities:
-  - uid: 7767
+  - uid: 7953
     components:
     - type: Transform
-      pos: 29.5,-17.5
+      pos: 31.5,-13.5
       parent: 2
-  - uid: 7769
+  - uid: 8785
     components:
     - type: Transform
-      pos: 30.5,-13.5
+      pos: 31.5,-16.5
+      parent: 2
+- proto: AirlockVirologyLocked
+  entities:
+  - uid: 7807
+    components:
+    - type: Transform
+      pos: 35.5,-16.5
       parent: 2
 - proto: AirlockXeno
   entities:
@@ -10259,10 +10936,10 @@ entities:
     - type: Transform
       pos: -46.5,-66.5
       parent: 2
-  - uid: 173
+  - uid: 7453
     components:
     - type: Transform
-      pos: -40.5,-63.5
+      pos: -41.5,-63.5
       parent: 2
 - proto: AirlockXenoMaintLocked
   entities:
@@ -10276,16 +10953,16 @@ entities:
     - type: Transform
       pos: -15.5,-45.5
       parent: 2
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -39.5,-78.5
-      parent: 2
   - uid: 321
     components:
     - type: Transform
       pos: -44.5,-77.5
       parent: 2
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 64.5,-62.5
+      parent: 2
   - uid: 360
     components:
     - type: Transform
@@ -10321,11 +10998,6 @@ entities:
     - type: Transform
       pos: -11.5,-45.5
       parent: 2
-  - uid: 601
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
   - uid: 602
     components:
     - type: Transform
@@ -10336,11 +11008,6 @@ entities:
     - type: Transform
       pos: -8.5,-60.5
       parent: 2
-  - uid: 616
-    components:
-    - type: Transform
-      pos: -12.5,-56.5
-      parent: 2
   - uid: 617
     components:
     - type: Transform
@@ -10381,11 +11048,6 @@ entities:
     - type: Transform
       pos: -34.5,-68.5
       parent: 2
-  - uid: 730
-    components:
-    - type: Transform
-      pos: -37.5,-76.5
-      parent: 2
   - uid: 732
     components:
     - type: Transform
@@ -10401,10 +11063,11 @@ entities:
     - type: Transform
       pos: 6.5,-68.5
       parent: 2
-  - uid: 738
+  - uid: 739
     components:
     - type: Transform
-      pos: 6.5,-72.5
+      rot: 3.141592653589793 rad
+      pos: 42.5,-51.5
       parent: 2
   - uid: 742
     components:
@@ -10416,61 +11079,6 @@ entities:
     - type: Transform
       pos: 37.5,-80.5
       parent: 2
-  - uid: 746
-    components:
-    - type: Transform
-      pos: 38.5,-77.5
-      parent: 2
-  - uid: 751
-    components:
-    - type: Transform
-      pos: 73.5,-68.5
-      parent: 2
-  - uid: 753
-    components:
-    - type: Transform
-      pos: 71.5,-66.5
-      parent: 2
-  - uid: 792
-    components:
-    - type: Transform
-      pos: 74.5,-60.5
-      parent: 2
-  - uid: 793
-    components:
-    - type: Transform
-      pos: 77.5,-57.5
-      parent: 2
-  - uid: 798
-    components:
-    - type: Transform
-      pos: 34.5,-19.5
-      parent: 2
-  - uid: 799
-    components:
-    - type: Transform
-      pos: 52.5,-43.5
-      parent: 2
-  - uid: 800
-    components:
-    - type: Transform
-      pos: 52.5,-45.5
-      parent: 2
-  - uid: 801
-    components:
-    - type: Transform
-      pos: 51.5,-45.5
-      parent: 2
-  - uid: 806
-    components:
-    - type: Transform
-      pos: 51.5,-43.5
-      parent: 2
-  - uid: 810
-    components:
-    - type: Transform
-      pos: 50.5,-39.5
-      parent: 2
   - uid: 812
     components:
     - type: Transform
@@ -10481,6 +11089,11 @@ entities:
     - type: Transform
       pos: 72.5,-23.5
       parent: 2
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 55.5,-46.5
+      parent: 2
   - uid: 879
     components:
     - type: Transform
@@ -10511,11 +11124,6 @@ entities:
     - type: Transform
       pos: -35.5,-68.5
       parent: 2
-  - uid: 896
-    components:
-    - type: Transform
-      pos: 38.5,-34.5
-      parent: 2
   - uid: 897
     components:
     - type: Transform
@@ -10526,11 +11134,6 @@ entities:
     - type: Transform
       pos: -30.5,-17.5
       parent: 2
-  - uid: 901
-    components:
-    - type: Transform
-      pos: 38.5,-30.5
-      parent: 2
   - uid: 922
     components:
     - type: Transform
@@ -10542,51 +11145,159 @@ entities:
       rot: 3.141592653589793 rad
       pos: -34.5,-17.5
       parent: 2
-  - uid: 1815
+  - uid: 3144
     components:
     - type: Transform
-      pos: 44.5,-24.5
+      pos: 57.5,-75.5
       parent: 2
-  - uid: 3361
+  - uid: 3160
     components:
     - type: Transform
-      pos: 57.5,-70.5
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-33.5
       parent: 2
-  - uid: 3818
+  - uid: 3552
     components:
     - type: Transform
-      pos: 44.5,-27.5
+      pos: 53.5,-51.5
       parent: 2
-  - uid: 4077
+  - uid: 3685
     components:
     - type: Transform
-      pos: 74.5,-42.5
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-32.5
       parent: 2
-  - uid: 7214
+  - uid: 3687
     components:
     - type: Transform
-      pos: 59.5,-64.5
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-33.5
+      parent: 2
+  - uid: 3934
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 76.5,-40.5
+      parent: 2
+  - uid: 5485
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-74.5
+      parent: 2
+  - uid: 5892
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-32.5
+      parent: 2
+  - uid: 6360
+    components:
+    - type: Transform
+      pos: 67.5,-70.5
+      parent: 2
+  - uid: 7261
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-25.5
       parent: 2
   - uid: 7297
     components:
     - type: Transform
       pos: 44.5,-76.5
       parent: 2
-  - uid: 10244
+  - uid: 7570
     components:
     - type: Transform
-      pos: 65.5,-53.5
+      pos: 60.5,-64.5
+      parent: 2
+  - uid: 8141
+    components:
+    - type: Transform
+      pos: 74.5,-59.5
+      parent: 2
+  - uid: 8420
+    components:
+    - type: Transform
+      pos: 38.5,-34.5
+      parent: 2
+  - uid: 8421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-47.5
+      parent: 2
+  - uid: 8620
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-25.5
+      parent: 2
+  - uid: 9251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-49.5
+      parent: 2
+  - uid: 9371
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-19.5
+      parent: 2
+  - uid: 9887
+    components:
+    - type: Transform
+      pos: 60.5,-58.5
+      parent: 2
+  - uid: 9888
+    components:
+    - type: Transform
+      pos: 63.5,-56.5
+      parent: 2
+  - uid: 10303
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-64.5
+      parent: 2
+  - uid: 10742
+    components:
+    - type: Transform
+      pos: 3.5,-59.5
+      parent: 2
+  - uid: 10786
+    components:
+    - type: Transform
+      pos: 5.5,-59.5
+      parent: 2
+  - uid: 10805
+    components:
+    - type: Transform
+      pos: 51.5,-42.5
+      parent: 2
+  - uid: 11902
+    components:
+    - type: Transform
+      pos: 77.5,-55.5
+      parent: 2
+  - uid: 12409
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-56.5
+      parent: 2
+  - uid: 12960
+    components:
+    - type: Transform
+      pos: 43.5,-28.5
       parent: 2
   - uid: 13804
     components:
     - type: Transform
       pos: 61.5,-24.5
       parent: 2
-  - uid: 13807
-    components:
-    - type: Transform
-      pos: 46.5,-50.5
-      parent: 2
   - uid: 13811
     components:
     - type: Transform
@@ -10602,15 +11313,30 @@ entities:
     - type: Transform
       pos: 75.5,-24.5
       parent: 2
+  - uid: 14237
+    components:
+    - type: Transform
+      pos: 57.5,-66.5
+      parent: 2
+  - uid: 14303
+    components:
+    - type: Transform
+      pos: 65.5,-65.5
+      parent: 2
   - uid: 14396
     components:
     - type: Transform
       pos: 52.5,-76.5
       parent: 2
-  - uid: 15174
+  - uid: 15470
     components:
     - type: Transform
-      pos: 49.5,-31.5
+      pos: 5.5,-72.5
+      parent: 2
+  - uid: 16387
+    components:
+    - type: Transform
+      pos: 37.5,-77.5
       parent: 2
   - uid: 18040
     components:
@@ -10629,19 +11355,14 @@ entities:
       parent: 2
 - proto: AirSensor
   entities:
-  - uid: 579
-    components:
-    - type: Transform
-      pos: 49.5,-97.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14759
   - uid: 1800
     components:
     - type: Transform
       pos: 40.5,-40.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9241
   - uid: 2195
     components:
     - type: Transform
@@ -10650,6 +11371,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9243
+  - uid: 3081
+    components:
+    - type: Transform
+      pos: 52.5,-69.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7310
   - uid: 3440
     components:
     - type: Transform
@@ -10658,6 +11387,22 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9403
+  - uid: 3747
+    components:
+    - type: Transform
+      pos: 86.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 6423
+    components:
+    - type: Transform
+      pos: 35.5,-29.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7582
   - uid: 6602
     components:
     - type: Transform
@@ -10679,9 +11424,6 @@ entities:
     - type: Transform
       pos: -1.5,-69.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
   - uid: 6615
     components:
     - type: Transform
@@ -10698,14 +11440,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9240
-  - uid: 7103
-    components:
-    - type: Transform
-      pos: 67.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
   - uid: 7956
     components:
     - type: Transform
@@ -10751,6 +11485,9 @@ entities:
     - type: Transform
       pos: -64.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9262
   - uid: 8643
     components:
     - type: Transform
@@ -10799,19 +11536,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 6406
-  - uid: 8685
-    components:
-    - type: Transform
-      pos: 34.5,-25.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6353
   - uid: 8712
     components:
     - type: Transform
       pos: 9.5,-16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14636
   - uid: 8715
     components:
     - type: Transform
@@ -10841,6 +11573,9 @@ entities:
     - type: Transform
       pos: -21.5,-50.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6407
   - uid: 8722
     components:
     - type: Transform
@@ -10880,23 +11615,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6358
-  - uid: 8743
-    components:
-    - type: Transform
-      pos: -36.5,-43.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9190
-  - uid: 8744
-    components:
-    - type: Transform
-      pos: -9.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 5526
+      - 19876
   - uid: 8745
     components:
     - type: Transform
@@ -10904,16 +11623,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6418
       - 3424
-  - uid: 8746
-    components:
-    - type: Transform
-      pos: 74.5,-64.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6360
   - uid: 8752
     components:
     - type: Transform
@@ -10935,6 +11645,9 @@ entities:
     - type: Transform
       pos: 4.5,-53.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9216
   - uid: 8760
     components:
     - type: Transform
@@ -10972,14 +11685,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18818
-  - uid: 8779
-    components:
-    - type: Transform
-      pos: 29.5,-15.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
   - uid: 8791
     components:
     - type: Transform
@@ -10996,14 +11701,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 19200
-  - uid: 8797
-    components:
-    - type: Transform
-      pos: 29.5,-19.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
   - uid: 8814
     components:
     - type: Transform
@@ -11022,9 +11719,6 @@ entities:
     - type: Transform
       pos: 2.5,-32.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8767
   - uid: 9606
     components:
     - type: Transform
@@ -11033,14 +11727,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14458
-  - uid: 9643
-    components:
-    - type: Transform
-      pos: 24.5,-19.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18598
   - uid: 9647
     components:
     - type: Transform
@@ -11057,14 +11743,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 469
-  - uid: 9822
-    components:
-    - type: Transform
-      pos: 24.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
   - uid: 10030
     components:
     - type: Transform
@@ -11078,6 +11756,9 @@ entities:
     - type: Transform
       pos: 7.5,-20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19836
   - uid: 10154
     components:
     - type: Transform
@@ -11102,6 +11783,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9195
+  - uid: 15526
+    components:
+    - type: Transform
+      pos: 24.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16367
   - uid: 15636
     components:
     - type: Transform
@@ -11109,7 +11798,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18598
+      - 10761
   - uid: 15637
     components:
     - type: Transform
@@ -11148,22 +11837,40 @@ entities:
     - type: Transform
       pos: -20.5,-47.5
       parent: 2
-  - uid: 18061
+  - uid: 17995
     components:
     - type: Transform
-      pos: 57.5,-23.5
+      pos: 61.5,-42.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18874
+      - 16312
+  - uid: 17996
+    components:
+    - type: Transform
+      pos: 70.5,-44.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16356
+  - uid: 17997
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16354
+  - uid: 17998
+    components:
+    - type: Transform
+      pos: 64.5,-32.5
+      parent: 2
   - uid: 18546
     components:
     - type: Transform
       pos: 13.5,-24.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14642
   - uid: 18547
     components:
     - type: Transform
@@ -11185,19 +11892,22 @@ entities:
     - type: Transform
       pos: -33.5,-11.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9198
   - uid: 18793
     components:
     - type: Transform
       pos: -28.5,-17.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15885
   - uid: 18794
     components:
     - type: Transform
       pos: -22.5,-12.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15885
   - uid: 18799
     components:
     - type: Transform
@@ -11237,7 +11947,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9243
+      - 19880
   - uid: 18812
     components:
     - type: Transform
@@ -11246,14 +11956,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 572
-  - uid: 18827
-    components:
-    - type: Transform
-      pos: 34.5,-21.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18873
   - uid: 18828
     components:
     - type: Transform
@@ -11261,15 +11963,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18873
-  - uid: 18834
-    components:
-    - type: Transform
-      pos: 82.5,-45.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
+      - 19856
   - uid: 18841
     components:
     - type: Transform
@@ -11318,23 +12012,85 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 364
-  - uid: 19289
+  - uid: 19813
     components:
     - type: Transform
-      pos: 51.5,-67.5
+      pos: -36.5,-40.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7310
-- proto: AltarConvertMaint
-  entities:
-  - uid: 8374
+      - 9190
+  - uid: 19814
     components:
     - type: Transform
-      pos: -41.5,-76.5
+      pos: -36.5,-50.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9190
+  - uid: 19819
+    components:
+    - type: Transform
+      pos: -10.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5526
+  - uid: 19870
+    components:
+    - type: Transform
+      pos: 54.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 19872
+    components:
+    - type: Transform
+      pos: 61.5,-17.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18818
+  - uid: 19899
+    components:
+    - type: Transform
+      pos: 9.5,-78.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9239
+  - uid: 19923
+    components:
+    - type: Transform
+      pos: 58.5,-71.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19922
+  - uid: 19924
+    components:
+    - type: Transform
+      pos: 50.5,-101.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14759
+- proto: AltarConvertMaint
+  entities:
+  - uid: 17343
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,-77.5
       parent: 2
 - proto: AltarSpawner
   entities:
+  - uid: 16230
+    components:
+    - type: Transform
+      pos: -19.5,-47.5
+      parent: 2
   - uid: 18768
     components:
     - type: Transform
@@ -11347,6 +12103,13 @@ entities:
     - type: Transform
       pos: -10.5,-35.5
       parent: 2
+- proto: AnalysisComputerCircuitboard
+  entities:
+  - uid: 17120
+    components:
+    - type: Transform
+      pos: -40.61705,-80.25643
+      parent: 2
 - proto: AnomalyScanner
   entities:
   - uid: 8653
@@ -11376,6 +12139,22 @@ entities:
       parent: 2
 - proto: APCBasic
   entities:
+  - uid: 295
+    components:
+    - type: MetaData
+      name: Virology APC
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-19.5
+      parent: 2
+  - uid: 474
+    components:
+    - type: MetaData
+      name: Morgue APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-26.5
+      parent: 2
   - uid: 3106
     components:
     - type: MetaData
@@ -11384,28 +12163,36 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,-16.5
       parent: 2
-  - uid: 3653
+  - uid: 3338
     components:
     - type: MetaData
       name: Disposals APC
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 57.5,-68.5
+      pos: 72.5,-62.5
       parent: 2
-  - uid: 4999
+  - uid: 3733
     components:
     - type: MetaData
-      name: Security Outpost APC
+      name: D.I.Y. Bar APC
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-51.5
+      rot: 3.141592653589793 rad
+      pos: 58.5,-66.5
       parent: 2
-  - uid: 5615
+  - uid: 4618
     components:
     - type: MetaData
-      name: Detective's Office APC
+      name: Security Main APC
     - type: Transform
-      pos: 67.5,-49.5
+      pos: 54.5,-31.5
+      parent: 2
+  - uid: 4912
+    components:
+    - type: MetaData
+      name: Warden's Office APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-37.5
       parent: 2
   - uid: 5884
     components:
@@ -11415,14 +12202,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-22.5
       parent: 2
-  - uid: 6626
-    components:
-    - type: MetaData
-      name: Atmos Hall APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 42.5,-74.5
-      parent: 2
   - uid: 7248
     components:
     - type: MetaData
@@ -11431,22 +12210,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -50.5,-42.5
       parent: 2
-  - uid: 7302
-    components:
-    - type: MetaData
-      name: AI Upload APC
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 75.5,-44.5
-      parent: 2
-  - uid: 7963
-    components:
-    - type: MetaData
-      name: Armory APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-56.5
-      parent: 2
   - uid: 8197
     components:
     - type: MetaData
@@ -11455,35 +12218,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-66.5
       parent: 2
-  - uid: 9341
+  - uid: 9264
     components:
     - type: MetaData
-      name: Genpop Lockers APC
+      name: Atmos Hall APC
     - type: Transform
-      pos: 65.5,-30.5
+      rot: 3.141592653589793 rad
+      pos: 38.5,-72.5
       parent: 2
-  - uid: 10250
+  - uid: 9317
     components:
     - type: MetaData
-      name: Warden's Office APC
+      name: AI Upload APC
     - type: Transform
-      pos: 60.5,-40.5
-      parent: 2
-  - uid: 10276
-    components:
-    - type: MetaData
-      name: HoS' Office APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 72.5,-46.5
-      parent: 2
-  - uid: 10284
-    components:
-    - type: MetaData
-      name: Security APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-39.5
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-44.5
       parent: 2
   - uid: 10475
     components:
@@ -11592,14 +12341,6 @@ entities:
     - type: Transform
       pos: 43.5,-39.5
       parent: 2
-  - uid: 10503
-    components:
-    - type: MetaData
-      name: Virology / Morgue APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-24.5
-      parent: 2
   - uid: 10504
     components:
     - type: MetaData
@@ -11639,26 +12380,11 @@ entities:
   - uid: 10512
     components:
     - type: MetaData
-      name: Maints shop APC
+      name: Maints Shop APC
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 72.5,-20.5
       parent: 2
-  - uid: 10515
-    components:
-    - type: MetaData
-      name: Maints Bar APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 73.5,-66.5
-      parent: 2
-  - uid: 10516
-    components:
-    - type: MetaData
-      name: AI Core APC
-    - type: Transform
-      pos: 93.5,-46.5
-      parent: 2
   - uid: 10518
     components:
     - type: MetaData
@@ -11681,6 +12407,13 @@ entities:
     - type: Transform
       pos: -6.5,-76.5
       parent: 2
+  - uid: 10838
+    components:
+    - type: MetaData
+      name: AI Core APC
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
   - uid: 10918
     components:
     - type: MetaData
@@ -11726,6 +12459,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-22.5
       parent: 2
+  - uid: 11637
+    components:
+    - type: MetaData
+      name: Genpop Lockers APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-30.5
+      parent: 2
+  - uid: 11638
+    components:
+    - type: MetaData
+      name: Security Offices APC
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-48.5
+      parent: 2
+  - uid: 11956
+    components:
+    - type: MetaData
+      name: Security Outpost APC
+    - type: Transform
+      pos: 9.5,-46.5
+      parent: 2
   - uid: 12036
     components:
     - type: MetaData
@@ -11749,14 +12505,6 @@ entities:
     - type: Transform
       pos: 28.5,-59.5
       parent: 2
-  - uid: 12929
-    components:
-    - type: MetaData
-      name: Bar Maints APC
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-34.5
-      parent: 2
   - uid: 13030
     components:
     - type: MetaData
@@ -11765,6 +12513,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-18.5
       parent: 2
+  - uid: 13649
+    components:
+    - type: MetaData
+      name: Armory APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-48.5
+      parent: 2
+  - uid: 13857
+    components:
+    - type: MetaData
+      name: Security Hallway APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-45.5
+      parent: 2
   - uid: 13911
     components:
     - type: MetaData
@@ -11798,7 +12562,7 @@ entities:
   - uid: 17057
     components:
     - type: MetaData
-      name: Law APC
+      name: Lawyer's Office APC
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 50.5,-57.5
@@ -11849,6 +12613,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,-17.5
       parent: 2
+  - uid: 19925
+    components:
+    - type: MetaData
+      name: Visitor Docks APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-15.5
+      parent: 2
 - proto: APCHighCapacity
   entities:
   - uid: 1126
@@ -11870,18 +12642,28 @@ entities:
   - uid: 5641
     components:
     - type: Transform
-      pos: -22.45828,-51.977993
+      pos: -22.370735,-51.96643
       parent: 2
 - proto: ArrivalsShuttleTimer
   entities:
-  - uid: 17991
+  - uid: 16146
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,3.5
+      pos: -1.5,-0.5
+      parent: 2
+  - uid: 19445
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,3.5
       parent: 2
 - proto: ArtifactAnalyzerMachineCircuitboard
   entities:
+  - uid: 1801
+    components:
+    - type: Transform
+      pos: -40.408714,-80.51703
+      parent: 2
   - uid: 8509
     components:
     - type: Transform
@@ -11892,15 +12674,10 @@ entities:
   - uid: 18616
     components:
     - type: Transform
-      pos: 76.62189,-43.345737
+      pos: 78.645355,-43.3176
       parent: 2
 - proto: Ashtray
   entities:
-  - uid: 3020
-    components:
-    - type: Transform
-      pos: 49.633816,-49.261665
-      parent: 2
   - uid: 15122
     components:
     - type: Transform
@@ -11916,15 +12693,26 @@ entities:
     - type: Transform
       pos: 29.930677,-44.420216
       parent: 2
+  - uid: 19661
+    components:
+    - type: Transform
+      pos: -48.02379,-45.496872
+      parent: 2
 - proto: AsimovCircuitBoard
   entities:
   - uid: 18617
     components:
     - type: Transform
-      pos: 78.0073,-43.64803
+      pos: 80.05838,-43.49481
       parent: 2
 - proto: AtmosDeviceFanDirectional
   entities:
+  - uid: 753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-37.5
+      parent: 2
   - uid: 910
     components:
     - type: Transform
@@ -12008,17 +12796,11 @@ entities:
     - type: Transform
       pos: 52.5,-104.5
       parent: 2
-  - uid: 6261
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-43.5
-      parent: 2
-  - uid: 7286
+  - uid: 12886
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 47.5,-46.5
+      pos: 42.5,-39.5
       parent: 2
   - uid: 18062
     components:
@@ -12142,95 +12924,100 @@ entities:
       parent: 2
 - proto: AtmosFixFreezerMarker
   entities:
-  - uid: 8348
+  - uid: 2269
     components:
     - type: Transform
-      pos: 47.5,-42.5
+      pos: 40.5,-36.5
       parent: 2
-  - uid: 16342
+  - uid: 2320
     components:
     - type: Transform
-      pos: 46.5,-42.5
+      pos: 40.5,-38.5
       parent: 2
-  - uid: 16343
+  - uid: 3379
     components:
     - type: Transform
-      pos: 47.5,-43.5
+      pos: 40.5,-37.5
       parent: 2
-  - uid: 16353
+  - uid: 3500
     components:
     - type: Transform
-      pos: 46.5,-43.5
+      pos: 43.5,-36.5
       parent: 2
-  - uid: 16354
+  - uid: 3501
     components:
     - type: Transform
-      pos: 46.5,-44.5
+      pos: 42.5,-36.5
       parent: 2
-  - uid: 16355
+  - uid: 3555
     components:
     - type: Transform
-      pos: 46.5,-45.5
+      pos: 44.5,-36.5
       parent: 2
-  - uid: 16356
+  - uid: 3556
     components:
     - type: Transform
-      pos: 47.5,-45.5
+      pos: 44.5,-37.5
       parent: 2
-  - uid: 16357
+  - uid: 3606
     components:
     - type: Transform
-      pos: 47.5,-44.5
+      pos: 45.5,-36.5
       parent: 2
-  - uid: 16358
+  - uid: 3935
     components:
     - type: Transform
-      pos: 48.5,-44.5
+      pos: 44.5,-38.5
       parent: 2
-  - uid: 16359
+  - uid: 3963
     components:
     - type: Transform
-      pos: 48.5,-45.5
+      pos: 43.5,-38.5
       parent: 2
-  - uid: 16360
+  - uid: 4047
     components:
     - type: Transform
-      pos: 48.5,-43.5
+      pos: 42.5,-37.5
       parent: 2
-  - uid: 16361
+  - uid: 4077
     components:
     - type: Transform
-      pos: 48.5,-42.5
+      pos: 42.5,-38.5
       parent: 2
-  - uid: 16362
+  - uid: 4636
     components:
     - type: Transform
-      pos: 48.5,-41.5
+      pos: 41.5,-38.5
       parent: 2
-  - uid: 16363
+  - uid: 4637
     components:
     - type: Transform
-      pos: 47.5,-41.5
+      pos: 43.5,-37.5
       parent: 2
-  - uid: 16365
+  - uid: 4864
     components:
     - type: Transform
-      pos: 46.5,-41.5
+      pos: 45.5,-38.5
       parent: 2
-  - uid: 16366
+  - uid: 4910
     components:
     - type: Transform
-      pos: 46.5,-40.5
+      pos: 45.5,-37.5
       parent: 2
-  - uid: 16367
+  - uid: 5834
     components:
     - type: Transform
-      pos: 47.5,-40.5
+      pos: 45.5,-35.5
       parent: 2
-  - uid: 16368
+  - uid: 8146
     components:
     - type: Transform
-      pos: 48.5,-40.5
+      pos: 41.5,-36.5
+      parent: 2
+  - uid: 12703
+    components:
+    - type: Transform
+      pos: 41.5,-37.5
       parent: 2
 - proto: AtmosFixNitrogenMarker
   entities:
@@ -12307,6 +13094,13 @@ entities:
     - type: Transform
       pos: -64.37506,-61.441326
       parent: 2
+- proto: BanjoInstrument
+  entities:
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -61.48744,-25.476637
+      parent: 2
 - proto: BannerCargo
   entities:
   - uid: 6762
@@ -12321,64 +13115,63 @@ entities:
       parent: 2
 - proto: BarricadeBlock
   entities:
-  - uid: 6280
+  - uid: 6277
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 79.5,-30.5
+      pos: 76.5,-40.5
+      parent: 2
+  - uid: 7590
+    components:
+    - type: Transform
+      pos: 80.5,-27.5
       parent: 2
   - uid: 11847
     components:
     - type: Transform
       pos: 75.5,-24.5
       parent: 2
-  - uid: 18263
-    components:
-    - type: Transform
-      pos: 74.5,-42.5
-      parent: 2
 - proto: BarricadeDirectional
   entities:
-  - uid: 7120
+  - uid: 7258
     components:
     - type: Transform
-      pos: 79.5,-29.5
+      pos: 80.5,-26.5
+      parent: 2
+  - uid: 7380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 76.5,-41.5
       parent: 2
   - uid: 13938
     components:
     - type: Transform
       pos: 75.5,-23.5
       parent: 2
-  - uid: 13943
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 74.5,-43.5
-      parent: 2
 - proto: BarSign
   entities:
-  - uid: 5872
-    components:
-    - type: Transform
-      pos: 72.5,-60.5
-      parent: 2
   - uid: 7070
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-41.5
       parent: 2
+  - uid: 20080
+    components:
+    - type: Transform
+      pos: 60.5,-66.5
+      parent: 2
 - proto: BaseChemistryEmptyVial
   entities:
-  - uid: 6023
+  - uid: 10854
     components:
     - type: Transform
-      pos: 37.30002,-29.200367
+      pos: 68.31389,-65.30021
       parent: 2
-  - uid: 6047
+  - uid: 11687
     components:
     - type: Transform
-      pos: 42.366875,-29.288502
+      pos: 66.68898,-62.46224
       parent: 2
   - uid: 17573
     components:
@@ -12438,36 +13231,21 @@ entities:
       parent: 2
 - proto: Beaker
   entities:
-  - uid: 3873
-    components:
-    - type: Transform
-      pos: -3.5478697,-47.418797
-      parent: 2
   - uid: 4085
     components:
     - type: Transform
       pos: 44.38433,-15.204194
       parent: 2
-  - uid: 9389
+  - uid: 10859
     components:
     - type: Transform
-      pos: 37.64377,-28.731617
+      pos: 67.048355,-62.27461
       parent: 2
   - uid: 15421
     components:
     - type: Transform
       pos: 44.564533,-15.393791
       parent: 2
-  - uid: 19022
-    components:
-    - type: Transform
-      pos: -3.5270362,-47.1165
-      parent: 2
-  - uid: 19023
-    components:
-    - type: Transform
-      pos: -3.7145362,-47.27286
-      parent: 2
 - proto: Bed
   entities:
   - uid: 354
@@ -12475,10 +13253,15 @@ entities:
     - type: Transform
       pos: 10.5,-14.5
       parent: 2
-  - uid: 811
+  - uid: 1196
     components:
     - type: Transform
-      pos: 42.5,-28.5
+      pos: 70.5,-53.5
+      parent: 2
+  - uid: 3538
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
       parent: 2
   - uid: 4721
     components:
@@ -12505,11 +13288,6 @@ entities:
     - type: Transform
       pos: -45.5,-61.5
       parent: 2
-  - uid: 5875
-    components:
-    - type: Transform
-      pos: -41.5,-61.5
-      parent: 2
   - uid: 5876
     components:
     - type: Transform
@@ -12540,31 +13318,26 @@ entities:
     - type: Transform
       pos: 32.5,-50.5
       parent: 2
-  - uid: 7084
-    components:
-    - type: Transform
-      pos: 57.5,-43.5
-      parent: 2
   - uid: 7735
     components:
     - type: Transform
       pos: -30.5,-64.5
       parent: 2
-  - uid: 7979
+  - uid: 8347
     components:
     - type: Transform
-      pos: 71.5,-47.5
+      pos: 68.5,-66.5
+      parent: 2
+  - uid: 10670
+    components:
+    - type: Transform
+      pos: 43.5,-16.5
       parent: 2
   - uid: 13893
     components:
     - type: Transform
       pos: 42.5,-17.5
       parent: 2
-  - uid: 14263
-    components:
-    - type: Transform
-      pos: 42.5,-16.5
-      parent: 2
 - proto: BedsheetBlack
   entities:
   - uid: 5669
@@ -12574,11 +13347,17 @@ entities:
       parent: 2
 - proto: BedsheetBrigmedic
   entities:
-  - uid: 19421
+  - uid: 3479
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 60.5,-31.5
+      pos: 50.5,-32.5
+      parent: 2
+  - uid: 3502
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-33.5
       parent: 2
 - proto: BedsheetCaptain
   entities:
@@ -12611,10 +13390,10 @@ entities:
       parent: 2
 - proto: BedsheetGreen
   entities:
-  - uid: 7791
+  - uid: 9357
     components:
     - type: Transform
-      pos: 31.5,-11.5
+      pos: 32.5,-11.5
       parent: 2
 - proto: BedsheetHOP
   entities:
@@ -12625,10 +13404,10 @@ entities:
       parent: 2
 - proto: BedsheetHOS
   entities:
-  - uid: 14824
+  - uid: 7105
     components:
     - type: Transform
-      pos: 71.5,-47.5
+      pos: 70.5,-53.5
       parent: 2
 - proto: BedsheetMedical
   entities:
@@ -12688,18 +13467,18 @@ entities:
       parent: 2
 - proto: BedsheetOrange
   entities:
+  - uid: 10777
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-16.5
+      parent: 2
   - uid: 14264
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 42.5,-17.5
       parent: 2
-  - uid: 14265
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-16.5
-      parent: 2
 - proto: BedsheetQM
   entities:
   - uid: 6830
@@ -12717,10 +13496,10 @@ entities:
       parent: 2
 - proto: BedsheetRed
   entities:
-  - uid: 7095
+  - uid: 7131
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      pos: 54.5,-37.5
       parent: 2
 - proto: BedsheetSpawner
   entities:
@@ -12734,11 +13513,6 @@ entities:
     - type: Transform
       pos: -45.5,-61.5
       parent: 2
-  - uid: 5889
-    components:
-    - type: Transform
-      pos: -41.5,-61.5
-      parent: 2
   - uid: 5890
     components:
     - type: Transform
@@ -12754,7 +13528,7 @@ entities:
   - uid: 18036
     components:
     - type: Transform
-      pos: 80.17493,-26.997755
+      pos: 72.49216,-25.507568
       parent: 2
 - proto: Biogenerator
   entities:
@@ -12785,43 +13559,25 @@ entities:
     - type: Transform
       pos: -15.5,-67.5
       parent: 2
-  - uid: 4366
+  - uid: 3324
     components:
     - type: Transform
-      pos: 60.5,-53.5
+      pos: 58.5,-45.5
       parent: 2
-  - uid: 4377
+  - uid: 3548
     components:
     - type: Transform
-      pos: 58.5,-53.5
+      pos: 60.5,-45.5
       parent: 2
-  - uid: 4380
+  - uid: 3867
     components:
     - type: Transform
-      pos: 61.5,-53.5
+      pos: 59.5,-45.5
       parent: 2
-  - uid: 5029
+  - uid: 4000
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-31.5
-      parent: 2
-  - uid: 5030
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-32.5
-      parent: 2
-  - uid: 5031
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-33.5
-      parent: 2
-  - uid: 13934
-    components:
-    - type: Transform
-      pos: 59.5,-53.5
+      pos: 61.5,-45.5
       parent: 2
   - uid: 18451
     components:
@@ -12830,6 +13586,12 @@ entities:
       parent: 2
 - proto: BlastDoorXeno
   entities:
+  - uid: 313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-33.5
+      parent: 2
   - uid: 487
     components:
     - type: Transform
@@ -12840,11 +13602,6 @@ entities:
     - type: Transform
       pos: 31.5,-10.5
       parent: 2
-  - uid: 625
-    components:
-    - type: Transform
-      pos: 30.5,-10.5
-      parent: 2
   - uid: 626
     components:
     - type: Transform
@@ -12900,22 +13657,150 @@ entities:
     - type: Transform
       pos: -66.5,-62.5
       parent: 2
-  - uid: 7185
+  - uid: 1341
     components:
     - type: Transform
-      pos: 59.5,-78.5
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-32.5
+      parent: 2
+  - uid: 2501
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-31.5
+      parent: 2
+  - uid: 9352
+    components:
+    - type: Transform
+      pos: 32.5,-10.5
+      parent: 2
+  - uid: 11883
+    components:
+    - type: Transform
+      pos: 72.5,-73.5
+      parent: 2
+- proto: BlastDoorXenoOpen
+  entities:
+  - uid: 14056
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-43.5
+      parent: 2
+  - uid: 16098
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-40.5
+      parent: 2
+  - uid: 19556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-39.5
+      parent: 2
+  - uid: 19557
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-39.5
+      parent: 2
+  - uid: 19558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-39.5
+      parent: 2
+  - uid: 19559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,-39.5
+      parent: 2
+  - uid: 19560
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-39.5
+      parent: 2
+  - uid: 19561
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-42.5
+      parent: 2
+  - uid: 19562
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-44.5
+      parent: 2
+  - uid: 19563
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-41.5
+      parent: 2
+  - uid: 19564
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-40.5
+      parent: 2
+  - uid: 19565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-44.5
+      parent: 2
+  - uid: 19566
+    components:
+    - type: Transform
+      pos: 18.5,-45.5
+      parent: 2
+  - uid: 19567
+    components:
+    - type: Transform
+      pos: 17.5,-45.5
+      parent: 2
+  - uid: 19568
+    components:
+    - type: Transform
+      pos: 16.5,-45.5
+      parent: 2
+  - uid: 19570
+    components:
+    - type: Transform
+      pos: 15.5,-45.5
+      parent: 2
+  - uid: 19571
+    components:
+    - type: Transform
+      pos: 19.5,-45.5
+      parent: 2
+  - uid: 19572
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-43.5
+      parent: 2
+  - uid: 19575
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-41.5
       parent: 2
 - proto: BodyBagFolded
   entities:
   - uid: 13193
     components:
     - type: Transform
-      pos: 27.248169,-28.225496
+      pos: 27.34858,-28.666481
       parent: 2
   - uid: 13206
     components:
     - type: Transform
-      pos: 27.539835,-28.350582
+      pos: 27.69233,-28.947927
       parent: 2
   - uid: 16847
     components:
@@ -12924,15 +13809,15 @@ entities:
       parent: 2
 - proto: Bola
   entities:
-  - uid: 14582
+  - uid: 16291
     components:
     - type: Transform
-      pos: 60.580673,-36.178726
+      pos: 72.450516,-40.26418
       parent: 2
-  - uid: 16109
+  - uid: 16311
     components:
     - type: Transform
-      pos: 60.719563,-36.428898
+      pos: 72.64801,-40.45181
       parent: 2
 - proto: Bonfire
   entities:
@@ -12946,7 +13831,7 @@ entities:
   - uid: 18019
     components:
     - type: Transform
-      pos: 13.442934,-58.281414
+      pos: 14.53701,-63.48177
       parent: 2
 - proto: BookIanRanch
   entities:
@@ -13073,17 +13958,16 @@ entities:
     - type: Transform
       pos: 11.5,-15.5
       parent: 2
+  - uid: 5306
+    components:
+    - type: Transform
+      pos: 60.5,-67.5
+      parent: 2
   - uid: 5493
     components:
     - type: Transform
       pos: -45.5,-52.5
       parent: 2
-  - uid: 6630
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 72.5,-52.5
-      parent: 2
   - uid: 6844
     components:
     - type: Transform
@@ -13096,11 +13980,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 36.5,-46.5
       parent: 2
-  - uid: 8083
+  - uid: 10258
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-62.5
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-48.5
       parent: 2
 - proto: BorgCharger
   entities:
@@ -13120,48 +14004,43 @@ entities:
     - type: Transform
       pos: -10.5,-23.5
       parent: 2
-  - uid: 11684
+  - uid: 14835
     components:
     - type: Transform
-      pos: 33.5,-11.5
+      pos: 93.5,-40.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 18887
+  - uid: 14836
     components:
     - type: Transform
-      pos: 91.5,-40.5
+      pos: 93.5,-50.5
       parent: 2
-  - uid: 18888
+  - uid: 17415
     components:
     - type: Transform
-      pos: 91.5,-50.5
+      pos: -40.5,-62.5
       parent: 2
-- proto: BorgModuleTool
-  entities:
-  - uid: 17951
+  - uid: 17551
     components:
     - type: Transform
-      pos: 35.857727,-13.805476
+      pos: -40.5,-61.5
+      parent: 2
+  - uid: 19481
+    components:
+    - type: Transform
+      pos: 47.5,-95.5
+      parent: 2
+  - uid: 19530
+    components:
+    - type: Transform
+      pos: 30.5,-46.5
       parent: 2
 - proto: BoxBeaker
   entities:
+  - uid: 7456
+    components:
+    - type: Transform
+      pos: -3.621653,-47.22137
+      parent: 2
   - uid: 7760
     components:
     - type: Transform
@@ -13172,7 +14051,7 @@ entities:
   - uid: 13160
     components:
     - type: Transform
-      pos: 27.352335,-27.339464
+      pos: 27.41108,-29.35446
       parent: 2
   - uid: 16848
     components:
@@ -13193,13 +14072,6 @@ entities:
       parent: 2
 - proto: BoxCartridgeCap
   entities:
-  - uid: 6029
-    components:
-    - type: Transform
-      parent: 2004
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 17387
     components:
     - type: Transform
@@ -13215,29 +14087,28 @@ entities:
   - uid: 7965
     components:
     - type: Transform
-      pos: 64.38522,-69.34135
+      pos: 69.54453,-60.30261
       parent: 2
 - proto: BoxFlashbang
   entities:
   - uid: 19251
     components:
     - type: Transform
-      pos: 60.50701,-57.15892
+      pos: 60.476963,-49.15756
       parent: 2
 - proto: BoxFolderBase
   entities:
-  - uid: 15225
+  - uid: 8079
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.64377,-29.309742
+      pos: 67.5849,-62.318325
       parent: 2
 - proto: BoxFolderBlack
   entities:
   - uid: 3522
     components:
     - type: Transform
-      pos: 53.386242,-56.416996
+      pos: 53.62837,-55.43601
       parent: 2
   - uid: 18172
     components:
@@ -13254,7 +14125,7 @@ entities:
   - uid: 6212
     components:
     - type: Transform
-      pos: 13.349184,-58.437775
+      pos: 13.349543,-58.569397
       parent: 2
   - uid: 18168
     components:
@@ -13269,7 +14140,7 @@ entities:
   - uid: 18182
     components:
     - type: Transform
-      pos: 13.424348,-58.281063
+      pos: 13.42246,-58.37134
       parent: 2
   - uid: 18184
     components:
@@ -13277,13 +14148,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.485994,-16.436533
       parent: 2
-- proto: BoxFolderGreen
-  entities:
-  - uid: 18186
+  - uid: 19656
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.48726,-17.412195
+      rot: -1.5707963267948966 rad
+      pos: -48.45786,-44.761845
       parent: 2
 - proto: BoxFolderGrey
   entities:
@@ -13304,10 +14173,10 @@ entities:
       parent: 2
 - proto: BoxFolderRed
   entities:
-  - uid: 197
+  - uid: 10268
     components:
     - type: Transform
-      pos: 69.42398,-50.73358
+      pos: 70.4067,-46.639835
       parent: 2
   - uid: 18171
     components:
@@ -13343,7 +14212,7 @@ entities:
   - uid: 5243
     components:
     - type: Transform
-      pos: 19.54645,-17.287466
+      pos: 19.714624,-17.186592
       parent: 2
   - uid: 13336
     components:
@@ -13355,25 +14224,25 @@ entities:
   - uid: 11826
     components:
     - type: Transform
-      pos: 68.74172,-31.31939
+      pos: 69.64778,-32.437996
       parent: 2
   - uid: 13945
     components:
     - type: Transform
-      pos: 68.42691,-31.195847
+      pos: 69.408195,-32.385876
       parent: 2
 - proto: BoxLightbulb
   entities:
+  - uid: 7455
+    components:
+    - type: Transform
+      pos: 1.8411034,-62.34096
+      parent: 2
   - uid: 17791
     components:
     - type: Transform
       pos: 32.59527,-78.26717
       parent: 2
-  - uid: 17793
-    components:
-    - type: Transform
-      pos: 71.517525,-59.410625
-      parent: 2
   - uid: 17795
     components:
     - type: Transform
@@ -13381,11 +14250,6 @@ entities:
       parent: 2
 - proto: BoxLightMixed
   entities:
-  - uid: 16895
-    components:
-    - type: Transform
-      pos: 53.617245,-30.419283
-      parent: 2
   - uid: 18131
     components:
     - type: Transform
@@ -13396,7 +14260,7 @@ entities:
   - uid: 17790
     components:
     - type: Transform
-      pos: 33.249847,-78.32972
+      pos: 33.139053,-78.4258
       parent: 2
   - uid: 17794
     components:
@@ -13406,7 +14270,7 @@ entities:
   - uid: 18129
     components:
     - type: Transform
-      pos: 1.4303069,-62.29623
+      pos: 2.5030346,-62.161068
       parent: 2
   - uid: 18130
     components:
@@ -13418,21 +14282,21 @@ entities:
   - uid: 19250
     components:
     - type: Transform
-      pos: 60.26743,-57.45079
+      pos: 60.372795,-49.240948
       parent: 2
 - proto: BoxMouthSwab
   entities:
-  - uid: 7787
+  - uid: 7771
     components:
     - type: Transform
-      pos: 27.498543,-16.372534
+      pos: 34.507298,-13.337973
       parent: 2
 - proto: BoxStinger
   entities:
   - uid: 19252
     components:
     - type: Transform
-      pos: 60.38201,-57.304855
+      pos: 60.572186,-49.080368
       parent: 2
 - proto: BoxSyringe
   entities:
@@ -13441,6 +14305,13 @@ entities:
     - type: Transform
       pos: 21.570786,-31.379005
       parent: 2
+- proto: BoxVial
+  entities:
+  - uid: 7789
+    components:
+    - type: Transform
+      pos: 36.569798,-12.369223
+      parent: 2
 - proto: BrbSign
   entities:
   - uid: 18161
@@ -13460,12 +14331,12 @@ entities:
   - uid: 9364
     components:
     - type: Transform
-      pos: 55.399124,-54.352894
+      pos: 55.498257,-56.247276
       parent: 2
-  - uid: 17420
+  - uid: 19673
     components:
     - type: Transform
-      pos: 46.49753,-47.4596
+      pos: -49.55333,-43.35533
       parent: 2
 - proto: Brutepack
   entities:
@@ -13501,6 +14372,21 @@ entities:
     - type: Transform
       pos: -9.07445,-47.517555
       parent: 2
+  - uid: 18259
+    components:
+    - type: Transform
+      pos: -4.05845,-56.174427
+      parent: 2
+  - uid: 19513
+    components:
+    - type: Transform
+      pos: -4.324075,-47.534866
+      parent: 2
+  - uid: 19514
+    components:
+    - type: Transform
+      pos: -4.667825,-47.378506
+      parent: 2
 - proto: ButtonFrameCaution
   entities:
   - uid: 2912
@@ -13548,18 +14434,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-100.5
       parent: 2
-  - uid: 7321
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-25.5
-      parent: 2
   - uid: 8851
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -20.5,-18.5
       parent: 2
+  - uid: 15697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-27.5
+      parent: 2
   - uid: 17653
     components:
     - type: Transform
@@ -13582,6 +14468,11 @@ entities:
     - type: Transform
       pos: 36.5,-82.5
       parent: 2
+  - uid: 19573
+    components:
+    - type: Transform
+      pos: 13.5,-41.5
+      parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 2697
@@ -13595,6 +14486,12 @@ entities:
     - type: Transform
       pos: -63.5,-60.5
       parent: 2
+  - uid: 6096
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-37.5
+      parent: 2
   - uid: 6226
     components:
     - type: Transform
@@ -13607,18 +14504,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -63.5,-30.5
       parent: 2
-  - uid: 7771
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-14.5
-      parent: 2
-  - uid: 14247
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-44.5
-      parent: 2
   - uid: 17743
     components:
     - type: Transform
@@ -13654,23 +14539,17 @@ entities:
     - type: Transform
       pos: 22.5,-90.5
       parent: 2
-  - uid: 7067
+  - uid: 7178
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 66.5,-48.5
+      pos: 65.5,-53.5
       parent: 2
-  - uid: 7320
+  - uid: 15699
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 36.5,-27.5
-      parent: 2
-  - uid: 7808
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-24.5
+      pos: 36.5,-29.5
       parent: 2
   - uid: 16618
     components:
@@ -13678,12 +14557,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-76.5
       parent: 2
-  - uid: 19186
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-24.5
-      parent: 2
 - proto: ButtonFrameJanitor
   entities:
   - uid: 5811
@@ -13698,15 +14571,15 @@ entities:
     - type: Transform
       pos: 6.5,-78.5
       parent: 2
-  - uid: 287
+  - uid: 234
     components:
     - type: Transform
-      pos: 66.5,-64.5
+      pos: 32.5,-10.5
       parent: 2
   - uid: 351
     components:
     - type: Transform
-      pos: 61.5,-68.5
+      pos: 57.5,-70.5
       parent: 2
   - uid: 391
     components:
@@ -13743,10 +14616,10 @@ entities:
     - type: Transform
       pos: -27.5,-15.5
       parent: 2
-  - uid: 822
+  - uid: 717
     components:
     - type: Transform
-      pos: 44.5,-29.5
+      pos: 2.5,-59.5
       parent: 2
   - uid: 903
     components:
@@ -13773,36 +14646,26 @@ entities:
     - type: Transform
       pos: -51.5,-37.5
       parent: 2
-  - uid: 1073
+  - uid: 1063
     components:
     - type: Transform
-      pos: 76.5,-41.5
+      pos: 35.5,-28.5
       parent: 2
   - uid: 1096
     components:
     - type: Transform
       pos: -26.5,-15.5
       parent: 2
+  - uid: 1111
+    components:
+    - type: Transform
+      pos: 62.5,-64.5
+      parent: 2
   - uid: 1130
     components:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
-  - uid: 1140
-    components:
-    - type: Transform
-      pos: 77.5,-41.5
-      parent: 2
-  - uid: 1158
-    components:
-    - type: Transform
-      pos: 64.5,-41.5
-      parent: 2
-  - uid: 1169
-    components:
-    - type: Transform
-      pos: 63.5,-45.5
-      parent: 2
   - uid: 1172
     components:
     - type: Transform
@@ -13848,11 +14711,6 @@ entities:
     - type: Transform
       pos: -37.5,-12.5
       parent: 2
-  - uid: 1546
-    components:
-    - type: Transform
-      pos: 72.5,-36.5
-      parent: 2
   - uid: 1563
     components:
     - type: Transform
@@ -13873,11 +14731,36 @@ entities:
     - type: Transform
       pos: -13.5,-16.5
       parent: 2
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: 75.5,-43.5
+      parent: 2
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: -39.5,-79.5
+      parent: 2
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: -40.5,-79.5
+      parent: 2
+  - uid: 2007
+    components:
+    - type: Transform
+      pos: -41.5,-79.5
+      parent: 2
   - uid: 2241
     components:
     - type: Transform
       pos: -16.5,-74.5
       parent: 2
+  - uid: 2246
+    components:
+    - type: Transform
+      pos: 38.5,-28.5
+      parent: 2
   - uid: 2275
     components:
     - type: Transform
@@ -13903,21 +14786,26 @@ entities:
     - type: Transform
       pos: 18.5,-84.5
       parent: 2
-  - uid: 2735
+  - uid: 2656
     components:
     - type: Transform
-      pos: 48.5,-44.5
+      pos: -41.5,-78.5
+      parent: 2
+  - uid: 2678
+    components:
+    - type: Transform
+      pos: 59.5,-72.5
+      parent: 2
+  - uid: 2739
+    components:
+    - type: Transform
+      pos: 64.5,-69.5
       parent: 2
   - uid: 2741
     components:
     - type: Transform
       pos: -7.5,-22.5
       parent: 2
-  - uid: 2767
-    components:
-    - type: Transform
-      pos: 66.5,-71.5
-      parent: 2
   - uid: 2936
     components:
     - type: Transform
@@ -13928,10 +14816,10 @@ entities:
     - type: Transform
       pos: 50.5,-65.5
       parent: 2
-  - uid: 3019
+  - uid: 2962
     components:
     - type: Transform
-      pos: 59.5,-80.5
+      pos: -42.5,-78.5
       parent: 2
   - uid: 3022
     components:
@@ -13948,15 +14836,10 @@ entities:
     - type: Transform
       pos: 53.5,-56.5
       parent: 2
-  - uid: 3029
+  - uid: 3032
     components:
     - type: Transform
-      pos: 59.5,-34.5
-      parent: 2
-  - uid: 3031
-    components:
-    - type: Transform
-      pos: 42.5,-74.5
+      pos: 56.5,-75.5
       parent: 2
   - uid: 3048
     components:
@@ -13968,11 +14851,6 @@ entities:
     - type: Transform
       pos: 45.5,-72.5
       parent: 2
-  - uid: 3055
-    components:
-    - type: Transform
-      pos: 74.5,-39.5
-      parent: 2
   - uid: 3056
     components:
     - type: Transform
@@ -13983,11 +14861,6 @@ entities:
     - type: Transform
       pos: 33.5,-76.5
       parent: 2
-  - uid: 3058
-    components:
-    - type: Transform
-      pos: 38.5,-77.5
-      parent: 2
   - uid: 3063
     components:
     - type: Transform
@@ -13998,11 +14871,6 @@ entities:
     - type: Transform
       pos: 61.5,-19.5
       parent: 2
-  - uid: 3076
-    components:
-    - type: Transform
-      pos: 44.5,-73.5
-      parent: 2
   - uid: 3077
     components:
     - type: Transform
@@ -14013,86 +14881,161 @@ entities:
     - type: Transform
       pos: 35.5,-79.5
       parent: 2
-  - uid: 3079
-    components:
-    - type: Transform
-      pos: 58.5,-81.5
-      parent: 2
-  - uid: 3080
-    components:
-    - type: Transform
-      pos: 59.5,-81.5
-      parent: 2
-  - uid: 3081
-    components:
-    - type: Transform
-      pos: 43.5,-73.5
-      parent: 2
   - uid: 3085
     components:
     - type: Transform
       pos: 63.5,-20.5
       parent: 2
-  - uid: 3089
-    components:
-    - type: Transform
-      pos: 59.5,-76.5
-      parent: 2
-  - uid: 3090
-    components:
-    - type: Transform
-      pos: 59.5,-78.5
-      parent: 2
   - uid: 3091
     components:
     - type: Transform
-      pos: 59.5,-77.5
+      pos: 45.5,-31.5
       parent: 2
   - uid: 3095
     components:
     - type: Transform
       pos: -9.5,-22.5
       parent: 2
+  - uid: 3127
+    components:
+    - type: Transform
+      pos: 5.5,-73.5
+      parent: 2
+  - uid: 3129
+    components:
+    - type: Transform
+      pos: 67.5,-72.5
+      parent: 2
+  - uid: 3147
+    components:
+    - type: Transform
+      pos: 67.5,-70.5
+      parent: 2
+  - uid: 3148
+    components:
+    - type: Transform
+      pos: 58.5,-68.5
+      parent: 2
+  - uid: 3149
+    components:
+    - type: Transform
+      pos: 45.5,-32.5
+      parent: 2
+  - uid: 3153
+    components:
+    - type: Transform
+      pos: 65.5,-69.5
+      parent: 2
+  - uid: 3157
+    components:
+    - type: Transform
+      pos: 64.5,-64.5
+      parent: 2
+  - uid: 3161
+    components:
+    - type: Transform
+      pos: 81.5,-46.5
+      parent: 2
+  - uid: 3162
+    components:
+    - type: Transform
+      pos: 81.5,-45.5
+      parent: 2
+  - uid: 3163
+    components:
+    - type: Transform
+      pos: 58.5,-59.5
+      parent: 2
+  - uid: 3180
+    components:
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
   - uid: 3183
     components:
     - type: Transform
       pos: 73.5,-25.5
       parent: 2
+  - uid: 3190
+    components:
+    - type: Transform
+      pos: 63.5,-64.5
+      parent: 2
   - uid: 3192
     components:
     - type: Transform
       pos: 72.5,-25.5
       parent: 2
+  - uid: 3197
+    components:
+    - type: Transform
+      pos: 43.5,-24.5
+      parent: 2
+  - uid: 3199
+    components:
+    - type: Transform
+      pos: 74.5,-27.5
+      parent: 2
+  - uid: 3200
+    components:
+    - type: Transform
+      pos: 72.5,-30.5
+      parent: 2
+  - uid: 3204
+    components:
+    - type: Transform
+      pos: 79.5,-31.5
+      parent: 2
+  - uid: 3210
+    components:
+    - type: Transform
+      pos: 78.5,-31.5
+      parent: 2
+  - uid: 3277
+    components:
+    - type: Transform
+      pos: 78.5,-37.5
+      parent: 2
+  - uid: 3280
+    components:
+    - type: Transform
+      pos: 77.5,-37.5
+      parent: 2
+  - uid: 3281
+    components:
+    - type: Transform
+      pos: 77.5,-35.5
+      parent: 2
   - uid: 3283
     components:
     - type: Transform
-      pos: 74.5,-41.5
+      pos: 74.5,-38.5
       parent: 2
   - uid: 3284
     components:
     - type: Transform
-      pos: 74.5,-40.5
+      pos: 72.5,-33.5
       parent: 2
-  - uid: 3314
+  - uid: 3285
     components:
     - type: Transform
-      pos: 57.5,-63.5
+      pos: 73.5,-33.5
       parent: 2
-  - uid: 3315
+  - uid: 3299
     components:
     - type: Transform
-      pos: 56.5,-73.5
+      pos: 73.5,-35.5
+      parent: 2
+  - uid: 3300
+    components:
+    - type: Transform
+      pos: 77.5,-28.5
       parent: 2
   - uid: 3316
     components:
     - type: Transform
       pos: 39.5,-76.5
       parent: 2
-  - uid: 3317
-    components:
-    - type: Transform
-      pos: 56.5,-75.5
-      parent: 2
   - uid: 3318
     components:
     - type: Transform
@@ -14103,100 +15046,105 @@ entities:
     - type: Transform
       pos: 43.5,-76.5
       parent: 2
+  - uid: 3333
+    components:
+    - type: Transform
+      pos: 73.5,-62.5
+      parent: 2
+  - uid: 3334
+    components:
+    - type: Transform
+      pos: 74.5,-62.5
+      parent: 2
+  - uid: 3354
+    components:
+    - type: Transform
+      pos: 77.5,-64.5
+      parent: 2
+  - uid: 3355
+    components:
+    - type: Transform
+      pos: 77.5,-63.5
+      parent: 2
   - uid: 3356
     components:
     - type: Transform
-      pos: 60.5,-72.5
+      pos: 77.5,-62.5
+      parent: 2
+  - uid: 3358
+    components:
+    - type: Transform
+      pos: 40.5,-72.5
+      parent: 2
+  - uid: 3361
+    components:
+    - type: Transform
+      pos: 77.5,-61.5
+      parent: 2
+  - uid: 3362
+    components:
+    - type: Transform
+      pos: 76.5,-61.5
       parent: 2
   - uid: 3364
     components:
     - type: Transform
-      pos: 56.5,-70.5
+      pos: 75.5,-61.5
       parent: 2
   - uid: 3365
     components:
     - type: Transform
-      pos: 58.5,-70.5
+      pos: 74.5,-61.5
       parent: 2
   - uid: 3377
     components:
     - type: Transform
-      pos: 58.5,-69.5
+      pos: 58.5,-66.5
       parent: 2
   - uid: 3378
     components:
     - type: Transform
-      pos: 59.5,-67.5
+      pos: 57.5,-66.5
       parent: 2
-  - uid: 3442
+  - uid: 3387
     components:
     - type: Transform
-      pos: 52.5,-37.5
+      pos: 72.5,-62.5
       parent: 2
-  - uid: 3443
+  - uid: 3388
     components:
     - type: Transform
-      pos: 63.5,-47.5
+      pos: 43.5,-37.5
       parent: 2
-  - uid: 3450
+  - uid: 3389
     components:
     - type: Transform
-      pos: 66.5,-46.5
+      pos: 42.5,-37.5
       parent: 2
-  - uid: 3452
+  - uid: 3390
     components:
     - type: Transform
-      pos: 63.5,-56.5
+      pos: 43.5,-38.5
       parent: 2
-  - uid: 3457
+  - uid: 3426
     components:
     - type: Transform
-      pos: 67.5,-49.5
+      pos: 39.5,-28.5
       parent: 2
-  - uid: 3459
+  - uid: 3435
     components:
     - type: Transform
-      pos: 69.5,-52.5
+      pos: 30.5,-75.5
       parent: 2
-  - uid: 3460
+  - uid: 3455
     components:
     - type: Transform
-      pos: 68.5,-51.5
+      pos: 33.5,-19.5
       parent: 2
-  - uid: 3463
+  - uid: 3492
     components:
     - type: Transform
-      pos: 60.5,-58.5
-      parent: 2
-  - uid: 3464
-    components:
-    - type: Transform
-      pos: 60.5,-54.5
-      parent: 2
-  - uid: 3470
-    components:
-    - type: Transform
-      pos: 59.5,-44.5
-      parent: 2
-  - uid: 3471
-    components:
-    - type: Transform
-      pos: 59.5,-46.5
-      parent: 2
-  - uid: 3474
-    components:
-    - type: Transform
-      pos: 72.5,-46.5
-      parent: 2
-  - uid: 3479
-    components:
-    - type: Transform
-      pos: 58.5,-42.5
-      parent: 2
-  - uid: 3480
-    components:
-    - type: Transform
-      pos: 72.5,-51.5
+      pos: 34.5,-19.5
       parent: 2
   - uid: 3512
     components:
@@ -14213,11 +15161,21 @@ entities:
     - type: Transform
       pos: -14.5,-79.5
       parent: 2
+  - uid: 3554
+    components:
+    - type: Transform
+      pos: 64.5,-68.5
+      parent: 2
   - uid: 3566
     components:
     - type: Transform
       pos: 69.5,-28.5
       parent: 2
+  - uid: 3581
+    components:
+    - type: Transform
+      pos: 55.5,-44.5
+      parent: 2
   - uid: 3586
     components:
     - type: Transform
@@ -14228,30 +15186,40 @@ entities:
     - type: Transform
       pos: 63.5,-26.5
       parent: 2
+  - uid: 3607
+    components:
+    - type: Transform
+      pos: 64.5,-67.5
+      parent: 2
+  - uid: 3608
+    components:
+    - type: Transform
+      pos: 37.5,-28.5
+      parent: 2
   - uid: 3610
     components:
     - type: Transform
       pos: 47.5,-52.5
       parent: 2
-  - uid: 3612
+  - uid: 3611
     components:
     - type: Transform
-      pos: 59.5,-53.5
-      parent: 2
-  - uid: 3614
-    components:
-    - type: Transform
-      pos: 61.5,-53.5
+      pos: 39.5,-37.5
       parent: 2
   - uid: 3615
     components:
     - type: Transform
       pos: 46.5,-52.5
       parent: 2
-  - uid: 3617
+  - uid: 3622
     components:
     - type: Transform
-      pos: 60.5,-53.5
+      pos: 34.5,-29.5
+      parent: 2
+  - uid: 3623
+    components:
+    - type: Transform
+      pos: 40.5,-37.5
       parent: 2
   - uid: 3644
     components:
@@ -14268,20 +15236,200 @@ entities:
     - type: Transform
       pos: 42.5,-14.5
       parent: 2
+  - uid: 3652
+    components:
+    - type: Transform
+      pos: 51.5,-43.5
+      parent: 2
+  - uid: 3653
+    components:
+    - type: Transform
+      pos: 37.5,-34.5
+      parent: 2
   - uid: 3654
     components:
     - type: Transform
-      pos: 57.5,-81.5
+      pos: 37.5,-36.5
       parent: 2
-  - uid: 3723
+  - uid: 3661
     components:
     - type: Transform
-      pos: 44.5,-28.5
+      pos: 37.5,-33.5
       parent: 2
-  - uid: 3836
+  - uid: 3683
     components:
     - type: Transform
-      pos: 66.5,-58.5
+      pos: 64.5,-66.5
+      parent: 2
+  - uid: 3684
+    components:
+    - type: Transform
+      pos: 43.5,-27.5
+      parent: 2
+  - uid: 3686
+    components:
+    - type: Transform
+      pos: 40.5,-27.5
+      parent: 2
+  - uid: 3694
+    components:
+    - type: Transform
+      pos: 43.5,-26.5
+      parent: 2
+  - uid: 3695
+    components:
+    - type: Transform
+      pos: 45.5,-26.5
+      parent: 2
+  - uid: 3696
+    components:
+    - type: Transform
+      pos: 46.5,-27.5
+      parent: 2
+  - uid: 3698
+    components:
+    - type: Transform
+      pos: 45.5,-27.5
+      parent: 2
+  - uid: 3699
+    components:
+    - type: Transform
+      pos: 46.5,-28.5
+      parent: 2
+  - uid: 3700
+    components:
+    - type: Transform
+      pos: 45.5,-33.5
+      parent: 2
+  - uid: 3701
+    components:
+    - type: Transform
+      pos: 45.5,-35.5
+      parent: 2
+  - uid: 3702
+    components:
+    - type: Transform
+      pos: 45.5,-30.5
+      parent: 2
+  - uid: 3703
+    components:
+    - type: Transform
+      pos: 45.5,-29.5
+      parent: 2
+  - uid: 3704
+    components:
+    - type: Transform
+      pos: 45.5,-38.5
+      parent: 2
+  - uid: 3707
+    components:
+    - type: Transform
+      pos: 45.5,-36.5
+      parent: 2
+  - uid: 3712
+    components:
+    - type: Transform
+      pos: 75.5,-46.5
+      parent: 2
+  - uid: 3724
+    components:
+    - type: Transform
+      pos: 45.5,-34.5
+      parent: 2
+  - uid: 3735
+    components:
+    - type: Transform
+      pos: 29.5,-32.5
+      parent: 2
+  - uid: 3736
+    components:
+    - type: Transform
+      pos: 60.5,-68.5
+      parent: 2
+  - uid: 3740
+    components:
+    - type: Transform
+      pos: 67.5,-69.5
+      parent: 2
+  - uid: 3746
+    components:
+    - type: Transform
+      pos: 59.5,-68.5
+      parent: 2
+  - uid: 3754
+    components:
+    - type: Transform
+      pos: 91.5,-49.5
+      parent: 2
+  - uid: 3755
+    components:
+    - type: Transform
+      pos: 92.5,-49.5
+      parent: 2
+  - uid: 3761
+    components:
+    - type: Transform
+      pos: 30.5,-32.5
+      parent: 2
+  - uid: 3765
+    components:
+    - type: Transform
+      pos: 31.5,-32.5
+      parent: 2
+  - uid: 3781
+    components:
+    - type: Transform
+      pos: 74.5,-31.5
+      parent: 2
+  - uid: 3786
+    components:
+    - type: Transform
+      pos: 77.5,-31.5
+      parent: 2
+  - uid: 3794
+    components:
+    - type: Transform
+      pos: 77.5,-29.5
+      parent: 2
+  - uid: 3795
+    components:
+    - type: Transform
+      pos: 76.5,-31.5
+      parent: 2
+  - uid: 3796
+    components:
+    - type: Transform
+      pos: 74.5,-32.5
+      parent: 2
+  - uid: 3800
+    components:
+    - type: Transform
+      pos: 76.5,-26.5
+      parent: 2
+  - uid: 3802
+    components:
+    - type: Transform
+      pos: 74.5,-39.5
+      parent: 2
+  - uid: 3803
+    components:
+    - type: Transform
+      pos: 74.5,-37.5
+      parent: 2
+  - uid: 3804
+    components:
+    - type: Transform
+      pos: 72.5,-35.5
+      parent: 2
+  - uid: 3807
+    components:
+    - type: Transform
+      pos: 74.5,-36.5
+      parent: 2
+  - uid: 3808
+    components:
+    - type: Transform
+      pos: 77.5,-27.5
       parent: 2
   - uid: 3921
     components:
@@ -14298,20 +15446,25 @@ entities:
     - type: Transform
       pos: 36.5,-79.5
       parent: 2
-  - uid: 3934
+  - uid: 3933
     components:
     - type: Transform
-      pos: 73.5,-38.5
+      pos: 42.5,-72.5
       parent: 2
-  - uid: 3935
+  - uid: 3939
     components:
     - type: Transform
-      pos: 72.5,-38.5
+      pos: 38.5,-72.5
+      parent: 2
+  - uid: 3940
+    components:
+    - type: Transform
+      pos: 39.5,-72.5
       parent: 2
   - uid: 3952
     components:
     - type: Transform
-      pos: 38.5,-78.5
+      pos: 37.5,-79.5
       parent: 2
   - uid: 4017
     components:
@@ -14323,11 +15476,21 @@ entities:
     - type: Transform
       pos: 57.5,-24.5
       parent: 2
+  - uid: 4068
+    components:
+    - type: Transform
+      pos: 9.5,-48.5
+      parent: 2
   - uid: 4070
     components:
     - type: Transform
       pos: 72.5,-27.5
       parent: 2
+  - uid: 4080
+    components:
+    - type: Transform
+      pos: 44.5,-38.5
+      parent: 2
   - uid: 4104
     components:
     - type: Transform
@@ -14363,11 +15526,6 @@ entities:
     - type: Transform
       pos: 59.5,-24.5
       parent: 2
-  - uid: 4212
-    components:
-    - type: Transform
-      pos: 68.5,-32.5
-      parent: 2
   - uid: 4213
     components:
     - type: Transform
@@ -14398,11 +15556,6 @@ entities:
     - type: Transform
       pos: 47.5,-19.5
       parent: 2
-  - uid: 4252
-    components:
-    - type: Transform
-      pos: 30.5,-15.5
-      parent: 2
   - uid: 4264
     components:
     - type: Transform
@@ -14413,6 +15566,16 @@ entities:
     - type: Transform
       pos: 66.5,-28.5
       parent: 2
+  - uid: 4266
+    components:
+    - type: Transform
+      pos: 44.5,-42.5
+      parent: 2
+  - uid: 4274
+    components:
+    - type: Transform
+      pos: 76.5,-67.5
+      parent: 2
   - uid: 4281
     components:
     - type: Transform
@@ -14423,21 +15586,11 @@ entities:
     - type: Transform
       pos: -31.5,-74.5
       parent: 2
-  - uid: 4297
-    components:
-    - type: Transform
-      pos: 58.5,-53.5
-      parent: 2
   - uid: 4326
     components:
     - type: Transform
       pos: -15.5,-74.5
       parent: 2
-  - uid: 4405
-    components:
-    - type: Transform
-      pos: 62.5,-70.5
-      parent: 2
   - uid: 4407
     components:
     - type: Transform
@@ -14448,16 +15601,16 @@ entities:
     - type: Transform
       pos: -17.5,-74.5
       parent: 2
-  - uid: 4433
-    components:
-    - type: Transform
-      pos: 61.5,-72.5
-      parent: 2
   - uid: 4559
     components:
     - type: Transform
       pos: 31.5,-79.5
       parent: 2
+  - uid: 4634
+    components:
+    - type: Transform
+      pos: 41.5,-37.5
+      parent: 2
   - uid: 4678
     components:
     - type: Transform
@@ -14491,12 +15644,7 @@ entities:
   - uid: 4816
     components:
     - type: Transform
-      pos: 36.5,-78.5
-      parent: 2
-  - uid: 4864
-    components:
-    - type: Transform
-      pos: 66.5,-59.5
+      pos: 32.5,-68.5
       parent: 2
   - uid: 4881
     components:
@@ -14513,11 +15661,6 @@ entities:
     - type: Transform
       pos: 78.5,-44.5
       parent: 2
-  - uid: 4910
-    components:
-    - type: Transform
-      pos: 78.5,-45.5
-      parent: 2
   - uid: 4997
     components:
     - type: Transform
@@ -14548,30 +15691,10 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 2
-  - uid: 5089
+  - uid: 5197
     components:
     - type: Transform
-      pos: 57.5,-64.5
-      parent: 2
-  - uid: 5117
-    components:
-    - type: Transform
-      pos: 6.5,-51.5
-      parent: 2
-  - uid: 5181
-    components:
-    - type: Transform
-      pos: 60.5,-66.5
-      parent: 2
-  - uid: 5192
-    components:
-    - type: Transform
-      pos: 78.5,-41.5
-      parent: 2
-  - uid: 5207
-    components:
-    - type: Transform
-      pos: 5.5,-51.5
+      pos: -12.5,-34.5
       parent: 2
   - uid: 5210
     components:
@@ -14588,15 +15711,40 @@ entities:
     - type: Transform
       pos: 4.5,-52.5
       parent: 2
-  - uid: 5254
+  - uid: 5281
     components:
     - type: Transform
-      pos: 57.5,-65.5
+      pos: 40.5,-28.5
       parent: 2
-  - uid: 5276
+  - uid: 5282
     components:
     - type: Transform
-      pos: 66.5,-60.5
+      pos: 36.5,-28.5
+      parent: 2
+  - uid: 5284
+    components:
+    - type: Transform
+      pos: 34.5,-28.5
+      parent: 2
+  - uid: 5285
+    components:
+    - type: Transform
+      pos: 51.5,-42.5
+      parent: 2
+  - uid: 5286
+    components:
+    - type: Transform
+      pos: 33.5,-29.5
+      parent: 2
+  - uid: 5287
+    components:
+    - type: Transform
+      pos: 37.5,-35.5
+      parent: 2
+  - uid: 5288
+    components:
+    - type: Transform
+      pos: 37.5,-32.5
       parent: 2
   - uid: 5289
     components:
@@ -14623,15 +15771,70 @@ entities:
     - type: Transform
       pos: 4.5,-57.5
       parent: 2
+  - uid: 5300
+    components:
+    - type: Transform
+      pos: 33.5,-32.5
+      parent: 2
+  - uid: 5304
+    components:
+    - type: Transform
+      pos: 51.5,-41.5
+      parent: 2
+  - uid: 5307
+    components:
+    - type: Transform
+      pos: 41.5,-27.5
+      parent: 2
   - uid: 5309
     components:
     - type: Transform
-      pos: 49.5,-31.5
+      pos: 51.5,-49.5
       parent: 2
-  - uid: 5346
+  - uid: 5311
     components:
     - type: Transform
-      pos: 47.5,-27.5
+      pos: 51.5,-44.5
+      parent: 2
+  - uid: 5324
+    components:
+    - type: Transform
+      pos: 92.5,-48.5
+      parent: 2
+  - uid: 5326
+    components:
+    - type: Transform
+      pos: 74.5,-29.5
+      parent: 2
+  - uid: 5327
+    components:
+    - type: Transform
+      pos: 57.5,-68.5
+      parent: 2
+  - uid: 5331
+    components:
+    - type: Transform
+      pos: 76.5,-27.5
+      parent: 2
+  - uid: 5368
+    components:
+    - type: Transform
+      pos: 74.5,-33.5
+      parent: 2
+  - uid: 5370
+    components:
+    - type: Transform
+      pos: 76.5,-30.5
+      parent: 2
+  - uid: 5371
+    components:
+    - type: Transform
+      pos: 76.5,-29.5
+      parent: 2
+  - uid: 5372
+    components:
+    - type: Transform
+      pos: 75.5,-45.5
       parent: 2
   - uid: 5382
     components:
@@ -14653,25 +15856,20 @@ entities:
     - type: Transform
       pos: 68.5,-21.5
       parent: 2
+  - uid: 5404
+    components:
+    - type: Transform
+      pos: 66.5,-69.5
+      parent: 2
   - uid: 5424
     components:
     - type: Transform
       pos: 4.5,-56.5
       parent: 2
-  - uid: 5538
+  - uid: 5461
     components:
     - type: Transform
-      pos: 58.5,-56.5
-      parent: 2
-  - uid: 5539
-    components:
-    - type: Transform
-      pos: 60.5,-59.5
-      parent: 2
-  - uid: 5603
-    components:
-    - type: Transform
-      pos: 62.5,-56.5
+      pos: 37.5,-76.5
       parent: 2
   - uid: 5610
     components:
@@ -14683,11 +15881,31 @@ entities:
     - type: Transform
       pos: -48.5,-37.5
       parent: 2
+  - uid: 5731
+    components:
+    - type: Transform
+      pos: 58.5,-71.5
+      parent: 2
+  - uid: 5736
+    components:
+    - type: Transform
+      pos: 57.5,-71.5
+      parent: 2
   - uid: 5790
     components:
     - type: Transform
       pos: 15.5,-83.5
       parent: 2
+  - uid: 5791
+    components:
+    - type: Transform
+      pos: 57.5,-69.5
+      parent: 2
+  - uid: 5795
+    components:
+    - type: Transform
+      pos: 74.5,-35.5
+      parent: 2
   - uid: 5804
     components:
     - type: Transform
@@ -14698,51 +15916,56 @@ entities:
     - type: Transform
       pos: 80.5,-45.5
       parent: 2
-  - uid: 5809
+  - uid: 5857
     components:
     - type: Transform
-      pos: 78.5,-46.5
+      pos: 37.5,-37.5
+      parent: 2
+  - uid: 5872
+    components:
+    - type: Transform
+      pos: 37.5,-39.5
       parent: 2
   - uid: 5891
     components:
     - type: Transform
-      pos: 80.5,-44.5
-      parent: 2
-  - uid: 5892
-    components:
-    - type: Transform
-      pos: 80.5,-46.5
+      pos: 37.5,-38.5
       parent: 2
   - uid: 5927
     components:
     - type: Transform
       pos: 4.5,-55.5
       parent: 2
-  - uid: 5957
+  - uid: 6014
     components:
     - type: Transform
-      pos: 66.5,-45.5
+      pos: 72.5,-34.5
+      parent: 2
+  - uid: 6029
+    components:
+    - type: Transform
+      pos: 55.5,-98.5
+      parent: 2
+  - uid: 6032
+    components:
+    - type: Transform
+      pos: 55.5,-97.5
       parent: 2
   - uid: 6082
     components:
     - type: Transform
-      pos: 34.5,-20.5
+      pos: 51.5,-50.5
       parent: 2
-  - uid: 6083
+  - uid: 6092
     components:
     - type: Transform
-      pos: 34.5,-19.5
+      pos: 70.5,-44.5
       parent: 2
   - uid: 6099
     components:
     - type: Transform
       pos: 55.5,-17.5
       parent: 2
-  - uid: 6100
-    components:
-    - type: Transform
-      pos: 62.5,-68.5
-      parent: 2
   - uid: 6101
     components:
     - type: Transform
@@ -14758,26 +15981,11 @@ entities:
     - type: Transform
       pos: 42.5,-19.5
       parent: 2
-  - uid: 6104
-    components:
-    - type: Transform
-      pos: 62.5,-69.5
-      parent: 2
-  - uid: 6106
-    components:
-    - type: Transform
-      pos: 59.5,-72.5
-      parent: 2
   - uid: 6115
     components:
     - type: Transform
       pos: 55.5,-19.5
       parent: 2
-  - uid: 6118
-    components:
-    - type: Transform
-      pos: 34.5,-21.5
-      parent: 2
   - uid: 6122
     components:
     - type: Transform
@@ -14788,30 +15996,15 @@ entities:
     - type: Transform
       pos: 53.5,-19.5
       parent: 2
-  - uid: 6132
-    components:
-    - type: Transform
-      pos: 56.5,-66.5
-      parent: 2
-  - uid: 6136
-    components:
-    - type: Transform
-      pos: 57.5,-70.5
-      parent: 2
   - uid: 6137
     components:
     - type: Transform
       pos: 58.5,-17.5
       parent: 2
-  - uid: 6139
+  - uid: 6216
     components:
     - type: Transform
-      pos: 56.5,-74.5
-      parent: 2
-  - uid: 6140
-    components:
-    - type: Transform
-      pos: 56.5,-65.5
+      pos: 43.5,-72.5
       parent: 2
   - uid: 6234
     components:
@@ -14823,6 +16016,36 @@ entities:
     - type: Transform
       pos: -33.5,-17.5
       parent: 2
+  - uid: 6266
+    components:
+    - type: Transform
+      pos: 49.5,-72.5
+      parent: 2
+  - uid: 6288
+    components:
+    - type: Transform
+      pos: 74.5,-28.5
+      parent: 2
+  - uid: 6294
+    components:
+    - type: Transform
+      pos: 37.5,-40.5
+      parent: 2
+  - uid: 6380
+    components:
+    - type: Transform
+      pos: 44.5,-26.5
+      parent: 2
+  - uid: 6384
+    components:
+    - type: Transform
+      pos: 77.5,-67.5
+      parent: 2
+  - uid: 6402
+    components:
+    - type: Transform
+      pos: 72.5,-75.5
+      parent: 2
   - uid: 6472
     components:
     - type: Transform
@@ -14833,56 +16056,66 @@ entities:
     - type: Transform
       pos: -2.5,-36.5
       parent: 2
-  - uid: 6612
+  - uid: 6626
     components:
     - type: Transform
-      pos: 56.5,-72.5
+      pos: 51.5,-72.5
       parent: 2
   - uid: 6627
     components:
     - type: Transform
-      pos: 49.5,-32.5
+      pos: 91.5,-41.5
       parent: 2
-  - uid: 6716
+  - uid: 6680
     components:
     - type: Transform
-      pos: 43.5,-26.5
+      pos: 53.5,-72.5
       parent: 2
-  - uid: 6717
+  - uid: 6847
     components:
     - type: Transform
-      pos: 41.5,-32.5
+      pos: 61.5,-68.5
       parent: 2
-  - uid: 7168
+  - uid: 6935
     components:
     - type: Transform
-      pos: 64.5,-34.5
+      pos: 54.5,-71.5
       parent: 2
-  - uid: 7169
+  - uid: 7035
     components:
     - type: Transform
-      pos: 63.5,-46.5
+      pos: 28.5,-30.5
       parent: 2
-  - uid: 7172
+  - uid: 7043
     components:
     - type: Transform
-      pos: 59.5,-37.5
+      pos: 61.5,-69.5
+      parent: 2
+  - uid: 7046
+    components:
+    - type: Transform
+      pos: 32.5,-29.5
+      parent: 2
+  - uid: 7047
+    components:
+    - type: Transform
+      pos: 31.5,-29.5
+      parent: 2
+  - uid: 7116
+    components:
+    - type: Transform
+      pos: 30.5,-29.5
+      parent: 2
+  - uid: 7127
+    components:
+    - type: Transform
+      pos: 29.5,-29.5
       parent: 2
   - uid: 7175
     components:
     - type: Transform
       pos: 54.5,-56.5
       parent: 2
-  - uid: 7203
-    components:
-    - type: Transform
-      pos: 67.5,-57.5
-      parent: 2
-  - uid: 7226
-    components:
-    - type: Transform
-      pos: 63.5,-43.5
-      parent: 2
   - uid: 7229
     components:
     - type: Transform
@@ -14893,15 +16126,20 @@ entities:
     - type: Transform
       pos: 49.5,-19.5
       parent: 2
-  - uid: 7261
+  - uid: 7240
     components:
     - type: Transform
-      pos: 66.5,-61.5
+      pos: 32.5,-32.5
       parent: 2
-  - uid: 7275
+  - uid: 7281
     components:
     - type: Transform
-      pos: 60.5,-40.5
+      pos: 27.5,-26.5
+      parent: 2
+  - uid: 7291
+    components:
+    - type: Transform
+      pos: 55.5,-45.5
       parent: 2
   - uid: 7296
     components:
@@ -14933,30 +16171,35 @@ entities:
     - type: Transform
       pos: 52.5,-14.5
       parent: 2
-  - uid: 7332
+  - uid: 7339
     components:
     - type: Transform
-      pos: 61.5,-71.5
+      pos: 3.5,-59.5
       parent: 2
-  - uid: 7342
+  - uid: 7393
     components:
     - type: Transform
-      pos: 62.5,-71.5
+      pos: 72.5,-69.5
       parent: 2
-  - uid: 7344
+  - uid: 7401
     components:
     - type: Transform
-      pos: 59.5,-73.5
+      pos: 72.5,-71.5
       parent: 2
-  - uid: 7426
+  - uid: 7402
     components:
     - type: Transform
-      pos: 84.5,-43.5
+      pos: 72.5,-72.5
       parent: 2
-  - uid: 7486
+  - uid: 7451
     components:
     - type: Transform
-      pos: 93.5,-46.5
+      pos: 49.5,-64.5
+      parent: 2
+  - uid: 7452
+    components:
+    - type: Transform
+      pos: 49.5,-63.5
       parent: 2
   - uid: 7487
     components:
@@ -15048,35 +16291,85 @@ entities:
     - type: Transform
       pos: 93.5,-43.5
       parent: 2
-  - uid: 7509
+  - uid: 7572
     components:
     - type: Transform
-      pos: 93.5,-44.5
+      pos: 65.5,-65.5
       parent: 2
-  - uid: 7510
+  - uid: 7580
     components:
     - type: Transform
-      pos: 93.5,-45.5
+      pos: 67.5,-65.5
+      parent: 2
+  - uid: 7587
+    components:
+    - type: Transform
+      pos: 58.5,-73.5
+      parent: 2
+  - uid: 7588
+    components:
+    - type: Transform
+      pos: 36.5,-40.5
+      parent: 2
+  - uid: 7589
+    components:
+    - type: Transform
+      pos: 58.5,-72.5
+      parent: 2
+  - uid: 7600
+    components:
+    - type: Transform
+      pos: 95.5,-45.5
+      parent: 2
+  - uid: 7619
+    components:
+    - type: Transform
+      pos: 95.5,-44.5
       parent: 2
   - uid: 7648
     components:
     - type: Transform
       pos: -21.5,-19.5
       parent: 2
+  - uid: 7658
+    components:
+    - type: Transform
+      pos: 67.5,-71.5
+      parent: 2
+  - uid: 7706
+    components:
+    - type: Transform
+      pos: 49.5,-45.5
+      parent: 2
   - uid: 7712
     components:
     - type: Transform
       pos: 24.5,-90.5
       parent: 2
+  - uid: 7716
+    components:
+    - type: Transform
+      pos: 64.5,-65.5
+      parent: 2
+  - uid: 7723
+    components:
+    - type: Transform
+      pos: 56.5,-76.5
+      parent: 2
   - uid: 7732
     components:
     - type: Transform
       pos: 65.5,-20.5
       parent: 2
-  - uid: 7754
+  - uid: 7742
     components:
     - type: Transform
-      pos: 59.5,-38.5
+      pos: 77.5,-54.5
+      parent: 2
+  - uid: 7750
+    components:
+    - type: Transform
+      pos: 46.5,-29.5
       parent: 2
   - uid: 7757
     components:
@@ -15088,6 +16381,16 @@ entities:
     - type: Transform
       pos: 49.5,-14.5
       parent: 2
+  - uid: 7808
+    components:
+    - type: Transform
+      pos: 7.5,-59.5
+      parent: 2
+  - uid: 7892
+    components:
+    - type: Transform
+      pos: 48.5,-29.5
+      parent: 2
   - uid: 7910
     components:
     - type: Transform
@@ -15108,6 +16411,11 @@ entities:
     - type: Transform
       pos: 15.5,-67.5
       parent: 2
+  - uid: 7926
+    components:
+    - type: Transform
+      pos: 64.5,-63.5
+      parent: 2
   - uid: 7941
     components:
     - type: Transform
@@ -15118,21 +16426,6 @@ entities:
     - type: Transform
       pos: 64.5,-28.5
       parent: 2
-  - uid: 7947
-    components:
-    - type: Transform
-      pos: 62.5,-67.5
-      parent: 2
-  - uid: 7948
-    components:
-    - type: Transform
-      pos: 62.5,-66.5
-      parent: 2
-  - uid: 7949
-    components:
-    - type: Transform
-      pos: 61.5,-66.5
-      parent: 2
   - uid: 7966
     components:
     - type: Transform
@@ -15143,61 +16436,56 @@ entities:
     - type: Transform
       pos: 35.5,-70.5
       parent: 2
-  - uid: 7969
+  - uid: 8045
     components:
     - type: Transform
-      pos: 51.5,-50.5
+      pos: 67.5,-64.5
       parent: 2
-  - uid: 7971
+  - uid: 8074
     components:
     - type: Transform
-      pos: 63.5,-44.5
+      pos: 57.5,-67.5
       parent: 2
-  - uid: 7985
+  - uid: 8081
     components:
     - type: Transform
-      pos: 58.5,-48.5
+      pos: 77.5,-66.5
       parent: 2
-  - uid: 8035
+  - uid: 8083
     components:
     - type: Transform
-      pos: 62.5,-63.5
+      pos: 77.5,-65.5
       parent: 2
-  - uid: 8047
+  - uid: 8091
     components:
     - type: Transform
-      pos: 62.5,-64.5
+      pos: 67.5,-63.5
       parent: 2
-  - uid: 8068
+  - uid: 8094
     components:
     - type: Transform
-      pos: 69.5,-42.5
+      pos: 92.5,-41.5
       parent: 2
-  - uid: 8113
+  - uid: 8099
     components:
     - type: Transform
-      pos: 59.5,-65.5
-      parent: 2
-  - uid: 8116
-    components:
-    - type: Transform
-      pos: 59.5,-63.5
-      parent: 2
-  - uid: 8134
-    components:
-    - type: Transform
-      pos: 61.5,-63.5
-      parent: 2
-  - uid: 8135
-    components:
-    - type: Transform
-      pos: 63.5,-42.5
+      pos: 92.5,-42.5
       parent: 2
   - uid: 8142
     components:
     - type: Transform
       pos: 55.5,-56.5
       parent: 2
+  - uid: 8149
+    components:
+    - type: Transform
+      pos: 28.5,-35.5
+      parent: 2
+  - uid: 8157
+    components:
+    - type: Transform
+      pos: 75.5,-48.5
+      parent: 2
   - uid: 8178
     components:
     - type: Transform
@@ -15258,31 +16546,26 @@ entities:
     - type: Transform
       pos: 65.5,-27.5
       parent: 2
-  - uid: 8412
+  - uid: 8449
     components:
     - type: Transform
-      pos: 58.5,-35.5
+      pos: 66.5,-65.5
       parent: 2
-  - uid: 8573
+  - uid: 8545
     components:
     - type: Transform
-      pos: 56.5,-71.5
+      pos: 37.5,-77.5
+      parent: 2
+  - uid: 8546
+    components:
+    - type: Transform
+      pos: 56.5,-57.5
       parent: 2
   - uid: 8579
     components:
     - type: Transform
       pos: 59.5,-27.5
       parent: 2
-  - uid: 8611
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-  - uid: 8620
-    components:
-    - type: Transform
-      pos: 65.5,-33.5
-      parent: 2
   - uid: 8626
     components:
     - type: Transform
@@ -15293,11 +16576,6 @@ entities:
     - type: Transform
       pos: 56.5,-17.5
       parent: 2
-  - uid: 8642
-    components:
-    - type: Transform
-      pos: 38.5,-32.5
-      parent: 2
   - uid: 8660
     components:
     - type: Transform
@@ -15313,10 +16591,10 @@ entities:
     - type: Transform
       pos: 54.5,-70.5
       parent: 2
-  - uid: 8812
+  - uid: 8804
     components:
     - type: Transform
-      pos: 59.5,-56.5
+      pos: 76.5,-25.5
       parent: 2
   - uid: 8815
     components:
@@ -15333,21 +16611,6 @@ entities:
     - type: Transform
       pos: -33.5,-57.5
       parent: 2
-  - uid: 8825
-    components:
-    - type: Transform
-      pos: 59.5,-42.5
-      parent: 2
-  - uid: 8826
-    components:
-    - type: Transform
-      pos: 69.5,-46.5
-      parent: 2
-  - uid: 8827
-    components:
-    - type: Transform
-      pos: 65.5,-39.5
-      parent: 2
   - uid: 8828
     components:
     - type: Transform
@@ -15358,11 +16621,6 @@ entities:
     - type: Transform
       pos: -34.5,-65.5
       parent: 2
-  - uid: 8864
-    components:
-    - type: Transform
-      pos: 71.5,-52.5
-      parent: 2
   - uid: 9054
     components:
     - type: Transform
@@ -15433,11 +16691,6 @@ entities:
     - type: Transform
       pos: 12.5,-83.5
       parent: 2
-  - uid: 9211
-    components:
-    - type: Transform
-      pos: 55.5,-52.5
-      parent: 2
   - uid: 9220
     components:
     - type: Transform
@@ -15448,21 +16701,11 @@ entities:
     - type: Transform
       pos: 68.5,-19.5
       parent: 2
-  - uid: 9264
-    components:
-    - type: Transform
-      pos: 47.5,-70.5
-      parent: 2
   - uid: 9265
     components:
     - type: Transform
       pos: 30.5,-70.5
       parent: 2
-  - uid: 9266
-    components:
-    - type: Transform
-      pos: 48.5,-70.5
-      parent: 2
   - uid: 9267
     components:
     - type: Transform
@@ -15473,46 +16716,26 @@ entities:
     - type: Transform
       pos: 47.5,-72.5
       parent: 2
-  - uid: 9269
-    components:
-    - type: Transform
-      pos: 47.5,-71.5
-      parent: 2
-  - uid: 9275
-    components:
-    - type: Transform
-      pos: 31.5,-69.5
-      parent: 2
   - uid: 9276
     components:
     - type: Transform
-      pos: 49.5,-70.5
+      pos: 53.5,-68.5
       parent: 2
   - uid: 9277
     components:
     - type: Transform
-      pos: 50.5,-70.5
+      pos: 41.5,-72.5
       parent: 2
   - uid: 9278
     components:
     - type: Transform
-      pos: 51.5,-70.5
+      pos: 48.5,-72.5
       parent: 2
   - uid: 9309
     components:
     - type: Transform
       pos: 65.5,-72.5
       parent: 2
-  - uid: 9320
-    components:
-    - type: Transform
-      pos: 63.5,-64.5
-      parent: 2
-  - uid: 9332
-    components:
-    - type: Transform
-      pos: 55.5,-50.5
-      parent: 2
   - uid: 9338
     components:
     - type: Transform
@@ -15528,80 +16751,60 @@ entities:
     - type: Transform
       pos: 48.5,-19.5
       parent: 2
-  - uid: 9349
-    components:
-    - type: Transform
-      pos: 34.5,-13.5
-      parent: 2
   - uid: 9350
     components:
     - type: Transform
-      pos: 34.5,-18.5
+      pos: 31.5,-11.5
       parent: 2
   - uid: 9365
     components:
     - type: Transform
       pos: 65.5,-21.5
       parent: 2
-  - uid: 9388
+  - uid: 9389
     components:
     - type: Transform
-      pos: 38.5,-31.5
+      pos: 60.5,-64.5
       parent: 2
-  - uid: 9446
+  - uid: 9397
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      pos: 61.5,-64.5
       parent: 2
-  - uid: 9459
+  - uid: 9454
     components:
     - type: Transform
-      pos: 60.5,-41.5
-      parent: 2
-  - uid: 9483
-    components:
-    - type: Transform
-      pos: 60.5,-42.5
-      parent: 2
-  - uid: 9586
-    components:
-    - type: Transform
-      pos: 60.5,-55.5
-      parent: 2
-  - uid: 9589
-    components:
-    - type: Transform
-      pos: 61.5,-56.5
+      pos: 50.5,-72.5
       parent: 2
   - uid: 9599
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
-  - uid: 9602
+  - uid: 9677
     components:
     - type: Transform
-      pos: 69.5,-47.5
+      pos: 52.5,-72.5
       parent: 2
-  - uid: 9610
+  - uid: 9708
     components:
     - type: Transform
-      pos: 67.5,-50.5
+      pos: 54.5,-72.5
       parent: 2
-  - uid: 9672
+  - uid: 9905
     components:
     - type: Transform
-      pos: 59.5,-45.5
+      pos: 54.5,-68.5
       parent: 2
-  - uid: 9675
+  - uid: 9907
     components:
     - type: Transform
-      pos: 64.5,-39.5
+      pos: 54.5,-69.5
       parent: 2
-  - uid: 9676
+  - uid: 9918
     components:
     - type: Transform
-      pos: 67.5,-46.5
+      pos: 48.5,-63.5
       parent: 2
   - uid: 10011
     components:
@@ -15613,51 +16816,16 @@ entities:
     - type: Transform
       pos: -2.5,-37.5
       parent: 2
-  - uid: 10259
+  - uid: 10199
     components:
     - type: Transform
-      pos: 71.5,-46.5
+      pos: 47.5,-63.5
       parent: 2
   - uid: 10270
     components:
     - type: Transform
       pos: 68.5,-35.5
       parent: 2
-  - uid: 10275
-    components:
-    - type: Transform
-      pos: 59.5,-43.5
-      parent: 2
-  - uid: 10277
-    components:
-    - type: Transform
-      pos: 60.5,-57.5
-      parent: 2
-  - uid: 10279
-    components:
-    - type: Transform
-      pos: 60.5,-56.5
-      parent: 2
-  - uid: 10280
-    components:
-    - type: Transform
-      pos: 69.5,-48.5
-      parent: 2
-  - uid: 10281
-    components:
-    - type: Transform
-      pos: 67.5,-51.5
-      parent: 2
-  - uid: 10285
-    components:
-    - type: Transform
-      pos: 68.5,-46.5
-      parent: 2
-  - uid: 10314
-    components:
-    - type: Transform
-      pos: 71.5,-51.5
-      parent: 2
   - uid: 10329
     components:
     - type: Transform
@@ -15688,101 +16856,106 @@ entities:
     - type: Transform
       pos: -25.5,-21.5
       parent: 2
-  - uid: 10656
-    components:
-    - type: Transform
-      pos: 48.5,-65.5
-      parent: 2
   - uid: 10665
     components:
     - type: Transform
       pos: 52.5,-52.5
       parent: 2
-  - uid: 10734
+  - uid: 10709
     components:
     - type: Transform
-      pos: 70.5,-46.5
+      pos: 72.5,-68.5
       parent: 2
-  - uid: 10741
+  - uid: 10711
     components:
     - type: Transform
-      pos: 34.5,-17.5
+      pos: 73.5,-68.5
       parent: 2
-  - uid: 10742
+  - uid: 10712
     components:
     - type: Transform
-      pos: 34.5,-16.5
+      pos: 74.5,-68.5
       parent: 2
-  - uid: 10743
+  - uid: 10715
     components:
     - type: Transform
-      pos: 34.5,-15.5
+      pos: 78.5,-45.5
       parent: 2
-  - uid: 10755
+  - uid: 10716
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      pos: 81.5,-44.5
+      parent: 2
+  - uid: 10718
+    components:
+    - type: Transform
+      pos: 79.5,-46.5
+      parent: 2
+  - uid: 10751
+    components:
+    - type: Transform
+      pos: 74.5,-60.5
       parent: 2
   - uid: 10765
     components:
     - type: Transform
       pos: 65.5,-19.5
       parent: 2
-  - uid: 10777
-    components:
-    - type: Transform
-      pos: 70.5,-52.5
-      parent: 2
-  - uid: 10778
-    components:
-    - type: Transform
-      pos: 58.5,-38.5
-      parent: 2
   - uid: 10779
     components:
     - type: Transform
       pos: 35.5,-95.5
       parent: 2
-  - uid: 10782
-    components:
-    - type: Transform
-      pos: 58.5,-45.5
-      parent: 2
-  - uid: 10787
-    components:
-    - type: Transform
-      pos: 53.5,-52.5
-      parent: 2
   - uid: 10789
     components:
     - type: Transform
       pos: 40.5,-76.5
       parent: 2
-  - uid: 10792
-    components:
-    - type: Transform
-      pos: 59.5,-66.5
-      parent: 2
-  - uid: 10795
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-  - uid: 10797
-    components:
-    - type: Transform
-      pos: 68.5,-52.5
-      parent: 2
-  - uid: 10814
-    components:
-    - type: Transform
-      pos: 58.5,-31.5
-      parent: 2
   - uid: 10824
     components:
     - type: Transform
       pos: -56.5,-68.5
       parent: 2
+  - uid: 10834
+    components:
+    - type: Transform
+      pos: 98.5,-43.5
+      parent: 2
+  - uid: 10844
+    components:
+    - type: Transform
+      pos: 96.5,-43.5
+      parent: 2
+  - uid: 10845
+    components:
+    - type: Transform
+      pos: 98.5,-47.5
+      parent: 2
+  - uid: 10846
+    components:
+    - type: Transform
+      pos: 97.5,-43.5
+      parent: 2
+  - uid: 10847
+    components:
+    - type: Transform
+      pos: 97.5,-47.5
+      parent: 2
+  - uid: 10848
+    components:
+    - type: Transform
+      pos: 96.5,-47.5
+      parent: 2
+  - uid: 10858
+    components:
+    - type: Transform
+      pos: 74.5,-59.5
+      parent: 2
+  - uid: 10861
+    components:
+    - type: Transform
+      pos: 74.5,-58.5
+      parent: 2
   - uid: 10920
     components:
     - type: Transform
@@ -16513,31 +17686,6 @@ entities:
     - type: Transform
       pos: -38.5,-79.5
       parent: 2
-  - uid: 11128
-    components:
-    - type: Transform
-      pos: -39.5,-79.5
-      parent: 2
-  - uid: 11129
-    components:
-    - type: Transform
-      pos: -40.5,-79.5
-      parent: 2
-  - uid: 11130
-    components:
-    - type: Transform
-      pos: -41.5,-79.5
-      parent: 2
-  - uid: 11131
-    components:
-    - type: Transform
-      pos: -42.5,-79.5
-      parent: 2
-  - uid: 11132
-    components:
-    - type: Transform
-      pos: -43.5,-79.5
-      parent: 2
   - uid: 11133
     components:
     - type: Transform
@@ -17548,10 +18696,10 @@ entities:
     - type: Transform
       pos: -6.5,-11.5
       parent: 2
-  - uid: 11413
+  - uid: 11412
     components:
     - type: Transform
-      pos: 57.5,-48.5
+      pos: 57.5,-57.5
       parent: 2
   - uid: 11414
     components:
@@ -17563,11 +18711,6 @@ entities:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
-  - uid: 11416
-    components:
-    - type: Transform
-      pos: 60.5,-48.5
-      parent: 2
   - uid: 11417
     components:
     - type: Transform
@@ -18453,71 +19596,6 @@ entities:
     - type: Transform
       pos: 12.5,-16.5
       parent: 2
-  - uid: 11633
-    components:
-    - type: Transform
-      pos: 30.5,-24.5
-      parent: 2
-  - uid: 11634
-    components:
-    - type: Transform
-      pos: 30.5,-23.5
-      parent: 2
-  - uid: 11635
-    components:
-    - type: Transform
-      pos: 30.5,-22.5
-      parent: 2
-  - uid: 11636
-    components:
-    - type: Transform
-      pos: 30.5,-21.5
-      parent: 2
-  - uid: 11637
-    components:
-    - type: Transform
-      pos: 29.5,-21.5
-      parent: 2
-  - uid: 11638
-    components:
-    - type: Transform
-      pos: 29.5,-20.5
-      parent: 2
-  - uid: 11639
-    components:
-    - type: Transform
-      pos: 29.5,-19.5
-      parent: 2
-  - uid: 11640
-    components:
-    - type: Transform
-      pos: 29.5,-18.5
-      parent: 2
-  - uid: 11641
-    components:
-    - type: Transform
-      pos: 29.5,-17.5
-      parent: 2
-  - uid: 11642
-    components:
-    - type: Transform
-      pos: 29.5,-16.5
-      parent: 2
-  - uid: 11643
-    components:
-    - type: Transform
-      pos: 29.5,-15.5
-      parent: 2
-  - uid: 11646
-    components:
-    - type: Transform
-      pos: 30.5,-14.5
-      parent: 2
-  - uid: 11647
-    components:
-    - type: Transform
-      pos: 29.5,-23.5
-      parent: 2
   - uid: 11648
     components:
     - type: Transform
@@ -18573,36 +19651,6 @@ entities:
     - type: Transform
       pos: 34.5,-27.5
       parent: 2
-  - uid: 11659
-    components:
-    - type: Transform
-      pos: 31.5,-22.5
-      parent: 2
-  - uid: 11660
-    components:
-    - type: Transform
-      pos: 32.5,-22.5
-      parent: 2
-  - uid: 11661
-    components:
-    - type: Transform
-      pos: 33.5,-22.5
-      parent: 2
-  - uid: 11662
-    components:
-    - type: Transform
-      pos: 34.5,-22.5
-      parent: 2
-  - uid: 11663
-    components:
-    - type: Transform
-      pos: 35.5,-22.5
-      parent: 2
-  - uid: 11664
-    components:
-    - type: Transform
-      pos: 36.5,-22.5
-      parent: 2
   - uid: 11670
     components:
     - type: Transform
@@ -18613,50 +19661,100 @@ entities:
     - type: Transform
       pos: 44.5,-76.5
       parent: 2
-  - uid: 11676
-    components:
-    - type: Transform
-      pos: 34.5,-14.5
-      parent: 2
-  - uid: 11677
-    components:
-    - type: Transform
-      pos: 34.5,-12.5
-      parent: 2
   - uid: 11681
     components:
     - type: Transform
       pos: 47.5,-76.5
       parent: 2
-  - uid: 11689
+  - uid: 11703
     components:
     - type: Transform
-      pos: 49.5,-27.5
+      pos: 59.5,-32.5
       parent: 2
-  - uid: 11690
+  - uid: 11704
     components:
     - type: Transform
-      pos: 50.5,-27.5
+      pos: 58.5,-32.5
       parent: 2
-  - uid: 11691
+  - uid: 11705
     components:
     - type: Transform
-      pos: 51.5,-27.5
-      parent: 2
-  - uid: 11692
-    components:
-    - type: Transform
-      pos: 52.5,-27.5
-      parent: 2
-  - uid: 11702
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
+      pos: 57.5,-32.5
       parent: 2
   - uid: 11706
     components:
     - type: Transform
-      pos: 61.5,-48.5
+      pos: 56.5,-32.5
+      parent: 2
+  - uid: 11714
+    components:
+    - type: Transform
+      pos: 55.5,-32.5
+      parent: 2
+  - uid: 11722
+    components:
+    - type: Transform
+      pos: 54.5,-32.5
+      parent: 2
+  - uid: 11732
+    components:
+    - type: Transform
+      pos: 54.5,-31.5
+      parent: 2
+  - uid: 11733
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
+  - uid: 11734
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
+      parent: 2
+  - uid: 11735
+    components:
+    - type: Transform
+      pos: 53.5,-29.5
+      parent: 2
+  - uid: 11738
+    components:
+    - type: Transform
+      pos: 53.5,-28.5
+      parent: 2
+  - uid: 11739
+    components:
+    - type: Transform
+      pos: 52.5,-28.5
+      parent: 2
+  - uid: 11740
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
+      parent: 2
+  - uid: 11742
+    components:
+    - type: Transform
+      pos: 50.5,-28.5
+      parent: 2
+  - uid: 11750
+    components:
+    - type: Transform
+      pos: 54.5,-33.5
+      parent: 2
+  - uid: 11753
+    components:
+    - type: Transform
+      pos: 53.5,-33.5
+      parent: 2
+  - uid: 11756
+    components:
+    - type: Transform
+      pos: 52.5,-33.5
+      parent: 2
+  - uid: 11757
+    components:
+    - type: Transform
+      pos: 51.5,-33.5
       parent: 2
   - uid: 11764
     components:
@@ -18748,11 +19846,6 @@ entities:
     - type: Transform
       pos: 43.5,-23.5
       parent: 2
-  - uid: 11793
-    components:
-    - type: Transform
-      pos: 42.5,-23.5
-      parent: 2
   - uid: 11794
     components:
     - type: Transform
@@ -18873,16 +19966,16 @@ entities:
     - type: Transform
       pos: 75.5,-25.5
       parent: 2
+  - uid: 11827
+    components:
+    - type: Transform
+      pos: 52.5,-34.5
+      parent: 2
   - uid: 11829
     components:
     - type: Transform
       pos: 73.5,-27.5
       parent: 2
-  - uid: 11830
-    components:
-    - type: Transform
-      pos: 73.5,-28.5
-      parent: 2
   - uid: 11831
     components:
     - type: Transform
@@ -18893,21 +19986,6 @@ entities:
     - type: Transform
       pos: 72.5,-29.5
       parent: 2
-  - uid: 11833
-    components:
-    - type: Transform
-      pos: 71.5,-29.5
-      parent: 2
-  - uid: 11834
-    components:
-    - type: Transform
-      pos: 71.5,-30.5
-      parent: 2
-  - uid: 11835
-    components:
-    - type: Transform
-      pos: 71.5,-31.5
-      parent: 2
   - uid: 11836
     components:
     - type: Transform
@@ -18918,50 +19996,35 @@ entities:
     - type: Transform
       pos: 73.5,-31.5
       parent: 2
-  - uid: 11838
-    components:
-    - type: Transform
-      pos: 73.5,-33.5
-      parent: 2
-  - uid: 11839
-    components:
-    - type: Transform
-      pos: 73.5,-32.5
-      parent: 2
-  - uid: 11840
-    components:
-    - type: Transform
-      pos: 72.5,-33.5
-      parent: 2
   - uid: 11841
     components:
     - type: Transform
       pos: 76.5,-44.5
       parent: 2
+  - uid: 11845
+    components:
+    - type: Transform
+      pos: 52.5,-35.5
+      parent: 2
+  - uid: 11846
+    components:
+    - type: Transform
+      pos: 52.5,-36.5
+      parent: 2
   - uid: 11849
     components:
     - type: Transform
-      pos: 75.5,-41.5
+      pos: 51.5,-36.5
       parent: 2
-  - uid: 11854
+  - uid: 11850
     components:
     - type: Transform
-      pos: 77.5,-38.5
+      pos: 51.5,-37.5
       parent: 2
-  - uid: 11855
+  - uid: 11851
     components:
     - type: Transform
-      pos: 77.5,-37.5
-      parent: 2
-  - uid: 11856
-    components:
-    - type: Transform
-      pos: 77.5,-36.5
-      parent: 2
-  - uid: 11857
-    components:
-    - type: Transform
-      pos: 78.5,-36.5
+      pos: 50.5,-37.5
       parent: 2
   - uid: 11858
     components:
@@ -18988,40 +20051,10 @@ entities:
     - type: Transform
       pos: 79.5,-32.5
       parent: 2
-  - uid: 11863
+  - uid: 11871
     components:
     - type: Transform
-      pos: 78.5,-32.5
-      parent: 2
-  - uid: 11864
-    components:
-    - type: Transform
-      pos: 77.5,-32.5
-      parent: 2
-  - uid: 11865
-    components:
-    - type: Transform
-      pos: 76.5,-32.5
-      parent: 2
-  - uid: 11866
-    components:
-    - type: Transform
-      pos: 75.5,-32.5
-      parent: 2
-  - uid: 11867
-    components:
-    - type: Transform
-      pos: 75.5,-31.5
-      parent: 2
-  - uid: 11868
-    components:
-    - type: Transform
-      pos: 75.5,-30.5
-      parent: 2
-  - uid: 11869
-    components:
-    - type: Transform
-      pos: 74.5,-38.5
+      pos: 52.5,-38.5
       parent: 2
   - uid: 11873
     components:
@@ -19058,11 +20091,6 @@ entities:
     - type: Transform
       pos: 76.5,-54.5
       parent: 2
-  - uid: 11880
-    components:
-    - type: Transform
-      pos: 76.5,-55.5
-      parent: 2
   - uid: 11881
     components:
     - type: Transform
@@ -19073,165 +20101,45 @@ entities:
     - type: Transform
       pos: 77.5,-56.5
       parent: 2
-  - uid: 11883
-    components:
-    - type: Transform
-      pos: 77.5,-57.5
-      parent: 2
-  - uid: 11884
-    components:
-    - type: Transform
-      pos: 73.5,-66.5
-      parent: 2
   - uid: 11885
     components:
     - type: Transform
-      pos: 73.5,-65.5
-      parent: 2
-  - uid: 11886
-    components:
-    - type: Transform
-      pos: 72.5,-65.5
-      parent: 2
-  - uid: 11887
-    components:
-    - type: Transform
-      pos: 71.5,-65.5
+      pos: 59.5,-64.5
       parent: 2
   - uid: 11888
     components:
     - type: Transform
-      pos: 70.5,-65.5
+      pos: 54.5,-34.5
       parent: 2
   - uid: 11889
     components:
     - type: Transform
-      pos: 70.5,-64.5
-      parent: 2
-  - uid: 11890
-    components:
-    - type: Transform
-      pos: 70.5,-63.5
-      parent: 2
-  - uid: 11891
-    components:
-    - type: Transform
-      pos: 70.5,-62.5
-      parent: 2
-  - uid: 11892
-    components:
-    - type: Transform
-      pos: 74.5,-65.5
-      parent: 2
-  - uid: 11893
-    components:
-    - type: Transform
-      pos: 74.5,-64.5
+      pos: 58.5,-64.5
       parent: 2
   - uid: 11894
     components:
     - type: Transform
-      pos: 74.5,-63.5
-      parent: 2
-  - uid: 11895
-    components:
-    - type: Transform
-      pos: 74.5,-62.5
+      pos: 57.5,-75.5
       parent: 2
   - uid: 11896
     components:
     - type: Transform
-      pos: 74.5,-61.5
+      pos: 55.5,-76.5
       parent: 2
   - uid: 11897
     components:
     - type: Transform
-      pos: 74.5,-60.5
+      pos: 54.5,-76.5
       parent: 2
-  - uid: 11898
+  - uid: 11909
     components:
     - type: Transform
-      pos: 74.5,-59.5
-      parent: 2
-  - uid: 11899
-    components:
-    - type: Transform
-      pos: 74.5,-58.5
-      parent: 2
-  - uid: 11900
-    components:
-    - type: Transform
-      pos: 73.5,-58.5
-      parent: 2
-  - uid: 11901
-    components:
-    - type: Transform
-      pos: 72.5,-58.5
-      parent: 2
-  - uid: 11902
-    components:
-    - type: Transform
-      pos: 71.5,-58.5
-      parent: 2
-  - uid: 11903
-    components:
-    - type: Transform
-      pos: 70.5,-58.5
-      parent: 2
-  - uid: 11904
-    components:
-    - type: Transform
-      pos: 69.5,-58.5
-      parent: 2
-  - uid: 11905
-    components:
-    - type: Transform
-      pos: 69.5,-57.5
-      parent: 2
-  - uid: 11906
-    components:
-    - type: Transform
-      pos: 68.5,-57.5
-      parent: 2
-  - uid: 11908
-    components:
-    - type: Transform
-      pos: 66.5,-57.5
-      parent: 2
-  - uid: 11910
-    components:
-    - type: Transform
-      pos: 71.5,-66.5
+      pos: 55.5,-34.5
       parent: 2
   - uid: 11911
     components:
     - type: Transform
-      pos: 71.5,-67.5
-      parent: 2
-  - uid: 11912
-    components:
-    - type: Transform
-      pos: 71.5,-68.5
-      parent: 2
-  - uid: 11913
-    components:
-    - type: Transform
-      pos: 72.5,-68.5
-      parent: 2
-  - uid: 11914
-    components:
-    - type: Transform
-      pos: 73.5,-68.5
-      parent: 2
-  - uid: 11915
-    components:
-    - type: Transform
-      pos: 74.5,-68.5
-      parent: 2
-  - uid: 11919
-    components:
-    - type: Transform
-      pos: 77.5,-67.5
+      pos: 55.5,-36.5
       parent: 2
   - uid: 11921
     components:
@@ -19303,15 +20211,45 @@ entities:
     - type: Transform
       pos: 51.5,-101.5
       parent: 2
-  - uid: 11945
+  - uid: 11939
     components:
     - type: Transform
-      pos: 52.5,-70.5
+      pos: 55.5,-37.5
       parent: 2
-  - uid: 11947
+  - uid: 11940
     components:
     - type: Transform
-      pos: 53.5,-70.5
+      pos: 55.5,-38.5
+      parent: 2
+  - uid: 11941
+    components:
+    - type: Transform
+      pos: 57.5,-39.5
+      parent: 2
+  - uid: 11949
+    components:
+    - type: Transform
+      pos: 58.5,-39.5
+      parent: 2
+  - uid: 11950
+    components:
+    - type: Transform
+      pos: 59.5,-39.5
+      parent: 2
+  - uid: 11953
+    components:
+    - type: Transform
+      pos: 65.5,-31.5
+      parent: 2
+  - uid: 11955
+    components:
+    - type: Transform
+      pos: 65.5,-32.5
+      parent: 2
+  - uid: 11957
+    components:
+    - type: Transform
+      pos: 65.5,-33.5
       parent: 2
   - uid: 11958
     components:
@@ -19403,41 +20341,6 @@ entities:
     - type: Transform
       pos: 40.5,-40.5
       parent: 2
-  - uid: 11976
-    components:
-    - type: Transform
-      pos: 44.5,-43.5
-      parent: 2
-  - uid: 11977
-    components:
-    - type: Transform
-      pos: 45.5,-43.5
-      parent: 2
-  - uid: 11978
-    components:
-    - type: Transform
-      pos: 46.5,-43.5
-      parent: 2
-  - uid: 11979
-    components:
-    - type: Transform
-      pos: 47.5,-43.5
-      parent: 2
-  - uid: 11980
-    components:
-    - type: Transform
-      pos: 47.5,-42.5
-      parent: 2
-  - uid: 11981
-    components:
-    - type: Transform
-      pos: 47.5,-41.5
-      parent: 2
-  - uid: 11982
-    components:
-    - type: Transform
-      pos: 47.5,-44.5
-      parent: 2
   - uid: 11983
     components:
     - type: Transform
@@ -20338,16 +21241,6 @@ entities:
     - type: Transform
       pos: 54.5,-100.5
       parent: 2
-  - uid: 12242
-    components:
-    - type: Transform
-      pos: 54.5,-99.5
-      parent: 2
-  - uid: 12243
-    components:
-    - type: Transform
-      pos: 54.5,-98.5
-      parent: 2
   - uid: 12244
     components:
     - type: Transform
@@ -21103,30 +21996,10 @@ entities:
     - type: Transform
       pos: 6.5,-77.5
       parent: 2
-  - uid: 12407
-    components:
-    - type: Transform
-      pos: 6.5,-76.5
-      parent: 2
-  - uid: 12408
-    components:
-    - type: Transform
-      pos: 6.5,-75.5
-      parent: 2
-  - uid: 12409
-    components:
-    - type: Transform
-      pos: 6.5,-74.5
-      parent: 2
-  - uid: 12410
-    components:
-    - type: Transform
-      pos: 6.5,-73.5
-      parent: 2
   - uid: 12411
     components:
     - type: Transform
-      pos: 6.5,-72.5
+      pos: 5.5,-75.5
       parent: 2
   - uid: 12412
     components:
@@ -21743,6 +22616,11 @@ entities:
     - type: Transform
       pos: -19.5,-30.5
       parent: 2
+  - uid: 12579
+    components:
+    - type: Transform
+      pos: 59.5,-36.5
+      parent: 2
   - uid: 12595
     components:
     - type: Transform
@@ -22303,6 +23181,11 @@ entities:
     - type: Transform
       pos: -28.5,-16.5
       parent: 2
+  - uid: 12729
+    components:
+    - type: Transform
+      pos: 60.5,-36.5
+      parent: 2
   - uid: 12731
     components:
     - type: Transform
@@ -22368,31 +23251,6 @@ entities:
     - type: Transform
       pos: -49.5,-61.5
       parent: 2
-  - uid: 12744
-    components:
-    - type: Transform
-      pos: -36.5,-76.5
-      parent: 2
-  - uid: 12745
-    components:
-    - type: Transform
-      pos: -37.5,-76.5
-      parent: 2
-  - uid: 12746
-    components:
-    - type: Transform
-      pos: -38.5,-76.5
-      parent: 2
-  - uid: 12747
-    components:
-    - type: Transform
-      pos: -39.5,-76.5
-      parent: 2
-  - uid: 12748
-    components:
-    - type: Transform
-      pos: -40.5,-76.5
-      parent: 2
   - uid: 12749
     components:
     - type: Transform
@@ -22586,27 +23444,7 @@ entities:
   - uid: 12792
     components:
     - type: Transform
-      pos: 42.5,-73.5
-      parent: 2
-  - uid: 12793
-    components:
-    - type: Transform
-      pos: 41.5,-73.5
-      parent: 2
-  - uid: 12794
-    components:
-    - type: Transform
-      pos: 40.5,-73.5
-      parent: 2
-  - uid: 12795
-    components:
-    - type: Transform
-      pos: 39.5,-73.5
-      parent: 2
-  - uid: 12796
-    components:
-    - type: Transform
-      pos: 38.5,-73.5
+      pos: 42.5,-27.5
       parent: 2
   - uid: 12798
     components:
@@ -22633,6 +23471,11 @@ entities:
     - type: Transform
       pos: 66.5,-33.5
       parent: 2
+  - uid: 12805
+    components:
+    - type: Transform
+      pos: 59.5,-37.5
+      parent: 2
   - uid: 12806
     components:
     - type: Transform
@@ -22701,12 +23544,37 @@ entities:
   - uid: 12819
     components:
     - type: Transform
-      pos: 64.5,-33.5
+      pos: 59.5,-38.5
+      parent: 2
+  - uid: 12822
+    components:
+    - type: Transform
+      pos: 60.5,-32.5
+      parent: 2
+  - uid: 12828
+    components:
+    - type: Transform
+      pos: 62.5,-32.5
+      parent: 2
+  - uid: 12829
+    components:
+    - type: Transform
+      pos: 61.5,-32.5
+      parent: 2
+  - uid: 12830
+    components:
+    - type: Transform
+      pos: 62.5,-33.5
+      parent: 2
+  - uid: 12832
+    components:
+    - type: Transform
+      pos: 62.5,-34.5
       parent: 2
   - uid: 12835
     components:
     - type: Transform
-      pos: 59.5,-33.5
+      pos: 62.5,-35.5
       parent: 2
   - uid: 12836
     components:
@@ -22716,22 +23584,22 @@ entities:
   - uid: 12837
     components:
     - type: Transform
-      pos: 59.5,-32.5
+      pos: 62.5,-36.5
       parent: 2
   - uid: 12838
     components:
     - type: Transform
-      pos: 61.5,-38.5
+      pos: 62.5,-37.5
       parent: 2
   - uid: 12839
     components:
     - type: Transform
       pos: 62.5,-38.5
       parent: 2
-  - uid: 12842
+  - uid: 12840
     components:
     - type: Transform
-      pos: 57.5,-75.5
+      pos: 62.5,-39.5
       parent: 2
   - uid: 12843
     components:
@@ -22743,6 +23611,31 @@ entities:
     - type: Transform
       pos: 59.5,-75.5
       parent: 2
+  - uid: 12855
+    components:
+    - type: Transform
+      pos: 62.5,-40.5
+      parent: 2
+  - uid: 12856
+    components:
+    - type: Transform
+      pos: 63.5,-36.5
+      parent: 2
+  - uid: 12857
+    components:
+    - type: Transform
+      pos: 64.5,-36.5
+      parent: 2
+  - uid: 12858
+    components:
+    - type: Transform
+      pos: 67.5,-48.5
+      parent: 2
+  - uid: 12860
+    components:
+    - type: Transform
+      pos: 66.5,-48.5
+      parent: 2
   - uid: 12861
     components:
     - type: Transform
@@ -22783,6 +23676,16 @@ entities:
     - type: Transform
       pos: 65.5,-73.5
       parent: 2
+  - uid: 12882
+    components:
+    - type: Transform
+      pos: 65.5,-48.5
+      parent: 2
+  - uid: 12883
+    components:
+    - type: Transform
+      pos: 65.5,-49.5
+      parent: 2
   - uid: 12888
     components:
     - type: Transform
@@ -22838,11 +23741,21 @@ entities:
     - type: Transform
       pos: 29.5,-66.5
       parent: 2
+  - uid: 12912
+    components:
+    - type: Transform
+      pos: 65.5,-50.5
+      parent: 2
   - uid: 12913
     components:
     - type: Transform
       pos: 53.5,-55.5
       parent: 2
+  - uid: 12914
+    components:
+    - type: Transform
+      pos: 65.5,-51.5
+      parent: 2
   - uid: 12917
     components:
     - type: Transform
@@ -22873,270 +23786,130 @@ entities:
     - type: Transform
       pos: 43.5,-49.5
       parent: 2
-  - uid: 12933
+  - uid: 12927
     components:
     - type: Transform
-      pos: 48.5,-35.5
+      pos: 66.5,-51.5
+      parent: 2
+  - uid: 12930
+    components:
+    - type: Transform
+      pos: 66.5,-52.5
+      parent: 2
+  - uid: 12931
+    components:
+    - type: Transform
+      pos: 67.5,-52.5
+      parent: 2
+  - uid: 12932
+    components:
+    - type: Transform
+      pos: 68.5,-52.5
+      parent: 2
+  - uid: 12934
+    components:
+    - type: Transform
+      pos: 69.5,-52.5
       parent: 2
   - uid: 12935
     components:
     - type: Transform
-      pos: 47.5,-35.5
+      pos: 70.5,-52.5
       parent: 2
   - uid: 12936
     components:
     - type: Transform
-      pos: 46.5,-35.5
+      pos: 68.5,-48.5
       parent: 2
   - uid: 12937
     components:
     - type: Transform
-      pos: 46.5,-36.5
+      pos: 69.5,-48.5
       parent: 2
   - uid: 12938
     components:
     - type: Transform
-      pos: 46.5,-37.5
+      pos: 70.5,-48.5
       parent: 2
   - uid: 12939
     components:
     - type: Transform
-      pos: 45.5,-37.5
+      pos: 71.5,-48.5
       parent: 2
   - uid: 12940
     components:
     - type: Transform
-      pos: 44.5,-37.5
+      pos: 72.5,-48.5
       parent: 2
   - uid: 12941
     components:
     - type: Transform
-      pos: 44.5,-36.5
-      parent: 2
-  - uid: 12942
-    components:
-    - type: Transform
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 12943
-    components:
-    - type: Transform
-      pos: 43.5,-35.5
-      parent: 2
-  - uid: 12944
-    components:
-    - type: Transform
-      pos: 42.5,-35.5
+      pos: 72.5,-47.5
       parent: 2
   - uid: 12945
     components:
     - type: Transform
-      pos: 42.5,-36.5
+      pos: 72.5,-46.5
       parent: 2
   - uid: 12946
     components:
     - type: Transform
-      pos: 42.5,-37.5
+      pos: 69.5,-47.5
       parent: 2
   - uid: 12947
     components:
     - type: Transform
-      pos: 42.5,-38.5
+      pos: 72.5,-49.5
       parent: 2
   - uid: 12948
     components:
     - type: Transform
-      pos: 41.5,-38.5
+      pos: 65.5,-47.5
       parent: 2
   - uid: 12949
     components:
     - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
-  - uid: 12950
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
+      pos: 65.5,-46.5
       parent: 2
   - uid: 12951
     components:
     - type: Transform
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 12952
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
+      pos: 65.5,-45.5
       parent: 2
   - uid: 12953
     components:
     - type: Transform
-      pos: 39.5,-35.5
+      pos: 65.5,-44.5
       parent: 2
   - uid: 12954
     components:
     - type: Transform
-      pos: 38.5,-35.5
-      parent: 2
-  - uid: 12955
-    components:
-    - type: Transform
-      pos: 38.5,-34.5
-      parent: 2
-  - uid: 12956
-    components:
-    - type: Transform
-      pos: 38.5,-33.5
-      parent: 2
-  - uid: 12957
-    components:
-    - type: Transform
-      pos: 49.5,-35.5
-      parent: 2
-  - uid: 12958
-    components:
-    - type: Transform
-      pos: 50.5,-35.5
-      parent: 2
-  - uid: 12959
-    components:
-    - type: Transform
-      pos: 50.5,-36.5
-      parent: 2
-  - uid: 12960
-    components:
-    - type: Transform
-      pos: 50.5,-37.5
-      parent: 2
-  - uid: 12961
-    components:
-    - type: Transform
-      pos: 50.5,-38.5
-      parent: 2
-  - uid: 12962
-    components:
-    - type: Transform
-      pos: 50.5,-39.5
-      parent: 2
-  - uid: 12963
-    components:
-    - type: Transform
-      pos: 50.5,-40.5
-      parent: 2
-  - uid: 12964
-    components:
-    - type: Transform
-      pos: 51.5,-40.5
-      parent: 2
-  - uid: 12965
-    components:
-    - type: Transform
-      pos: 52.5,-40.5
+      pos: 65.5,-43.5
       parent: 2
   - uid: 12966
     components:
     - type: Transform
-      pos: 52.5,-41.5
+      pos: 65.5,-42.5
       parent: 2
   - uid: 12967
     components:
     - type: Transform
-      pos: 52.5,-42.5
+      pos: 65.5,-41.5
       parent: 2
   - uid: 12969
     components:
     - type: Transform
-      pos: 48.5,-33.5
+      pos: 65.5,-40.5
       parent: 2
   - uid: 12970
     components:
     - type: Transform
-      pos: 49.5,-33.5
-      parent: 2
-  - uid: 12974
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
-  - uid: 12976
-    components:
-    - type: Transform
-      pos: 50.5,-29.5
-      parent: 2
-  - uid: 12977
-    components:
-    - type: Transform
-      pos: 51.5,-29.5
-      parent: 2
-  - uid: 12978
-    components:
-    - type: Transform
-      pos: 52.5,-29.5
+      pos: 66.5,-40.5
       parent: 2
   - uid: 12979
     components:
     - type: Transform
-      pos: 47.5,-33.5
-      parent: 2
-  - uid: 12980
-    components:
-    - type: Transform
-      pos: 46.5,-33.5
-      parent: 2
-  - uid: 12981
-    components:
-    - type: Transform
-      pos: 46.5,-32.5
-      parent: 2
-  - uid: 12982
-    components:
-    - type: Transform
-      pos: 46.5,-31.5
-      parent: 2
-  - uid: 12983
-    components:
-    - type: Transform
-      pos: 45.5,-31.5
-      parent: 2
-  - uid: 12984
-    components:
-    - type: Transform
-      pos: 44.5,-31.5
-      parent: 2
-  - uid: 12985
-    components:
-    - type: Transform
-      pos: 44.5,-32.5
-      parent: 2
-  - uid: 12986
-    components:
-    - type: Transform
-      pos: 44.5,-33.5
-      parent: 2
-  - uid: 12987
-    components:
-    - type: Transform
-      pos: 43.5,-33.5
-      parent: 2
-  - uid: 12988
-    components:
-    - type: Transform
-      pos: 42.5,-33.5
-      parent: 2
-  - uid: 12989
-    components:
-    - type: Transform
-      pos: 42.5,-32.5
-      parent: 2
-  - uid: 12993
-    components:
-    - type: Transform
-      pos: 40.5,-32.5
-      parent: 2
-  - uid: 12994
-    components:
-    - type: Transform
-      pos: 40.5,-33.5
+      pos: 67.5,-40.5
       parent: 2
   - uid: 12995
     components:
@@ -23226,42 +23999,42 @@ entities:
   - uid: 13012
     components:
     - type: Transform
-      pos: 24.5,-22.5
+      pos: 68.5,-40.5
       parent: 2
   - uid: 13013
     components:
     - type: Transform
-      pos: 24.5,-21.5
+      pos: 69.5,-40.5
       parent: 2
   - uid: 13014
     components:
     - type: Transform
-      pos: 24.5,-20.5
+      pos: 70.5,-40.5
       parent: 2
   - uid: 13015
     components:
     - type: Transform
-      pos: 24.5,-19.5
+      pos: 71.5,-40.5
       parent: 2
   - uid: 13016
     components:
     - type: Transform
-      pos: 24.5,-18.5
+      pos: 71.5,-41.5
       parent: 2
   - uid: 13017
     components:
     - type: Transform
-      pos: 24.5,-17.5
+      pos: 69.5,-39.5
       parent: 2
   - uid: 13018
     components:
     - type: Transform
-      pos: 24.5,-16.5
+      pos: 71.5,-39.5
       parent: 2
   - uid: 13019
     components:
     - type: Transform
-      pos: 24.5,-15.5
+      pos: 71.5,-42.5
       parent: 2
   - uid: 13020
     components:
@@ -23608,6 +24381,11 @@ entities:
     - type: Transform
       pos: -2.5,-40.5
       parent: 2
+  - uid: 13106
+    components:
+    - type: Transform
+      pos: 71.5,-43.5
+      parent: 2
   - uid: 13107
     components:
     - type: Transform
@@ -23748,11 +24526,6 @@ entities:
     - type: Transform
       pos: -7.5,-29.5
       parent: 2
-  - uid: 13135
-    components:
-    - type: Transform
-      pos: -12.5,-35.5
-      parent: 2
   - uid: 13136
     components:
     - type: Transform
@@ -23763,11 +24536,6 @@ entities:
     - type: Transform
       pos: -11.5,-34.5
       parent: 2
-  - uid: 13138
-    components:
-    - type: Transform
-      pos: -11.5,-35.5
-      parent: 2
   - uid: 13139
     components:
     - type: Transform
@@ -23833,6 +24601,31 @@ entities:
     - type: Transform
       pos: 4.5,-37.5
       parent: 2
+  - uid: 13154
+    components:
+    - type: Transform
+      pos: 71.5,-44.5
+      parent: 2
+  - uid: 13155
+    components:
+    - type: Transform
+      pos: 72.5,-44.5
+      parent: 2
+  - uid: 13156
+    components:
+    - type: Transform
+      pos: 73.5,-44.5
+      parent: 2
+  - uid: 13157
+    components:
+    - type: Transform
+      pos: 72.5,-45.5
+      parent: 2
+  - uid: 13161
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
   - uid: 13174
     components:
     - type: Transform
@@ -23903,6 +24696,11 @@ entities:
     - type: Transform
       pos: 8.5,-59.5
       parent: 2
+  - uid: 13198
+    components:
+    - type: Transform
+      pos: 65.5,-36.5
+      parent: 2
   - uid: 13199
     components:
     - type: Transform
@@ -24068,31 +24866,6 @@ entities:
     - type: Transform
       pos: 37.5,-88.5
       parent: 2
-  - uid: 13253
-    components:
-    - type: Transform
-      pos: 74.5,-69.5
-      parent: 2
-  - uid: 13254
-    components:
-    - type: Transform
-      pos: 75.5,-69.5
-      parent: 2
-  - uid: 13255
-    components:
-    - type: Transform
-      pos: 76.5,-69.5
-      parent: 2
-  - uid: 13256
-    components:
-    - type: Transform
-      pos: 77.5,-69.5
-      parent: 2
-  - uid: 13257
-    components:
-    - type: Transform
-      pos: 77.5,-70.5
-      parent: 2
   - uid: 13258
     components:
     - type: Transform
@@ -24213,15 +24986,150 @@ entities:
     - type: Transform
       pos: 16.5,-67.5
       parent: 2
-  - uid: 13645
+  - uid: 13634
     components:
     - type: Transform
-      pos: 59.5,-74.5
+      pos: 34.5,-68.5
+      parent: 2
+  - uid: 13689
+    components:
+    - type: Transform
+      pos: 58.5,-48.5
+      parent: 2
+  - uid: 13690
+    components:
+    - type: Transform
+      pos: 59.5,-48.5
+      parent: 2
+  - uid: 13691
+    components:
+    - type: Transform
+      pos: 57.5,-48.5
+      parent: 2
+  - uid: 13692
+    components:
+    - type: Transform
+      pos: 59.5,-49.5
+      parent: 2
+  - uid: 13693
+    components:
+    - type: Transform
+      pos: 59.5,-50.5
+      parent: 2
+  - uid: 13694
+    components:
+    - type: Transform
+      pos: 61.5,-51.5
+      parent: 2
+  - uid: 13695
+    components:
+    - type: Transform
+      pos: 61.5,-50.5
+      parent: 2
+  - uid: 13696
+    components:
+    - type: Transform
+      pos: 61.5,-49.5
+      parent: 2
+  - uid: 13697
+    components:
+    - type: Transform
+      pos: 61.5,-48.5
+      parent: 2
+  - uid: 13698
+    components:
+    - type: Transform
+      pos: 61.5,-47.5
+      parent: 2
+  - uid: 13699
+    components:
+    - type: Transform
+      pos: 60.5,-47.5
+      parent: 2
+  - uid: 13700
+    components:
+    - type: Transform
+      pos: 59.5,-47.5
+      parent: 2
+  - uid: 13701
+    components:
+    - type: Transform
+      pos: 62.5,-48.5
+      parent: 2
+  - uid: 13721
+    components:
+    - type: Transform
+      pos: 60.5,-51.5
+      parent: 2
+  - uid: 13789
+    components:
+    - type: Transform
+      pos: 59.5,-51.5
+      parent: 2
+  - uid: 13790
+    components:
+    - type: Transform
+      pos: 60.5,-46.5
+      parent: 2
+  - uid: 13791
+    components:
+    - type: Transform
+      pos: 60.5,-45.5
+      parent: 2
+  - uid: 13792
+    components:
+    - type: Transform
+      pos: 60.5,-44.5
+      parent: 2
+  - uid: 13793
+    components:
+    - type: Transform
+      pos: 59.5,-44.5
+      parent: 2
+  - uid: 13797
+    components:
+    - type: Transform
+      pos: 58.5,-44.5
+      parent: 2
+  - uid: 13798
+    components:
+    - type: Transform
+      pos: 61.5,-44.5
+      parent: 2
+  - uid: 13799
+    components:
+    - type: Transform
+      pos: 56.5,-39.5
       parent: 2
   - uid: 13800
     components:
     - type: Transform
-      pos: 64.5,-40.5
+      pos: 55.5,-39.5
+      parent: 2
+  - uid: 13801
+    components:
+    - type: Transform
+      pos: 56.5,-36.5
+      parent: 2
+  - uid: 13809
+    components:
+    - type: Transform
+      pos: 57.5,-36.5
+      parent: 2
+  - uid: 13810
+    components:
+    - type: Transform
+      pos: 58.5,-36.5
+      parent: 2
+  - uid: 13815
+    components:
+    - type: Transform
+      pos: 56.5,-31.5
+      parent: 2
+  - uid: 13816
+    components:
+    - type: Transform
+      pos: 56.5,-30.5
       parent: 2
   - uid: 13817
     components:
@@ -24233,10 +25141,20 @@ entities:
     - type: Transform
       pos: 48.5,-52.5
       parent: 2
+  - uid: 13819
+    components:
+    - type: Transform
+      pos: 56.5,-29.5
+      parent: 2
+  - uid: 13821
+    components:
+    - type: Transform
+      pos: 56.5,-28.5
+      parent: 2
   - uid: 13822
     components:
     - type: Transform
-      pos: 65.5,-42.5
+      pos: 56.5,-27.5
       parent: 2
   - uid: 13823
     components:
@@ -24248,20 +25166,70 @@ entities:
     - type: Transform
       pos: 59.5,-30.5
       parent: 2
+  - uid: 13825
+    components:
+    - type: Transform
+      pos: 56.5,-26.5
+      parent: 2
+  - uid: 13826
+    components:
+    - type: Transform
+      pos: 69.5,-29.5
+      parent: 2
+  - uid: 13827
+    components:
+    - type: Transform
+      pos: 67.5,-29.5
+      parent: 2
+  - uid: 13828
+    components:
+    - type: Transform
+      pos: 70.5,-28.5
+      parent: 2
+  - uid: 13830
+    components:
+    - type: Transform
+      pos: 65.5,-26.5
+      parent: 2
+  - uid: 13831
+    components:
+    - type: Transform
+      pos: 65.5,-25.5
+      parent: 2
+  - uid: 13832
+    components:
+    - type: Transform
+      pos: 65.5,-24.5
+      parent: 2
+  - uid: 13834
+    components:
+    - type: Transform
+      pos: 66.5,-24.5
+      parent: 2
+  - uid: 13841
+    components:
+    - type: Transform
+      pos: 69.5,-44.5
+      parent: 2
+  - uid: 13848
+    components:
+    - type: Transform
+      pos: 68.5,-44.5
+      parent: 2
+  - uid: 13851
+    components:
+    - type: Transform
+      pos: 67.5,-44.5
+      parent: 2
   - uid: 13854
     components:
     - type: Transform
-      pos: 70.5,-42.5
-      parent: 2
-  - uid: 13858
-    components:
-    - type: Transform
-      pos: 60.5,-63.5
+      pos: 66.5,-44.5
       parent: 2
   - uid: 13862
     components:
     - type: Transform
-      pos: 59.5,-64.5
+      pos: 50.5,-45.5
       parent: 2
   - uid: 13863
     components:
@@ -24273,35 +25241,265 @@ entities:
     - type: Transform
       pos: 75.5,-23.5
       parent: 2
+  - uid: 13867
+    components:
+    - type: Transform
+      pos: 51.5,-45.5
+      parent: 2
+  - uid: 13869
+    components:
+    - type: Transform
+      pos: 51.5,-46.5
+      parent: 2
+  - uid: 13870
+    components:
+    - type: Transform
+      pos: 51.5,-47.5
+      parent: 2
+  - uid: 13872
+    components:
+    - type: Transform
+      pos: 51.5,-48.5
+      parent: 2
+  - uid: 13875
+    components:
+    - type: Transform
+      pos: 52.5,-44.5
+      parent: 2
+  - uid: 13877
+    components:
+    - type: Transform
+      pos: 53.5,-44.5
+      parent: 2
+  - uid: 13878
+    components:
+    - type: Transform
+      pos: 59.5,-56.5
+      parent: 2
+  - uid: 13882
+    components:
+    - type: Transform
+      pos: 53.5,-43.5
+      parent: 2
+  - uid: 13894
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+  - uid: 13895
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 13896
+    components:
+    - type: Transform
+      pos: 56.5,-42.5
+      parent: 2
+  - uid: 13897
+    components:
+    - type: Transform
+      pos: 57.5,-42.5
+      parent: 2
+  - uid: 13898
+    components:
+    - type: Transform
+      pos: 58.5,-42.5
+      parent: 2
+  - uid: 13902
+    components:
+    - type: Transform
+      pos: 59.5,-42.5
+      parent: 2
+  - uid: 13907
+    components:
+    - type: Transform
+      pos: 58.5,-65.5
+      parent: 2
+  - uid: 13910
+    components:
+    - type: Transform
+      pos: 60.5,-42.5
+      parent: 2
+  - uid: 13915
+    components:
+    - type: Transform
+      pos: 61.5,-42.5
+      parent: 2
   - uid: 13916
     components:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
+  - uid: 13917
+    components:
+    - type: Transform
+      pos: 55.5,-46.5
+      parent: 2
+  - uid: 13920
+    components:
+    - type: Transform
+      pos: 55.5,-47.5
+      parent: 2
+  - uid: 13921
+    components:
+    - type: Transform
+      pos: 55.5,-48.5
+      parent: 2
+  - uid: 13922
+    components:
+    - type: Transform
+      pos: 55.5,-49.5
+      parent: 2
+  - uid: 13923
+    components:
+    - type: Transform
+      pos: 55.5,-50.5
+      parent: 2
+  - uid: 13924
+    components:
+    - type: Transform
+      pos: 55.5,-51.5
+      parent: 2
+  - uid: 13925
+    components:
+    - type: Transform
+      pos: 55.5,-52.5
+      parent: 2
+  - uid: 13926
+    components:
+    - type: Transform
+      pos: 62.5,-59.5
+      parent: 2
+  - uid: 13927
+    components:
+    - type: Transform
+      pos: 56.5,-53.5
+      parent: 2
+  - uid: 13928
+    components:
+    - type: Transform
+      pos: 59.5,-59.5
+      parent: 2
+  - uid: 13929
+    components:
+    - type: Transform
+      pos: 57.5,-54.5
+      parent: 2
+  - uid: 13930
+    components:
+    - type: Transform
+      pos: 58.5,-54.5
+      parent: 2
+  - uid: 13931
+    components:
+    - type: Transform
+      pos: 58.5,-55.5
+      parent: 2
+  - uid: 13933
+    components:
+    - type: Transform
+      pos: 59.5,-55.5
+      parent: 2
+  - uid: 13934
+    components:
+    - type: Transform
+      pos: 54.5,-43.5
+      parent: 2
+  - uid: 13935
+    components:
+    - type: Transform
+      pos: 60.5,-56.5
+      parent: 2
+  - uid: 13936
+    components:
+    - type: Transform
+      pos: 61.5,-56.5
+      parent: 2
+  - uid: 13937
+    components:
+    - type: Transform
+      pos: 62.5,-56.5
+      parent: 2
+  - uid: 13940
+    components:
+    - type: Transform
+      pos: 63.5,-56.5
+      parent: 2
+  - uid: 13986
+    components:
+    - type: Transform
+      pos: 64.5,-56.5
+      parent: 2
+  - uid: 14082
+    components:
+    - type: Transform
+      pos: 60.5,-57.5
+      parent: 2
+  - uid: 14083
+    components:
+    - type: Transform
+      pos: 60.5,-58.5
+      parent: 2
   - uid: 14086
     components:
     - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 14093
-    components:
-    - type: Transform
-      pos: 78.5,-40.5
+      pos: 60.5,-59.5
       parent: 2
   - uid: 14096
     components:
     - type: Transform
       pos: 78.5,-39.5
       parent: 2
+  - uid: 14118
+    components:
+    - type: Transform
+      pos: 73.5,-58.5
+      parent: 2
   - uid: 14199
     components:
     - type: Transform
       pos: -34.5,-10.5
       parent: 2
+  - uid: 14200
+    components:
+    - type: Transform
+      pos: 77.5,-36.5
+      parent: 2
   - uid: 14212
     components:
     - type: Transform
-      pos: 50.5,-51.5
+      pos: 72.5,-58.5
+      parent: 2
+  - uid: 14240
+    components:
+    - type: Transform
+      pos: 72.5,-57.5
+      parent: 2
+  - uid: 14247
+    components:
+    - type: Transform
+      pos: 71.5,-57.5
+      parent: 2
+  - uid: 14248
+    components:
+    - type: Transform
+      pos: 70.5,-57.5
+      parent: 2
+  - uid: 14249
+    components:
+    - type: Transform
+      pos: 70.5,-56.5
+      parent: 2
+  - uid: 14250
+    components:
+    - type: Transform
+      pos: 66.5,-56.5
+      parent: 2
+  - uid: 14254
+    components:
+    - type: Transform
+      pos: 61.5,-59.5
       parent: 2
   - uid: 14257
     components:
@@ -24311,17 +25509,62 @@ entities:
   - uid: 14261
     components:
     - type: Transform
-      pos: 52.5,-50.5
+      pos: 75.5,-58.5
       parent: 2
-  - uid: 14297
+  - uid: 14263
     components:
     - type: Transform
-      pos: 72.5,-35.5
+      pos: 73.5,-63.5
       parent: 2
-  - uid: 14298
+  - uid: 14265
     components:
     - type: Transform
-      pos: 31.5,-68.5
+      pos: 73.5,-64.5
+      parent: 2
+  - uid: 14275
+    components:
+    - type: Transform
+      pos: 72.5,-64.5
+      parent: 2
+  - uid: 14276
+    components:
+    - type: Transform
+      pos: 71.5,-64.5
+      parent: 2
+  - uid: 14277
+    components:
+    - type: Transform
+      pos: 70.5,-64.5
+      parent: 2
+  - uid: 14279
+    components:
+    - type: Transform
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 14281
+    components:
+    - type: Transform
+      pos: 70.5,-66.5
+      parent: 2
+  - uid: 14282
+    components:
+    - type: Transform
+      pos: 70.5,-67.5
+      parent: 2
+  - uid: 14287
+    components:
+    - type: Transform
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 14290
+    components:
+    - type: Transform
+      pos: 70.5,-69.5
+      parent: 2
+  - uid: 14295
+    components:
+    - type: Transform
+      pos: 70.5,-70.5
       parent: 2
   - uid: 14299
     components:
@@ -24343,6 +25586,16 @@ entities:
     - type: Transform
       pos: 31.5,-64.5
       parent: 2
+  - uid: 14304
+    components:
+    - type: Transform
+      pos: 70.5,-71.5
+      parent: 2
+  - uid: 14308
+    components:
+    - type: Transform
+      pos: 79.5,-61.5
+      parent: 2
   - uid: 14309
     components:
     - type: Transform
@@ -24363,6 +25616,41 @@ entities:
     - type: Transform
       pos: 65.5,-29.5
       parent: 2
+  - uid: 14316
+    components:
+    - type: Transform
+      pos: 61.5,-72.5
+      parent: 2
+  - uid: 14317
+    components:
+    - type: Transform
+      pos: 67.5,-66.5
+      parent: 2
+  - uid: 14320
+    components:
+    - type: Transform
+      pos: 55.5,-53.5
+      parent: 2
+  - uid: 14321
+    components:
+    - type: Transform
+      pos: 56.5,-54.5
+      parent: 2
+  - uid: 14327
+    components:
+    - type: Transform
+      pos: 60.5,-72.5
+      parent: 2
+  - uid: 14328
+    components:
+    - type: Transform
+      pos: 50.5,-41.5
+      parent: 2
+  - uid: 14331
+    components:
+    - type: Transform
+      pos: 49.5,-41.5
+      parent: 2
   - uid: 14333
     components:
     - type: Transform
@@ -24373,20 +25661,85 @@ entities:
     - type: Transform
       pos: 70.5,-20.5
       parent: 2
+  - uid: 14343
+    components:
+    - type: Transform
+      pos: 48.5,-41.5
+      parent: 2
+  - uid: 14344
+    components:
+    - type: Transform
+      pos: 48.5,-40.5
+      parent: 2
   - uid: 14345
     components:
     - type: Transform
       pos: 70.5,-21.5
       parent: 2
+  - uid: 14350
+    components:
+    - type: Transform
+      pos: 48.5,-39.5
+      parent: 2
+  - uid: 14352
+    components:
+    - type: Transform
+      pos: 48.5,-38.5
+      parent: 2
+  - uid: 14353
+    components:
+    - type: Transform
+      pos: 58.5,-74.5
+      parent: 2
+  - uid: 14355
+    components:
+    - type: Transform
+      pos: 75.5,-47.5
+      parent: 2
   - uid: 14356
     components:
     - type: Transform
       pos: 65.5,-18.5
       parent: 2
+  - uid: 14357
+    components:
+    - type: Transform
+      pos: 47.5,-38.5
+      parent: 2
+  - uid: 14358
+    components:
+    - type: Transform
+      pos: 50.5,-29.5
+      parent: 2
+  - uid: 14362
+    components:
+    - type: Transform
+      pos: 49.5,-29.5
+      parent: 2
+  - uid: 14363
+    components:
+    - type: Transform
+      pos: 47.5,-37.5
+      parent: 2
+  - uid: 14386
+    components:
+    - type: Transform
+      pos: 48.5,-42.5
+      parent: 2
+  - uid: 14393
+    components:
+    - type: Transform
+      pos: 48.5,-43.5
+      parent: 2
+  - uid: 14406
+    components:
+    - type: Transform
+      pos: 47.5,-43.5
+      parent: 2
   - uid: 14410
     components:
     - type: Transform
-      pos: 60.5,-38.5
+      pos: 44.5,-49.5
       parent: 2
   - uid: 14422
     components:
@@ -24408,31 +25761,236 @@ entities:
     - type: Transform
       pos: 85.5,-22.5
       parent: 2
+  - uid: 14427
+    components:
+    - type: Transform
+      pos: 45.5,-49.5
+      parent: 2
+  - uid: 14428
+    components:
+    - type: Transform
+      pos: 46.5,-43.5
+      parent: 2
+  - uid: 14450
+    components:
+    - type: Transform
+      pos: 46.5,-44.5
+      parent: 2
+  - uid: 14555
+    components:
+    - type: Transform
+      pos: 46.5,-45.5
+      parent: 2
+  - uid: 14574
+    components:
+    - type: Transform
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 14582
+    components:
+    - type: Transform
+      pos: 47.5,-46.5
+      parent: 2
+  - uid: 14583
+    components:
+    - type: Transform
+      pos: 48.5,-46.5
+      parent: 2
+  - uid: 14585
+    components:
+    - type: Transform
+      pos: 48.5,-45.5
+      parent: 2
+  - uid: 14588
+    components:
+    - type: Transform
+      pos: 38.5,-34.5
+      parent: 2
+  - uid: 14601
+    components:
+    - type: Transform
+      pos: 39.5,-34.5
+      parent: 2
+  - uid: 14602
+    components:
+    - type: Transform
+      pos: 32.5,-19.5
+      parent: 2
+  - uid: 14622
+    components:
+    - type: Transform
+      pos: 31.5,-19.5
+      parent: 2
+  - uid: 14641
+    components:
+    - type: Transform
+      pos: 31.5,-18.5
+      parent: 2
+  - uid: 14668
+    components:
+    - type: Transform
+      pos: 31.5,-17.5
+      parent: 2
+  - uid: 14669
+    components:
+    - type: Transform
+      pos: 31.5,-16.5
+      parent: 2
+  - uid: 14679
+    components:
+    - type: Transform
+      pos: 31.5,-15.5
+      parent: 2
   - uid: 14689
     components:
     - type: Transform
       pos: -30.5,-13.5
       parent: 2
+  - uid: 14694
+    components:
+    - type: Transform
+      pos: 31.5,-14.5
+      parent: 2
+  - uid: 14698
+    components:
+    - type: Transform
+      pos: 31.5,-12.5
+      parent: 2
+  - uid: 14700
+    components:
+    - type: Transform
+      pos: 31.5,-13.5
+      parent: 2
+  - uid: 14724
+    components:
+    - type: Transform
+      pos: 32.5,-15.5
+      parent: 2
+  - uid: 14732
+    components:
+    - type: Transform
+      pos: 33.5,-15.5
+      parent: 2
+  - uid: 14733
+    components:
+    - type: Transform
+      pos: 34.5,-15.5
+      parent: 2
   - uid: 14734
     components:
     - type: Transform
       pos: 59.5,-28.5
       parent: 2
+  - uid: 14735
+    components:
+    - type: Transform
+      pos: 35.5,-15.5
+      parent: 2
+  - uid: 14736
+    components:
+    - type: Transform
+      pos: 35.5,-14.5
+      parent: 2
   - uid: 14750
     components:
     - type: Transform
       pos: 67.5,-28.5
       parent: 2
+  - uid: 14760
+    components:
+    - type: Transform
+      pos: 35.5,-13.5
+      parent: 2
+  - uid: 14762
+    components:
+    - type: Transform
+      pos: 55.5,-100.5
+      parent: 2
+  - uid: 14763
+    components:
+    - type: Transform
+      pos: 55.5,-99.5
+      parent: 2
+  - uid: 14772
+    components:
+    - type: Transform
+      pos: 35.5,-12.5
+      parent: 2
   - uid: 14802
     components:
     - type: Transform
       pos: -17.5,-52.5
       parent: 2
+  - uid: 14804
+    components:
+    - type: Transform
+      pos: 30.5,-15.5
+      parent: 2
   - uid: 14813
     components:
     - type: Transform
       pos: 65.5,-30.5
       parent: 2
+  - uid: 14814
+    components:
+    - type: Transform
+      pos: 31.5,-20.5
+      parent: 2
+  - uid: 14823
+    components:
+    - type: Transform
+      pos: 30.5,-18.5
+      parent: 2
+  - uid: 14824
+    components:
+    - type: Transform
+      pos: 29.5,-18.5
+      parent: 2
+  - uid: 14831
+    components:
+    - type: Transform
+      pos: 35.5,-16.5
+      parent: 2
+  - uid: 14832
+    components:
+    - type: Transform
+      pos: 35.5,-17.5
+      parent: 2
+  - uid: 14874
+    components:
+    - type: Transform
+      pos: 35.5,-18.5
+      parent: 2
+  - uid: 14875
+    components:
+    - type: Transform
+      pos: 29.5,-23.5
+      parent: 2
+  - uid: 14917
+    components:
+    - type: Transform
+      pos: 35.5,-19.5
+      parent: 2
+  - uid: 14922
+    components:
+    - type: Transform
+      pos: 35.5,-20.5
+      parent: 2
+  - uid: 14923
+    components:
+    - type: Transform
+      pos: 35.5,-21.5
+      parent: 2
+  - uid: 14925
+    components:
+    - type: Transform
+      pos: 30.5,-23.5
+      parent: 2
+  - uid: 14956
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
   - uid: 14986
     components:
     - type: Transform
@@ -24513,305 +26071,80 @@ entities:
     - type: Transform
       pos: 19.5,-60.5
       parent: 2
+  - uid: 15127
+    components:
+    - type: Transform
+      pos: 75.5,-68.5
+      parent: 2
+  - uid: 15129
+    components:
+    - type: Transform
+      pos: 32.5,-23.5
+      parent: 2
+  - uid: 15137
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 2
+  - uid: 15138
+    components:
+    - type: Transform
+      pos: 34.5,-23.5
+      parent: 2
+  - uid: 15139
+    components:
+    - type: Transform
+      pos: 35.5,-23.5
+      parent: 2
+  - uid: 15140
+    components:
+    - type: Transform
+      pos: 75.5,-67.5
+      parent: 2
   - uid: 15141
     components:
     - type: Transform
       pos: -15.5,-16.5
       parent: 2
-  - uid: 15146
+  - uid: 15145
     components:
     - type: Transform
-      pos: 67.5,-42.5
+      pos: 36.5,-23.5
+      parent: 2
+  - uid: 15147
+    components:
+    - type: Transform
+      pos: 72.5,-70.5
       parent: 2
   - uid: 15149
     components:
     - type: Transform
-      pos: 34.5,-26.5
+      pos: 72.5,-74.5
       parent: 2
   - uid: 15150
     components:
     - type: Transform
-      pos: 35.5,-26.5
-      parent: 2
-  - uid: 15151
-    components:
-    - type: Transform
-      pos: 36.5,-26.5
-      parent: 2
-  - uid: 15152
-    components:
-    - type: Transform
-      pos: 37.5,-26.5
-      parent: 2
-  - uid: 15153
-    components:
-    - type: Transform
-      pos: 38.5,-26.5
-      parent: 2
-  - uid: 15154
-    components:
-    - type: Transform
-      pos: 39.5,-26.5
-      parent: 2
-  - uid: 15155
-    components:
-    - type: Transform
-      pos: 40.5,-26.5
-      parent: 2
-  - uid: 15156
-    components:
-    - type: Transform
-      pos: 41.5,-26.5
-      parent: 2
-  - uid: 15157
-    components:
-    - type: Transform
-      pos: 42.5,-26.5
-      parent: 2
-  - uid: 15161
-    components:
-    - type: Transform
-      pos: 45.5,-25.5
-      parent: 2
-  - uid: 15162
-    components:
-    - type: Transform
-      pos: 44.5,-30.5
-      parent: 2
-  - uid: 15163
-    components:
-    - type: Transform
-      pos: 49.5,-30.5
-      parent: 2
-  - uid: 15164
-    components:
-    - type: Transform
-      pos: 49.5,-29.5
-      parent: 2
-  - uid: 15166
-    components:
-    - type: Transform
-      pos: 44.5,-26.5
-      parent: 2
-  - uid: 15167
-    components:
-    - type: Transform
-      pos: 44.5,-25.5
-      parent: 2
-  - uid: 15168
-    components:
-    - type: Transform
-      pos: 46.5,-25.5
-      parent: 2
-  - uid: 15169
-    components:
-    - type: Transform
-      pos: 46.5,-26.5
-      parent: 2
-  - uid: 15170
-    components:
-    - type: Transform
-      pos: 46.5,-27.5
-      parent: 2
-  - uid: 15176
-    components:
-    - type: Transform
-      pos: 48.5,-27.5
-      parent: 2
-  - uid: 15181
-    components:
-    - type: Transform
-      pos: 52.5,-26.5
-      parent: 2
-  - uid: 15182
-    components:
-    - type: Transform
-      pos: 53.5,-26.5
+      pos: 72.5,-73.5
       parent: 2
   - uid: 15183
     components:
     - type: Transform
-      pos: 54.5,-26.5
+      pos: 84.5,-44.5
       parent: 2
   - uid: 15184
     components:
     - type: Transform
-      pos: 55.5,-26.5
+      pos: 85.5,-44.5
       parent: 2
   - uid: 15185
     components:
     - type: Transform
-      pos: 55.5,-27.5
+      pos: 84.5,-46.5
       parent: 2
   - uid: 15186
     components:
     - type: Transform
-      pos: 55.5,-28.5
-      parent: 2
-  - uid: 15187
-    components:
-    - type: Transform
-      pos: 55.5,-29.5
-      parent: 2
-  - uid: 15188
-    components:
-    - type: Transform
-      pos: 55.5,-30.5
-      parent: 2
-  - uid: 15189
-    components:
-    - type: Transform
-      pos: 55.5,-31.5
-      parent: 2
-  - uid: 15190
-    components:
-    - type: Transform
-      pos: 55.5,-32.5
-      parent: 2
-  - uid: 15191
-    components:
-    - type: Transform
-      pos: 54.5,-32.5
-      parent: 2
-  - uid: 15192
-    components:
-    - type: Transform
-      pos: 53.5,-32.5
-      parent: 2
-  - uid: 15193
-    components:
-    - type: Transform
-      pos: 52.5,-32.5
-      parent: 2
-  - uid: 15194
-    components:
-    - type: Transform
-      pos: 52.5,-33.5
-      parent: 2
-  - uid: 15195
-    components:
-    - type: Transform
-      pos: 52.5,-34.5
-      parent: 2
-  - uid: 15196
-    components:
-    - type: Transform
-      pos: 53.5,-34.5
-      parent: 2
-  - uid: 15197
-    components:
-    - type: Transform
-      pos: 54.5,-34.5
-      parent: 2
-  - uid: 15198
-    components:
-    - type: Transform
-      pos: 55.5,-34.5
-      parent: 2
-  - uid: 15199
-    components:
-    - type: Transform
-      pos: 55.5,-35.5
-      parent: 2
-  - uid: 15200
-    components:
-    - type: Transform
-      pos: 55.5,-36.5
-      parent: 2
-  - uid: 15201
-    components:
-    - type: Transform
-      pos: 49.5,-44.5
-      parent: 2
-  - uid: 15202
-    components:
-    - type: Transform
-      pos: 50.5,-44.5
-      parent: 2
-  - uid: 15203
-    components:
-    - type: Transform
-      pos: 51.5,-44.5
-      parent: 2
-  - uid: 15204
-    components:
-    - type: Transform
-      pos: 52.5,-44.5
-      parent: 2
-  - uid: 15205
-    components:
-    - type: Transform
-      pos: 53.5,-44.5
-      parent: 2
-  - uid: 15206
-    components:
-    - type: Transform
-      pos: 54.5,-44.5
-      parent: 2
-  - uid: 15207
-    components:
-    - type: Transform
-      pos: 55.5,-44.5
-      parent: 2
-  - uid: 15208
-    components:
-    - type: Transform
-      pos: 55.5,-43.5
-      parent: 2
-  - uid: 15209
-    components:
-    - type: Transform
-      pos: 55.5,-42.5
-      parent: 2
-  - uid: 15210
-    components:
-    - type: Transform
-      pos: 55.5,-41.5
-      parent: 2
-  - uid: 15211
-    components:
-    - type: Transform
-      pos: 55.5,-40.5
-      parent: 2
-  - uid: 15212
-    components:
-    - type: Transform
-      pos: 55.5,-39.5
-      parent: 2
-  - uid: 15213
-    components:
-    - type: Transform
-      pos: 55.5,-38.5
-      parent: 2
-  - uid: 15214
-    components:
-    - type: Transform
-      pos: 54.5,-36.5
-      parent: 2
-  - uid: 15215
-    components:
-    - type: Transform
-      pos: 53.5,-36.5
-      parent: 2
-  - uid: 15216
-    components:
-    - type: Transform
-      pos: 52.5,-36.5
-      parent: 2
-  - uid: 15217
-    components:
-    - type: Transform
-      pos: 52.5,-38.5
-      parent: 2
-  - uid: 15218
-    components:
-    - type: Transform
-      pos: 53.5,-38.5
-      parent: 2
-  - uid: 15219
-    components:
-    - type: Transform
-      pos: 54.5,-38.5
+      pos: 85.5,-46.5
       parent: 2
   - uid: 15263
     components:
@@ -24848,101 +26181,131 @@ entities:
     - type: Transform
       pos: 60.5,-28.5
       parent: 2
+  - uid: 15400
+    components:
+    - type: Transform
+      pos: 79.5,-60.5
+      parent: 2
   - uid: 15407
     components:
     - type: Transform
       pos: 49.5,-76.5
       parent: 2
-  - uid: 15408
-    components:
-    - type: Transform
-      pos: 55.5,-75.5
-      parent: 2
-  - uid: 15438
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
   - uid: 15439
     components:
     - type: Transform
       pos: 68.5,-28.5
       parent: 2
-  - uid: 15454
+  - uid: 15463
     components:
     - type: Transform
-      pos: 74.5,-44.5
+      pos: 62.5,-60.5
+      parent: 2
+  - uid: 15464
+    components:
+    - type: Transform
+      pos: 63.5,-60.5
+      parent: 2
+  - uid: 15465
+    components:
+    - type: Transform
+      pos: 64.5,-60.5
       parent: 2
   - uid: 15468
     components:
     - type: Transform
       pos: 61.5,-28.5
       parent: 2
-  - uid: 15469
+  - uid: 15473
     components:
     - type: Transform
-      pos: 64.5,-32.5
+      pos: 65.5,-57.5
+      parent: 2
+  - uid: 15474
+    components:
+    - type: Transform
+      pos: 65.5,-56.5
       parent: 2
   - uid: 15511
     components:
     - type: Transform
       pos: 29.5,-35.5
       parent: 2
+  - uid: 15850
+    components:
+    - type: Transform
+      pos: 48.5,-28.5
+      parent: 2
+  - uid: 15851
+    components:
+    - type: Transform
+      pos: 48.5,-27.5
+      parent: 2
+  - uid: 15854
+    components:
+    - type: Transform
+      pos: 48.5,-30.5
+      parent: 2
+  - uid: 15855
+    components:
+    - type: Transform
+      pos: 48.5,-31.5
+      parent: 2
+  - uid: 15884
+    components:
+    - type: Transform
+      pos: 40.5,-34.5
+      parent: 2
+  - uid: 15893
+    components:
+    - type: Transform
+      pos: 41.5,-34.5
+      parent: 2
+  - uid: 15908
+    components:
+    - type: Transform
+      pos: 41.5,-33.5
+      parent: 2
+  - uid: 15909
+    components:
+    - type: Transform
+      pos: 41.5,-32.5
+      parent: 2
+  - uid: 15911
+    components:
+    - type: Transform
+      pos: 42.5,-32.5
+      parent: 2
+  - uid: 16036
+    components:
+    - type: Transform
+      pos: 65.5,-58.5
+      parent: 2
+  - uid: 16037
+    components:
+    - type: Transform
+      pos: 67.5,-56.5
+      parent: 2
   - uid: 16043
     components:
     - type: Transform
       pos: 30.5,-35.5
       parent: 2
-  - uid: 16099
-    components:
-    - type: Transform
-      pos: 47.5,-65.5
-      parent: 2
   - uid: 16102
     components:
     - type: Transform
       pos: 46.5,-63.5
       parent: 2
-  - uid: 16107
+  - uid: 16155
     components:
     - type: Transform
-      pos: 46.5,-64.5
-      parent: 2
-  - uid: 16117
-    components:
-    - type: Transform
-      pos: 30.5,-31.5
+      pos: 6.5,-59.5
       parent: 2
   - uid: 16232
     components:
     - type: Transform
       pos: -18.5,-20.5
       parent: 2
-  - uid: 16240
-    components:
-    - type: Transform
-      pos: 71.5,-42.5
-      parent: 2
-  - uid: 16247
-    components:
-    - type: Transform
-      pos: 64.5,-35.5
-      parent: 2
-  - uid: 16252
-    components:
-    - type: Transform
-      pos: 66.5,-42.5
-      parent: 2
-  - uid: 16259
-    components:
-    - type: Transform
-      pos: 68.5,-42.5
-      parent: 2
-  - uid: 16270
-    components:
-    - type: Transform
-      pos: 64.5,-38.5
-      parent: 2
   - uid: 16275
     components:
     - type: Transform
@@ -25228,11 +26591,6 @@ entities:
     - type: Transform
       pos: -7.5,-8.5
       parent: 2
-  - uid: 16453
-    components:
-    - type: Transform
-      pos: 60.5,-68.5
-      parent: 2
   - uid: 16455
     components:
     - type: Transform
@@ -25248,11 +26606,6 @@ entities:
     - type: Transform
       pos: -10.5,-16.5
       parent: 2
-  - uid: 16552
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
   - uid: 16553
     components:
     - type: Transform
@@ -25288,16 +26641,6 @@ entities:
     - type: Transform
       pos: -37.5,-35.5
       parent: 2
-  - uid: 16590
-    components:
-    - type: Transform
-      pos: 66.5,-62.5
-      parent: 2
-  - uid: 16591
-    components:
-    - type: Transform
-      pos: 66.5,-63.5
-      parent: 2
   - uid: 16613
     components:
     - type: Transform
@@ -25448,11 +26791,6 @@ entities:
     - type: Transform
       pos: 2.5,-73.5
       parent: 2
-  - uid: 17131
-    components:
-    - type: Transform
-      pos: 46.5,-65.5
-      parent: 2
   - uid: 17198
     components:
     - type: Transform
@@ -25528,11 +26866,6 @@ entities:
     - type: Transform
       pos: 50.5,-52.5
       parent: 2
-  - uid: 17472
-    components:
-    - type: Transform
-      pos: 59.5,-48.5
-      parent: 2
   - uid: 17485
     components:
     - type: Transform
@@ -25633,11 +26966,6 @@ entities:
     - type: Transform
       pos: 37.5,-75.5
       parent: 2
-  - uid: 17508
-    components:
-    - type: Transform
-      pos: 38.5,-75.5
-      parent: 2
   - uid: 17509
     components:
     - type: Transform
@@ -25683,10 +27011,15 @@ entities:
     - type: Transform
       pos: -15.5,-71.5
       parent: 2
-  - uid: 17650
+  - uid: 17728
     components:
     - type: Transform
-      pos: 84.5,-47.5
+      pos: 33.5,-68.5
+      parent: 2
+  - uid: 17729
+    components:
+    - type: Transform
+      pos: 35.5,-68.5
       parent: 2
   - uid: 17735
     components:
@@ -25768,21 +27101,6 @@ entities:
     - type: Transform
       pos: 69.5,-23.5
       parent: 2
-  - uid: 17896
-    components:
-    - type: Transform
-      pos: 57.5,-68.5
-      parent: 2
-  - uid: 17897
-    components:
-    - type: Transform
-      pos: 58.5,-68.5
-      parent: 2
-  - uid: 17898
-    components:
-    - type: Transform
-      pos: 59.5,-68.5
-      parent: 2
   - uid: 17932
     components:
     - type: Transform
@@ -25828,11 +27146,6 @@ entities:
     - type: Transform
       pos: 20.5,-51.5
       parent: 2
-  - uid: 17992
-    components:
-    - type: Transform
-      pos: 72.5,-34.5
-      parent: 2
   - uid: 18008
     components:
     - type: Transform
@@ -25843,21 +27156,6 @@ entities:
     - type: Transform
       pos: 83.5,-44.5
       parent: 2
-  - uid: 18029
-    components:
-    - type: Transform
-      pos: 64.5,-31.5
-      parent: 2
-  - uid: 18037
-    components:
-    - type: Transform
-      pos: 59.5,-35.5
-      parent: 2
-  - uid: 18038
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
   - uid: 18104
     components:
     - type: Transform
@@ -25888,21 +27186,6 @@ entities:
     - type: Transform
       pos: 50.5,-53.5
       parent: 2
-  - uid: 18165
-    components:
-    - type: Transform
-      pos: 58.5,-63.5
-      parent: 2
-  - uid: 18212
-    components:
-    - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 18228
-    components:
-    - type: Transform
-      pos: 50.5,-50.5
-      parent: 2
   - uid: 18234
     components:
     - type: Transform
@@ -25943,16 +27226,6 @@ entities:
     - type: Transform
       pos: 59.5,-20.5
       parent: 2
-  - uid: 18363
-    components:
-    - type: Transform
-      pos: 53.5,-50.5
-      parent: 2
-  - uid: 18364
-    components:
-    - type: Transform
-      pos: 59.5,-47.5
-      parent: 2
   - uid: 18381
     components:
     - type: Transform
@@ -26013,26 +27286,6 @@ entities:
     - type: Transform
       pos: -0.5,-12.5
       parent: 2
-  - uid: 18398
-    components:
-    - type: Transform
-      pos: 30.5,-13.5
-      parent: 2
-  - uid: 18399
-    components:
-    - type: Transform
-      pos: 30.5,-12.5
-      parent: 2
-  - uid: 18400
-    components:
-    - type: Transform
-      pos: 30.5,-11.5
-      parent: 2
-  - uid: 18405
-    components:
-    - type: Transform
-      pos: 30.5,-10.5
-      parent: 2
   - uid: 18407
     components:
     - type: Transform
@@ -26063,11 +27316,6 @@ entities:
     - type: Transform
       pos: 17.5,-50.5
       parent: 2
-  - uid: 18416
-    components:
-    - type: Transform
-      pos: 10.5,-48.5
-      parent: 2
   - uid: 18417
     components:
     - type: Transform
@@ -26078,16 +27326,6 @@ entities:
     - type: Transform
       pos: -45.5,-35.5
       parent: 2
-  - uid: 18419
-    components:
-    - type: Transform
-      pos: 90.5,-48.5
-      parent: 2
-  - uid: 18420
-    components:
-    - type: Transform
-      pos: 90.5,-42.5
-      parent: 2
   - uid: 18421
     components:
     - type: Transform
@@ -26143,11 +27381,6 @@ entities:
     - type: Transform
       pos: 69.5,-24.5
       parent: 2
-  - uid: 18464
-    components:
-    - type: Transform
-      pos: 83.5,-43.5
-      parent: 2
   - uid: 18499
     components:
     - type: Transform
@@ -26163,31 +27396,11 @@ entities:
     - type: Transform
       pos: 28.5,-32.5
       parent: 2
-  - uid: 18505
-    components:
-    - type: Transform
-      pos: 28.5,-31.5
-      parent: 2
-  - uid: 18507
-    components:
-    - type: Transform
-      pos: 31.5,-31.5
-      parent: 2
-  - uid: 18508
-    components:
-    - type: Transform
-      pos: 38.5,-30.5
-      parent: 2
   - uid: 18510
     components:
     - type: Transform
       pos: 32.5,-38.5
       parent: 2
-  - uid: 18511
-    components:
-    - type: Transform
-      pos: 38.5,-29.5
-      parent: 2
   - uid: 18514
     components:
     - type: Transform
@@ -26198,31 +27411,11 @@ entities:
     - type: Transform
       pos: 33.5,-35.5
       parent: 2
-  - uid: 18516
-    components:
-    - type: Transform
-      pos: 29.5,-31.5
-      parent: 2
-  - uid: 18517
-    components:
-    - type: Transform
-      pos: 29.5,-34.5
-      parent: 2
-  - uid: 18519
-    components:
-    - type: Transform
-      pos: 32.5,-31.5
-      parent: 2
   - uid: 18524
     components:
     - type: Transform
       pos: 46.5,-76.5
       parent: 2
-  - uid: 18633
-    components:
-    - type: Transform
-      pos: 54.5,-50.5
-      parent: 2
   - uid: 18695
     components:
     - type: Transform
@@ -26238,20 +27431,40 @@ entities:
     - type: Transform
       pos: 84.5,-68.5
       parent: 2
-  - uid: 18740
-    components:
-    - type: Transform
-      pos: 59.5,-79.5
-      parent: 2
   - uid: 18771
     components:
     - type: Transform
       pos: -57.5,-68.5
       parent: 2
-  - uid: 18816
+  - uid: 18838
     components:
     - type: Transform
-      pos: 68.5,-24.5
+      pos: 35.5,-69.5
+      parent: 2
+  - uid: 18839
+    components:
+    - type: Transform
+      pos: 51.5,-67.5
+      parent: 2
+  - uid: 18840
+    components:
+    - type: Transform
+      pos: 51.5,-68.5
+      parent: 2
+  - uid: 18853
+    components:
+    - type: Transform
+      pos: 52.5,-68.5
+      parent: 2
+  - uid: 18891
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 2
+  - uid: 18915
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
       parent: 2
   - uid: 18916
     components:
@@ -26328,6 +27541,21 @@ entities:
     - type: Transform
       pos: 43.5,-63.5
       parent: 2
+  - uid: 18934
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 2
+  - uid: 19061
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 2
+  - uid: 19062
+    components:
+    - type: Transform
+      pos: 22.5,-16.5
+      parent: 2
   - uid: 19068
     components:
     - type: Transform
@@ -26383,6 +27611,11 @@ entities:
     - type: Transform
       pos: 48.5,-56.5
       parent: 2
+  - uid: 19089
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 2
   - uid: 19091
     components:
     - type: Transform
@@ -26553,31 +27786,6 @@ entities:
     - type: Transform
       pos: -4.5,-20.5
       parent: 2
-  - uid: 19244
-    components:
-    - type: Transform
-      pos: 74.5,-49.5
-      parent: 2
-  - uid: 19245
-    components:
-    - type: Transform
-      pos: 74.5,-48.5
-      parent: 2
-  - uid: 19246
-    components:
-    - type: Transform
-      pos: 74.5,-47.5
-      parent: 2
-  - uid: 19247
-    components:
-    - type: Transform
-      pos: 74.5,-46.5
-      parent: 2
-  - uid: 19248
-    components:
-    - type: Transform
-      pos: 74.5,-45.5
-      parent: 2
   - uid: 19310
     components:
     - type: Transform
@@ -26613,6 +27821,306 @@ entities:
     - type: Transform
       pos: 2.5,-62.5
       parent: 2
+  - uid: 19489
+    components:
+    - type: Transform
+      pos: -12.5,-36.5
+      parent: 2
+  - uid: 19515
+    components:
+    - type: Transform
+      pos: 18.5,-28.5
+      parent: 2
+  - uid: 19516
+    components:
+    - type: Transform
+      pos: 19.5,-28.5
+      parent: 2
+  - uid: 19517
+    components:
+    - type: Transform
+      pos: 20.5,-28.5
+      parent: 2
+  - uid: 19518
+    components:
+    - type: Transform
+      pos: 20.5,-29.5
+      parent: 2
+  - uid: 19519
+    components:
+    - type: Transform
+      pos: 20.5,-30.5
+      parent: 2
+  - uid: 19520
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 2
+  - uid: 19521
+    components:
+    - type: Transform
+      pos: 19.5,-19.5
+      parent: 2
+  - uid: 19522
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 2
+  - uid: 19523
+    components:
+    - type: Transform
+      pos: 20.5,-18.5
+      parent: 2
+  - uid: 19524
+    components:
+    - type: Transform
+      pos: 20.5,-17.5
+      parent: 2
+  - uid: 19525
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 2
+  - uid: 19526
+    components:
+    - type: Transform
+      pos: 18.5,-23.5
+      parent: 2
+  - uid: 19527
+    components:
+    - type: Transform
+      pos: 19.5,-23.5
+      parent: 2
+  - uid: 19528
+    components:
+    - type: Transform
+      pos: 20.5,-23.5
+      parent: 2
+  - uid: 19529
+    components:
+    - type: Transform
+      pos: 21.5,-23.5
+      parent: 2
+  - uid: 19537
+    components:
+    - type: Transform
+      pos: 5.5,-72.5
+      parent: 2
+  - uid: 19584
+    components:
+    - type: Transform
+      pos: 5.5,-71.5
+      parent: 2
+  - uid: 19585
+    components:
+    - type: Transform
+      pos: 5.5,-76.5
+      parent: 2
+  - uid: 19586
+    components:
+    - type: Transform
+      pos: 5.5,-74.5
+      parent: 2
+  - uid: 19597
+    components:
+    - type: Transform
+      pos: 46.5,-71.5
+      parent: 2
+  - uid: 19601
+    components:
+    - type: Transform
+      pos: 46.5,-70.5
+      parent: 2
+  - uid: 19602
+    components:
+    - type: Transform
+      pos: 46.5,-69.5
+      parent: 2
+  - uid: 19604
+    components:
+    - type: Transform
+      pos: 14.5,-56.5
+      parent: 2
+  - uid: 19627
+    components:
+    - type: Transform
+      pos: 9.5,-47.5
+      parent: 2
+  - uid: 19628
+    components:
+    - type: Transform
+      pos: 9.5,-46.5
+      parent: 2
+  - uid: 19676
+    components:
+    - type: Transform
+      pos: 94.5,-43.5
+      parent: 2
+  - uid: 19677
+    components:
+    - type: Transform
+      pos: 95.5,-43.5
+      parent: 2
+  - uid: 19678
+    components:
+    - type: Transform
+      pos: 94.5,-47.5
+      parent: 2
+  - uid: 19679
+    components:
+    - type: Transform
+      pos: 95.5,-47.5
+      parent: 2
+  - uid: 19730
+    components:
+    - type: Transform
+      pos: 52.5,-103.5
+      parent: 2
+  - uid: 19755
+    components:
+    - type: Transform
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 19756
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
+      parent: 2
+  - uid: 19757
+    components:
+    - type: Transform
+      pos: 51.5,-38.5
+      parent: 2
+  - uid: 19936
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 2
+  - uid: 19937
+    components:
+    - type: Transform
+      pos: 28.5,-12.5
+      parent: 2
+  - uid: 19938
+    components:
+    - type: Transform
+      pos: 26.5,-13.5
+      parent: 2
+  - uid: 19939
+    components:
+    - type: Transform
+      pos: 26.5,-14.5
+      parent: 2
+  - uid: 19940
+    components:
+    - type: Transform
+      pos: 26.5,-15.5
+      parent: 2
+  - uid: 19941
+    components:
+    - type: Transform
+      pos: 22.5,-11.5
+      parent: 2
+  - uid: 19942
+    components:
+    - type: Transform
+      pos: 22.5,-10.5
+      parent: 2
+  - uid: 19943
+    components:
+    - type: Transform
+      pos: 26.5,-11.5
+      parent: 2
+  - uid: 19944
+    components:
+    - type: Transform
+      pos: 26.5,-10.5
+      parent: 2
+  - uid: 19945
+    components:
+    - type: Transform
+      pos: 16.5,-12.5
+      parent: 2
+  - uid: 19946
+    components:
+    - type: Transform
+      pos: 26.5,-16.5
+      parent: 2
+  - uid: 19947
+    components:
+    - type: Transform
+      pos: 26.5,-17.5
+      parent: 2
+  - uid: 19948
+    components:
+    - type: Transform
+      pos: 26.5,-18.5
+      parent: 2
+  - uid: 19949
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 2
+  - uid: 19950
+    components:
+    - type: Transform
+      pos: 26.5,-20.5
+      parent: 2
+  - uid: 19951
+    components:
+    - type: Transform
+      pos: 75.5,-42.5
+      parent: 2
+  - uid: 19956
+    components:
+    - type: Transform
+      pos: 31.5,-69.5
+      parent: 2
+  - uid: 19957
+    components:
+    - type: Transform
+      pos: 32.5,-70.5
+      parent: 2
+  - uid: 19958
+    components:
+    - type: Transform
+      pos: 33.5,-70.5
+      parent: 2
+  - uid: 19959
+    components:
+    - type: Transform
+      pos: 32.5,-67.5
+      parent: 2
+  - uid: 19960
+    components:
+    - type: Transform
+      pos: 28.5,-74.5
+      parent: 2
+  - uid: 19966
+    components:
+    - type: Transform
+      pos: -50.5,-25.5
+      parent: 2
+  - uid: 19967
+    components:
+    - type: Transform
+      pos: -51.5,-25.5
+      parent: 2
+  - uid: 19968
+    components:
+    - type: Transform
+      pos: -52.5,-25.5
+      parent: 2
+  - uid: 19969
+    components:
+    - type: Transform
+      pos: -53.5,-25.5
+      parent: 2
+  - uid: 20081
+    components:
+    - type: Transform
+      pos: 60.5,-67.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 9765
@@ -26627,10 +28135,10 @@ entities:
       parent: 2
 - proto: CableHV
   entities:
-  - uid: 717
+  - uid: 325
     components:
     - type: Transform
-      pos: 49.5,-52.5
+      pos: 46.5,-48.5
       parent: 2
   - uid: 718
     components:
@@ -26642,16 +28150,6 @@ entities:
     - type: Transform
       pos: 24.5,-74.5
       parent: 2
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 63.5,-43.5
-      parent: 2
-  - uid: 748
-    components:
-    - type: Transform
-      pos: 63.5,-45.5
-      parent: 2
   - uid: 868
     components:
     - type: Transform
@@ -26677,15 +28175,10 @@ entities:
     - type: Transform
       pos: -29.5,-48.5
       parent: 2
-  - uid: 1113
+  - uid: 1447
     components:
     - type: Transform
-      pos: 63.5,-41.5
-      parent: 2
-  - uid: 1196
-    components:
-    - type: Transform
-      pos: 63.5,-42.5
+      pos: 37.5,-12.5
       parent: 2
   - uid: 1483
     components:
@@ -26707,15 +28200,15 @@ entities:
     - type: Transform
       pos: 40.5,-13.5
       parent: 2
-  - uid: 1849
+  - uid: 1885
     components:
     - type: Transform
-      pos: 51.5,-52.5
+      pos: 55.5,-28.5
       parent: 2
-  - uid: 1877
+  - uid: 2146
     components:
     - type: Transform
-      pos: 63.5,-40.5
+      pos: 33.5,-32.5
       parent: 2
   - uid: 2276
     components:
@@ -26732,36 +28225,101 @@ entities:
     - type: Transform
       pos: -10.5,-43.5
       parent: 2
-  - uid: 2739
+  - uid: 2735
     components:
     - type: Transform
-      pos: 48.5,-53.5
+      pos: 78.5,-31.5
+      parent: 2
+  - uid: 2756
+    components:
+    - type: Transform
+      pos: 55.5,-31.5
       parent: 2
   - uid: 2890
     components:
     - type: Transform
       pos: 41.5,-13.5
       parent: 2
+  - uid: 2920
+    components:
+    - type: Transform
+      pos: 53.5,-29.5
+      parent: 2
   - uid: 2941
     components:
     - type: Transform
       pos: 42.5,-13.5
       parent: 2
+  - uid: 2943
+    components:
+    - type: Transform
+      pos: 55.5,-26.5
+      parent: 2
+  - uid: 2948
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
   - uid: 3036
     components:
     - type: Transform
       pos: 39.5,-13.5
       parent: 2
+  - uid: 3055
+    components:
+    - type: Transform
+      pos: 46.5,-42.5
+      parent: 2
+  - uid: 3068
+    components:
+    - type: Transform
+      pos: 55.5,-30.5
+      parent: 2
   - uid: 3075
     components:
     - type: Transform
       pos: 67.5,-19.5
       parent: 2
+  - uid: 3079
+    components:
+    - type: Transform
+      pos: 36.5,-32.5
+      parent: 2
+  - uid: 3080
+    components:
+    - type: Transform
+      pos: 34.5,-32.5
+      parent: 2
+  - uid: 3117
+    components:
+    - type: Transform
+      pos: 102.5,-46.5
+      parent: 2
+  - uid: 3118
+    components:
+    - type: Transform
+      pos: 102.5,-48.5
+      parent: 2
+  - uid: 3158
+    components:
+    - type: Transform
+      pos: 102.5,-47.5
+      parent: 2
   - uid: 3212
     components:
     - type: Transform
       pos: -10.5,-41.5
       parent: 2
+  - uid: 3325
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
+      parent: 2
+  - uid: 3327
+    components:
+    - type: Transform
+      pos: 55.5,-27.5
+      parent: 2
   - uid: 3339
     components:
     - type: Transform
@@ -26797,16 +28355,51 @@ entities:
     - type: Transform
       pos: -29.5,-74.5
       parent: 2
+  - uid: 3392
+    components:
+    - type: Transform
+      pos: 46.5,-40.5
+      parent: 2
+  - uid: 3398
+    components:
+    - type: Transform
+      pos: 49.5,-29.5
+      parent: 2
+  - uid: 3401
+    components:
+    - type: Transform
+      pos: 55.5,-29.5
+      parent: 2
+  - uid: 3409
+    components:
+    - type: Transform
+      pos: 46.5,-41.5
+      parent: 2
+  - uid: 3418
+    components:
+    - type: Transform
+      pos: 53.5,-32.5
+      parent: 2
   - uid: 3419
     components:
     - type: Transform
       pos: 71.5,-23.5
       parent: 2
+  - uid: 3427
+    components:
+    - type: Transform
+      pos: 50.5,-29.5
+      parent: 2
   - uid: 3431
     components:
     - type: Transform
       pos: 70.5,-23.5
       parent: 2
+  - uid: 3443
+    components:
+    - type: Transform
+      pos: 55.5,-25.5
+      parent: 2
   - uid: 3490
     components:
     - type: Transform
@@ -26842,60 +28435,20 @@ entities:
     - type: Transform
       pos: 75.5,-25.5
       parent: 2
-  - uid: 3500
+  - uid: 3549
     components:
     - type: Transform
-      pos: 76.5,-26.5
+      pos: 54.5,-32.5
       parent: 2
-  - uid: 3501
+  - uid: 3558
     components:
     - type: Transform
-      pos: 76.5,-27.5
+      pos: 55.5,-24.5
       parent: 2
-  - uid: 3554
+  - uid: 3560
     components:
     - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 3555
-    components:
-    - type: Transform
-      pos: 74.5,-40.5
-      parent: 2
-  - uid: 3556
-    components:
-    - type: Transform
-      pos: 74.5,-38.5
-      parent: 2
-  - uid: 3568
-    components:
-    - type: Transform
-      pos: 55.5,-52.5
-      parent: 2
-  - uid: 3573
-    components:
-    - type: Transform
-      pos: 58.5,-52.5
-      parent: 2
-  - uid: 3574
-    components:
-    - type: Transform
-      pos: 57.5,-52.5
-      parent: 2
-  - uid: 3578
-    components:
-    - type: Transform
-      pos: 53.5,-52.5
-      parent: 2
-  - uid: 3579
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-  - uid: 3582
-    components:
-    - type: Transform
-      pos: 56.5,-52.5
+      pos: 52.5,-28.5
       parent: 2
   - uid: 3589
     components:
@@ -26932,40 +28485,120 @@ entities:
     - type: Transform
       pos: 43.5,-13.5
       parent: 2
-  - uid: 3676
+  - uid: 3762
     components:
     - type: Transform
-      pos: 28.5,-31.5
+      pos: 30.5,-32.5
       parent: 2
-  - uid: 3683
+  - uid: 3763
     components:
     - type: Transform
-      pos: 77.5,-27.5
+      pos: 48.5,-29.5
       parent: 2
-  - uid: 3684
+  - uid: 3770
     components:
     - type: Transform
-      pos: 29.5,-31.5
+      pos: 31.5,-32.5
       parent: 2
-  - uid: 3685
+  - uid: 3787
     components:
     - type: Transform
-      pos: 30.5,-31.5
+      pos: 41.5,-32.5
       parent: 2
-  - uid: 3686
+  - uid: 3792
     components:
     - type: Transform
-      pos: 35.5,-31.5
+      pos: 56.5,-76.5
       parent: 2
-  - uid: 3687
+  - uid: 3809
     components:
     - type: Transform
-      pos: 34.5,-31.5
+      pos: 99.5,-51.5
       parent: 2
-  - uid: 3742
+  - uid: 3816
     components:
     - type: Transform
-      pos: 33.5,-31.5
+      pos: 100.5,-47.5
+      parent: 2
+  - uid: 3817
+    components:
+    - type: Transform
+      pos: 100.5,-48.5
+      parent: 2
+  - uid: 3818
+    components:
+    - type: Transform
+      pos: 100.5,-43.5
+      parent: 2
+  - uid: 3821
+    components:
+    - type: Transform
+      pos: 99.5,-50.5
+      parent: 2
+  - uid: 3822
+    components:
+    - type: Transform
+      pos: 100.5,-42.5
+      parent: 2
+  - uid: 3853
+    components:
+    - type: Transform
+      pos: 98.5,-57.5
+      parent: 2
+  - uid: 3854
+    components:
+    - type: Transform
+      pos: 97.5,-57.5
+      parent: 2
+  - uid: 3856
+    components:
+    - type: Transform
+      pos: 97.5,-33.5
+      parent: 2
+  - uid: 3858
+    components:
+    - type: Transform
+      pos: 100.5,-35.5
+      parent: 2
+  - uid: 3865
+    components:
+    - type: Transform
+      pos: 98.5,-33.5
+      parent: 2
+  - uid: 3866
+    components:
+    - type: Transform
+      pos: 99.5,-57.5
+      parent: 2
+  - uid: 3901
+    components:
+    - type: Transform
+      pos: 99.5,-33.5
+      parent: 2
+  - uid: 3904
+    components:
+    - type: Transform
+      pos: 99.5,-52.5
+      parent: 2
+  - uid: 3905
+    components:
+    - type: Transform
+      pos: 77.5,-36.5
+      parent: 2
+  - uid: 3907
+    components:
+    - type: Transform
+      pos: 77.5,-54.5
+      parent: 2
+  - uid: 4020
+    components:
+    - type: Transform
+      pos: 37.5,-23.5
+      parent: 2
+  - uid: 4049
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
       parent: 2
   - uid: 4054
     components:
@@ -26977,6 +28610,11 @@ entities:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
+  - uid: 4063
+    components:
+    - type: Transform
+      pos: 53.5,-28.5
+      parent: 2
   - uid: 4065
     components:
     - type: Transform
@@ -27047,21 +28685,56 @@ entities:
     - type: Transform
       pos: 49.5,-76.5
       parent: 2
-  - uid: 4349
+  - uid: 4139
     components:
     - type: Transform
-      pos: 40.5,-70.5
+      pos: 39.5,-34.5
       parent: 2
-  - uid: 4352
+  - uid: 4167
     components:
     - type: Transform
-      pos: 40.5,-73.5
+      pos: 36.5,-23.5
+      parent: 2
+  - uid: 4184
+    components:
+    - type: Transform
+      pos: 35.5,-23.5
+      parent: 2
+  - uid: 4190
+    components:
+    - type: Transform
+      pos: 79.5,-59.5
+      parent: 2
+  - uid: 4191
+    components:
+    - type: Transform
+      pos: 34.5,-23.5
+      parent: 2
+  - uid: 4273
+    components:
+    - type: Transform
+      pos: 79.5,-60.5
+      parent: 2
+  - uid: 4276
+    components:
+    - type: Transform
+      pos: 38.5,-34.5
       parent: 2
   - uid: 4357
     components:
     - type: Transform
       pos: 46.5,-76.5
       parent: 2
+  - uid: 4358
+    components:
+    - type: Transform
+      pos: 55.5,-32.5
+      parent: 2
+  - uid: 4366
+    components:
+    - type: Transform
+      pos: 50.5,-28.5
+      parent: 2
   - uid: 4400
     components:
     - type: Transform
@@ -27087,36 +28760,36 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 2
+  - uid: 4465
+    components:
+    - type: Transform
+      pos: 37.5,-33.5
+      parent: 2
   - uid: 4473
     components:
     - type: Transform
       pos: 52.5,-76.5
       parent: 2
-  - uid: 4492
-    components:
-    - type: Transform
-      pos: 56.5,-76.5
-      parent: 2
   - uid: 4501
     components:
     - type: Transform
       pos: 33.5,-70.5
       parent: 2
-  - uid: 4557
+  - uid: 4623
     components:
     - type: Transform
-      pos: 40.5,-71.5
+      pos: 41.5,-33.5
+      parent: 2
+  - uid: 4638
+    components:
+    - type: Transform
+      pos: 41.5,-34.5
       parent: 2
   - uid: 4760
     components:
     - type: Transform
       pos: 65.5,-21.5
       parent: 2
-  - uid: 4916
-    components:
-    - type: Transform
-      pos: 76.5,-29.5
-      parent: 2
   - uid: 4917
     components:
     - type: Transform
@@ -27132,31 +28805,81 @@ entities:
     - type: Transform
       pos: 79.5,-58.5
       parent: 2
+  - uid: 5192
+    components:
+    - type: Transform
+      pos: 101.5,-53.5
+      parent: 2
+  - uid: 5193
+    components:
+    - type: Transform
+      pos: 100.5,-57.5
+      parent: 2
+  - uid: 5214
+    components:
+    - type: Transform
+      pos: 46.5,-69.5
+      parent: 2
   - uid: 5249
     components:
     - type: Transform
       pos: 83.5,-33.5
       parent: 2
+  - uid: 5280
+    components:
+    - type: Transform
+      pos: 40.5,-34.5
+      parent: 2
+  - uid: 5283
+    components:
+    - type: Transform
+      pos: 37.5,-34.5
+      parent: 2
   - uid: 5294
     components:
     - type: Transform
       pos: 80.5,-33.5
       parent: 2
+  - uid: 5319
+    components:
+    - type: Transform
+      pos: 98.5,-56.5
+      parent: 2
+  - uid: 5350
+    components:
+    - type: Transform
+      pos: 98.5,-34.5
+      parent: 2
+  - uid: 5353
+    components:
+    - type: Transform
+      pos: 98.5,-35.5
+      parent: 2
   - uid: 5356
     components:
     - type: Transform
-      pos: 77.5,-28.5
+      pos: 99.5,-37.5
+      parent: 2
+  - uid: 5358
+    components:
+    - type: Transform
+      pos: 98.5,-37.5
+      parent: 2
+  - uid: 5359
+    components:
+    - type: Transform
+      pos: 98.5,-36.5
+      parent: 2
+  - uid: 5373
+    components:
+    - type: Transform
+      pos: 102.5,-49.5
       parent: 2
   - uid: 5391
     components:
     - type: Transform
       pos: 81.5,-33.5
       parent: 2
-  - uid: 5392
-    components:
-    - type: Transform
-      pos: 77.5,-29.5
-      parent: 2
   - uid: 5396
     components:
     - type: Transform
@@ -27167,35 +28890,15 @@ entities:
     - type: Transform
       pos: -25.5,-80.5
       parent: 2
-  - uid: 5412
+  - uid: 5421
     components:
     - type: Transform
-      pos: 52.5,-52.5
+      pos: 33.5,-23.5
       parent: 2
-  - uid: 5416
+  - uid: 5432
     components:
     - type: Transform
-      pos: 71.5,-37.5
-      parent: 2
-  - uid: 5417
-    components:
-    - type: Transform
-      pos: 74.5,-39.5
-      parent: 2
-  - uid: 5418
-    components:
-    - type: Transform
-      pos: 73.5,-38.5
-      parent: 2
-  - uid: 5427
-    components:
-    - type: Transform
-      pos: 70.5,-38.5
-      parent: 2
-  - uid: 5430
-    components:
-    - type: Transform
-      pos: 69.5,-38.5
+      pos: 48.5,-30.5
       parent: 2
   - uid: 5566
     components:
@@ -27242,10 +28945,10 @@ entities:
     - type: Transform
       pos: -14.5,-75.5
       parent: 2
-  - uid: 5795
+  - uid: 5794
     components:
     - type: Transform
-      pos: 75.5,-30.5
+      pos: 30.5,-23.5
       parent: 2
   - uid: 5802
     components:
@@ -27272,45 +28975,30 @@ entities:
     - type: Transform
       pos: 82.5,-66.5
       parent: 2
+  - uid: 5878
+    components:
+    - type: Transform
+      pos: 46.5,-71.5
+      parent: 2
+  - uid: 5886
+    components:
+    - type: Transform
+      pos: 28.5,-23.5
+      parent: 2
   - uid: 5893
     components:
     - type: Transform
       pos: 79.5,-32.5
       parent: 2
-  - uid: 5894
-    components:
-    - type: Transform
-      pos: 78.5,-32.5
-      parent: 2
-  - uid: 5895
-    components:
-    - type: Transform
-      pos: 77.5,-32.5
-      parent: 2
-  - uid: 5896
-    components:
-    - type: Transform
-      pos: 76.5,-32.5
-      parent: 2
   - uid: 5941
     components:
     - type: Transform
       pos: -24.5,-65.5
       parent: 2
-  - uid: 5944
-    components:
-    - type: Transform
-      pos: 75.5,-32.5
-      parent: 2
-  - uid: 6009
-    components:
-    - type: Transform
-      pos: 32.5,-31.5
-      parent: 2
   - uid: 6011
     components:
     - type: Transform
-      pos: 31.5,-31.5
+      pos: 76.5,-26.5
       parent: 2
   - uid: 6066
     components:
@@ -27332,6 +29020,16 @@ entities:
     - type: Transform
       pos: 46.5,-11.5
       parent: 2
+  - uid: 6083
+    components:
+    - type: Transform
+      pos: 27.5,-23.5
+      parent: 2
+  - uid: 6100
+    components:
+    - type: Transform
+      pos: 29.5,-32.5
+      parent: 2
   - uid: 6105
     components:
     - type: Transform
@@ -27377,10 +29075,20 @@ entities:
     - type: Transform
       pos: 63.5,-23.5
       parent: 2
-  - uid: 6230
+  - uid: 6273
     components:
     - type: Transform
-      pos: 75.5,-31.5
+      pos: 29.5,-23.5
+      parent: 2
+  - uid: 6274
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
+  - uid: 6275
+    components:
+    - type: Transform
+      pos: 32.5,-23.5
       parent: 2
   - uid: 6291
     components:
@@ -27397,11 +29105,36 @@ entities:
     - type: Transform
       pos: 24.5,-67.5
       parent: 2
+  - uid: 6299
+    components:
+    - type: Transform
+      pos: 77.5,-28.5
+      parent: 2
   - uid: 6352
     components:
     - type: Transform
       pos: 24.5,-70.5
       parent: 2
+  - uid: 6354
+    components:
+    - type: Transform
+      pos: 25.5,-23.5
+      parent: 2
+  - uid: 6369
+    components:
+    - type: Transform
+      pos: 46.5,-45.5
+      parent: 2
+  - uid: 6379
+    components:
+    - type: Transform
+      pos: 47.5,-37.5
+      parent: 2
+  - uid: 6389
+    components:
+    - type: Transform
+      pos: 24.5,-23.5
+      parent: 2
   - uid: 6468
     components:
     - type: Transform
@@ -27452,10 +29185,15 @@ entities:
     - type: Transform
       pos: 67.5,-21.5
       parent: 2
-  - uid: 6638
+  - uid: 7128
     components:
     - type: Transform
-      pos: 75.5,-29.5
+      pos: 100.5,-56.5
+      parent: 2
+  - uid: 7133
+    components:
+    - type: Transform
+      pos: 46.5,-47.5
       parent: 2
   - uid: 7149
     components:
@@ -27477,46 +29215,51 @@ entities:
     - type: Transform
       pos: 63.5,-16.5
       parent: 2
-  - uid: 7228
+  - uid: 7256
     components:
     - type: Transform
-      pos: 58.5,-53.5
-      parent: 2
-  - uid: 7266
-    components:
-    - type: Transform
-      pos: 59.5,-52.5
+      pos: 46.5,-43.5
       parent: 2
   - uid: 7276
     components:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
-  - uid: 7277
-    components:
-    - type: Transform
-      pos: 60.5,-52.5
-      parent: 2
   - uid: 7288
     components:
     - type: Transform
       pos: 50.5,-76.5
       parent: 2
-  - uid: 7293
-    components:
-    - type: Transform
-      pos: 65.5,-38.5
-      parent: 2
   - uid: 7298
     components:
     - type: Transform
       pos: 30.5,-72.5
       parent: 2
+  - uid: 7318
+    components:
+    - type: Transform
+      pos: 26.5,-23.5
+      parent: 2
+  - uid: 7365
+    components:
+    - type: Transform
+      pos: 4.5,-59.5
+      parent: 2
+  - uid: 7366
+    components:
+    - type: Transform
+      pos: 3.5,-59.5
+      parent: 2
   - uid: 7418
     components:
     - type: Transform
       pos: 26.5,-70.5
       parent: 2
+  - uid: 7422
+    components:
+    - type: Transform
+      pos: 102.5,-45.5
+      parent: 2
   - uid: 7424
     components:
     - type: Transform
@@ -27607,250 +29350,45 @@ entities:
     - type: Transform
       pos: 78.5,-45.5
       parent: 2
-  - uid: 7528
+  - uid: 7510
     components:
     - type: Transform
-      pos: 98.5,-55.5
+      pos: 102.5,-44.5
+      parent: 2
+  - uid: 7511
+    components:
+    - type: Transform
+      pos: 102.5,-43.5
+      parent: 2
+  - uid: 7512
+    components:
+    - type: Transform
+      pos: 102.5,-41.5
       parent: 2
   - uid: 7535
     components:
     - type: Transform
       pos: 82.5,-33.5
       parent: 2
-  - uid: 7536
+  - uid: 7547
     components:
     - type: Transform
-      pos: 96.5,-56.5
+      pos: 102.5,-42.5
       parent: 2
-  - uid: 7537
+  - uid: 7555
     components:
     - type: Transform
-      pos: 96.5,-55.5
-      parent: 2
-  - uid: 7554
-    components:
-    - type: Transform
-      pos: 98.5,-56.5
-      parent: 2
-  - uid: 7557
-    components:
-    - type: Transform
-      pos: 98.5,-57.5
-      parent: 2
-  - uid: 7558
-    components:
-    - type: Transform
-      pos: 99.5,-54.5
-      parent: 2
-  - uid: 7559
-    components:
-    - type: Transform
-      pos: 99.5,-53.5
-      parent: 2
-  - uid: 7560
-    components:
-    - type: Transform
-      pos: 99.5,-52.5
-      parent: 2
-  - uid: 7561
-    components:
-    - type: Transform
-      pos: 99.5,-51.5
-      parent: 2
-  - uid: 7562
-    components:
-    - type: Transform
-      pos: 97.5,-53.5
+      pos: 101.5,-51.5
       parent: 2
   - uid: 7563
     components:
     - type: Transform
-      pos: 97.5,-52.5
+      pos: 94.5,-45.5
       parent: 2
-  - uid: 7564
+  - uid: 7614
     components:
     - type: Transform
-      pos: 97.5,-51.5
-      parent: 2
-  - uid: 7565
-    components:
-    - type: Transform
-      pos: 97.5,-50.5
-      parent: 2
-  - uid: 7566
-    components:
-    - type: Transform
-      pos: 100.5,-49.5
-      parent: 2
-  - uid: 7567
-    components:
-    - type: Transform
-      pos: 100.5,-48.5
-      parent: 2
-  - uid: 7568
-    components:
-    - type: Transform
-      pos: 100.5,-47.5
-      parent: 2
-  - uid: 7569
-    components:
-    - type: Transform
-      pos: 100.5,-46.5
-      parent: 2
-  - uid: 7570
-    components:
-    - type: Transform
-      pos: 100.5,-45.5
-      parent: 2
-  - uid: 7571
-    components:
-    - type: Transform
-      pos: 100.5,-44.5
-      parent: 2
-  - uid: 7572
-    components:
-    - type: Transform
-      pos: 100.5,-43.5
-      parent: 2
-  - uid: 7573
-    components:
-    - type: Transform
-      pos: 100.5,-42.5
-      parent: 2
-  - uid: 7574
-    components:
-    - type: Transform
-      pos: 100.5,-41.5
-      parent: 2
-  - uid: 7575
-    components:
-    - type: Transform
-      pos: 98.5,-48.5
-      parent: 2
-  - uid: 7576
-    components:
-    - type: Transform
-      pos: 98.5,-47.5
-      parent: 2
-  - uid: 7577
-    components:
-    - type: Transform
-      pos: 98.5,-46.5
-      parent: 2
-  - uid: 7578
-    components:
-    - type: Transform
-      pos: 98.5,-45.5
-      parent: 2
-  - uid: 7579
-    components:
-    - type: Transform
-      pos: 98.5,-44.5
-      parent: 2
-  - uid: 7580
-    components:
-    - type: Transform
-      pos: 98.5,-43.5
-      parent: 2
-  - uid: 7581
-    components:
-    - type: Transform
-      pos: 98.5,-42.5
-      parent: 2
-  - uid: 7582
-    components:
-    - type: Transform
-      pos: 97.5,-40.5
-      parent: 2
-  - uid: 7583
-    components:
-    - type: Transform
-      pos: 97.5,-39.5
-      parent: 2
-  - uid: 7584
-    components:
-    - type: Transform
-      pos: 97.5,-38.5
-      parent: 2
-  - uid: 7585
-    components:
-    - type: Transform
-      pos: 97.5,-37.5
-      parent: 2
-  - uid: 7586
-    components:
-    - type: Transform
-      pos: 99.5,-39.5
-      parent: 2
-  - uid: 7587
-    components:
-    - type: Transform
-      pos: 99.5,-38.5
-      parent: 2
-  - uid: 7588
-    components:
-    - type: Transform
-      pos: 99.5,-37.5
-      parent: 2
-  - uid: 7589
-    components:
-    - type: Transform
-      pos: 99.5,-36.5
-      parent: 2
-  - uid: 7590
-    components:
-    - type: Transform
-      pos: 98.5,-35.5
-      parent: 2
-  - uid: 7591
-    components:
-    - type: Transform
-      pos: 98.5,-34.5
-      parent: 2
-  - uid: 7592
-    components:
-    - type: Transform
-      pos: 98.5,-33.5
-      parent: 2
-  - uid: 7593
-    components:
-    - type: Transform
-      pos: 96.5,-34.5
-      parent: 2
-  - uid: 7594
-    components:
-    - type: Transform
-      pos: 96.5,-35.5
-      parent: 2
-  - uid: 7595
-    components:
-    - type: Transform
-      pos: 98.5,-36.5
-      parent: 2
-  - uid: 7596
-    components:
-    - type: Transform
-      pos: 96.5,-36.5
-      parent: 2
-  - uid: 7597
-    components:
-    - type: Transform
-      pos: 96.5,-37.5
-      parent: 2
-  - uid: 7598
-    components:
-    - type: Transform
-      pos: 96.5,-53.5
-      parent: 2
-  - uid: 7599
-    components:
-    - type: Transform
-      pos: 96.5,-54.5
-      parent: 2
-  - uid: 7623
-    components:
-    - type: Transform
-      pos: 98.5,-54.5
+      pos: 32.5,-32.5
       parent: 2
   - uid: 7624
     components:
@@ -27872,11 +29410,6 @@ entities:
     - type: Transform
       pos: 78.5,-35.5
       parent: 2
-  - uid: 7628
-    components:
-    - type: Transform
-      pos: 78.5,-36.5
-      parent: 2
   - uid: 7630
     components:
     - type: Transform
@@ -27965,7 +29498,7 @@ entities:
   - uid: 7647
     components:
     - type: Transform
-      pos: 78.5,-55.5
+      pos: 45.5,-32.5
       parent: 2
   - uid: 7649
     components:
@@ -27992,71 +29525,56 @@ entities:
     - type: Transform
       pos: 83.5,-57.5
       parent: 2
-  - uid: 7748
-    components:
-    - type: Transform
-      pos: 67.5,-38.5
-      parent: 2
-  - uid: 7749
-    components:
-    - type: Transform
-      pos: 63.5,-39.5
-      parent: 2
-  - uid: 7750
-    components:
-    - type: Transform
-      pos: 77.5,-41.5
-      parent: 2
   - uid: 7986
     components:
     - type: Transform
       pos: 28.5,-69.5
       parent: 2
-  - uid: 7988
-    components:
-    - type: Transform
-      pos: 61.5,-53.5
-      parent: 2
   - uid: 7991
     components:
     - type: Transform
       pos: 67.5,-24.5
       parent: 2
-  - uid: 7993
-    components:
-    - type: Transform
-      pos: 50.5,-52.5
-      parent: 2
-  - uid: 7996
-    components:
-    - type: Transform
-      pos: 40.5,-70.5
-      parent: 2
-  - uid: 8069
-    components:
-    - type: Transform
-      pos: 63.5,-44.5
-      parent: 2
   - uid: 8072
     components:
     - type: Transform
       pos: 66.5,-24.5
       parent: 2
+  - uid: 8118
+    components:
+    - type: Transform
+      pos: 100.5,-54.5
+      parent: 2
+  - uid: 8127
+    components:
+    - type: Transform
+      pos: 35.5,-32.5
+      parent: 2
   - uid: 8128
     components:
     - type: Transform
       pos: -28.5,-88.5
       parent: 2
-  - uid: 8131
+  - uid: 8133
     components:
     - type: Transform
-      pos: 61.5,-54.5
+      pos: 37.5,-32.5
       parent: 2
   - uid: 8137
     components:
     - type: Transform
       pos: -26.5,-88.5
       parent: 2
+  - uid: 8147
+    components:
+    - type: Transform
+      pos: 47.5,-32.5
+      parent: 2
+  - uid: 8167
+    components:
+    - type: Transform
+      pos: 98.5,-53.5
+      parent: 2
   - uid: 8179
     components:
     - type: Transform
@@ -28077,11 +29595,26 @@ entities:
     - type: Transform
       pos: 24.5,-72.5
       parent: 2
+  - uid: 8194
+    components:
+    - type: Transform
+      pos: 101.5,-39.5
+      parent: 2
   - uid: 8203
     components:
     - type: Transform
       pos: 24.5,-62.5
       parent: 2
+  - uid: 8219
+    components:
+    - type: Transform
+      pos: 101.5,-38.5
+      parent: 2
+  - uid: 8221
+    components:
+    - type: Transform
+      pos: 101.5,-37.5
+      parent: 2
   - uid: 8250
     components:
     - type: Transform
@@ -28394,11 +29927,96 @@ entities:
     - type: Transform
       pos: -54.5,-23.5
       parent: 2
+  - uid: 8345
+    components:
+    - type: Transform
+      pos: 101.5,-36.5
+      parent: 2
+  - uid: 8348
+    components:
+    - type: Transform
+      pos: 100.5,-36.5
+      parent: 2
+  - uid: 8359
+    components:
+    - type: Transform
+      pos: 100.5,-34.5
+      parent: 2
   - uid: 8370
     components:
     - type: Transform
       pos: -25.5,-88.5
       parent: 2
+  - uid: 8371
+    components:
+    - type: Transform
+      pos: 100.5,-33.5
+      parent: 2
+  - uid: 8393
+    components:
+    - type: Transform
+      pos: 47.5,-34.5
+      parent: 2
+  - uid: 8418
+    components:
+    - type: Transform
+      pos: 47.5,-33.5
+      parent: 2
+  - uid: 8445
+    components:
+    - type: Transform
+      pos: 47.5,-35.5
+      parent: 2
+  - uid: 8446
+    components:
+    - type: Transform
+      pos: 47.5,-36.5
+      parent: 2
+  - uid: 8457
+    components:
+    - type: Transform
+      pos: 47.5,-38.5
+      parent: 2
+  - uid: 8458
+    components:
+    - type: Transform
+      pos: 48.5,-38.5
+      parent: 2
+  - uid: 8459
+    components:
+    - type: Transform
+      pos: 48.5,-39.5
+      parent: 2
+  - uid: 8460
+    components:
+    - type: Transform
+      pos: 48.5,-40.5
+      parent: 2
+  - uid: 8461
+    components:
+    - type: Transform
+      pos: 48.5,-41.5
+      parent: 2
+  - uid: 8462
+    components:
+    - type: Transform
+      pos: 48.5,-42.5
+      parent: 2
+  - uid: 8463
+    components:
+    - type: Transform
+      pos: 48.5,-43.5
+      parent: 2
+  - uid: 8464
+    components:
+    - type: Transform
+      pos: 47.5,-43.5
+      parent: 2
+  - uid: 8510
+    components:
+    - type: Transform
+      pos: 99.5,-40.5
+      parent: 2
   - uid: 8559
     components:
     - type: Transform
@@ -28414,21 +30032,46 @@ entities:
     - type: Transform
       pos: 64.5,-23.5
       parent: 2
-  - uid: 8569
+  - uid: 8566
     components:
     - type: Transform
-      pos: 75.5,-41.5
+      pos: 99.5,-39.5
       parent: 2
-  - uid: 8582
+  - uid: 8573
     components:
     - type: Transform
-      pos: 40.5,-72.5
+      pos: 100.5,-46.5
+      parent: 2
+  - uid: 8580
+    components:
+    - type: Transform
+      pos: 100.5,-44.5
       parent: 2
   - uid: 8583
     components:
     - type: Transform
       pos: 24.5,-59.5
       parent: 2
+  - uid: 8584
+    components:
+    - type: Transform
+      pos: 100.5,-45.5
+      parent: 2
+  - uid: 8586
+    components:
+    - type: Transform
+      pos: 98.5,-55.5
+      parent: 2
+  - uid: 8587
+    components:
+    - type: Transform
+      pos: 98.5,-54.5
+      parent: 2
+  - uid: 8588
+    components:
+    - type: Transform
+      pos: 99.5,-53.5
+      parent: 2
   - uid: 8694
     components:
     - type: Transform
@@ -28469,6 +30112,21 @@ entities:
     - type: Transform
       pos: 7.5,-87.5
       parent: 2
+  - uid: 9275
+    components:
+    - type: Transform
+      pos: 37.5,-78.5
+      parent: 2
+  - uid: 9284
+    components:
+    - type: Transform
+      pos: 37.5,-76.5
+      parent: 2
+  - uid: 9314
+    components:
+    - type: Transform
+      pos: 99.5,-38.5
+      parent: 2
   - uid: 9339
     components:
     - type: Transform
@@ -28494,21 +30152,6 @@ entities:
     - type: Transform
       pos: 43.5,-12.5
       parent: 2
-  - uid: 9384
-    components:
-    - type: Transform
-      pos: 72.5,-38.5
-      parent: 2
-  - uid: 9385
-    components:
-    - type: Transform
-      pos: 64.5,-38.5
-      parent: 2
-  - uid: 9386
-    components:
-    - type: Transform
-      pos: 66.5,-38.5
-      parent: 2
   - uid: 10007
     components:
     - type: Transform
@@ -28549,26 +30192,6 @@ entities:
     - type: Transform
       pos: 56.5,-15.5
       parent: 2
-  - uid: 10289
-    components:
-    - type: Transform
-      pos: 68.5,-38.5
-      parent: 2
-  - uid: 10290
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-  - uid: 10291
-    components:
-    - type: Transform
-      pos: 74.5,-41.5
-      parent: 2
-  - uid: 10315
-    components:
-    - type: Transform
-      pos: 37.5,-73.5
-      parent: 2
   - uid: 10325
     components:
     - type: Transform
@@ -28579,10 +30202,30 @@ entities:
     - type: Transform
       pos: 65.5,-17.5
       parent: 2
-  - uid: 10660
+  - uid: 10676
     components:
     - type: Transform
-      pos: 38.5,-73.5
+      pos: 46.5,-44.5
+      parent: 2
+  - uid: 10719
+    components:
+    - type: Transform
+      pos: 101.5,-52.5
+      parent: 2
+  - uid: 10720
+    components:
+    - type: Transform
+      pos: 77.5,-29.5
+      parent: 2
+  - uid: 10722
+    components:
+    - type: Transform
+      pos: 100.5,-55.5
+      parent: 2
+  - uid: 10738
+    components:
+    - type: Transform
+      pos: 101.5,-54.5
       parent: 2
   - uid: 10744
     components:
@@ -28602,12 +30245,7 @@ entities:
   - uid: 10750
     components:
     - type: Transform
-      pos: 70.5,-37.5
-      parent: 2
-  - uid: 10752
-    components:
-    - type: Transform
-      pos: 76.5,-41.5
+      pos: 76.5,-30.5
       parent: 2
   - uid: 10769
     components:
@@ -28624,11 +30262,6 @@ entities:
     - type: Transform
       pos: 35.5,-72.5
       parent: 2
-  - uid: 10832
-    components:
-    - type: Transform
-      pos: 39.5,-73.5
-      parent: 2
   - uid: 10840
     components:
     - type: Transform
@@ -28639,10 +30272,10 @@ entities:
     - type: Transform
       pos: 78.5,-46.5
       parent: 2
-  - uid: 10861
+  - uid: 10857
     components:
     - type: Transform
-      pos: 63.5,-46.5
+      pos: 76.5,-27.5
       parent: 2
   - uid: 10879
     components:
@@ -28679,6 +30312,11 @@ entities:
     - type: Transform
       pos: -26.5,-21.5
       parent: 2
+  - uid: 11633
+    components:
+    - type: Transform
+      pos: 48.5,-32.5
+      parent: 2
   - uid: 11679
     components:
     - type: Transform
@@ -28759,21 +30397,41 @@ entities:
     - type: Transform
       pos: 52.5,-14.5
       parent: 2
-  - uid: 11827
+  - uid: 11833
     components:
     - type: Transform
-      pos: 48.5,-52.5
+      pos: 77.5,-27.5
       parent: 2
-  - uid: 11871
+  - uid: 11835
     components:
     - type: Transform
-      pos: 63.5,-50.5
+      pos: 76.5,-29.5
+      parent: 2
+  - uid: 11855
+    components:
+    - type: Transform
+      pos: 78.5,-69.5
+      parent: 2
+  - uid: 11901
+    components:
+    - type: Transform
+      pos: 76.5,-31.5
       parent: 2
   - uid: 11943
     components:
     - type: Transform
       pos: 76.5,-25.5
       parent: 2
+  - uid: 11976
+    components:
+    - type: Transform
+      pos: 44.5,-49.5
+      parent: 2
+  - uid: 11977
+    components:
+    - type: Transform
+      pos: 45.5,-49.5
+      parent: 2
   - uid: 12419
     components:
     - type: Transform
@@ -28784,6 +30442,66 @@ entities:
     - type: Transform
       pos: 1.5,-35.5
       parent: 2
+  - uid: 12933
+    components:
+    - type: Transform
+      pos: 48.5,-31.5
+      parent: 2
+  - uid: 12963
+    components:
+    - type: Transform
+      pos: 44.5,-32.5
+      parent: 2
+  - uid: 12964
+    components:
+    - type: Transform
+      pos: 43.5,-32.5
+      parent: 2
+  - uid: 12965
+    components:
+    - type: Transform
+      pos: 45.5,-48.5
+      parent: 2
+  - uid: 12972
+    components:
+    - type: Transform
+      pos: 46.5,-32.5
+      parent: 2
+  - uid: 12982
+    components:
+    - type: Transform
+      pos: 42.5,-52.5
+      parent: 2
+  - uid: 12984
+    components:
+    - type: Transform
+      pos: 42.5,-51.5
+      parent: 2
+  - uid: 12985
+    components:
+    - type: Transform
+      pos: 42.5,-50.5
+      parent: 2
+  - uid: 12986
+    components:
+    - type: Transform
+      pos: 42.5,-49.5
+      parent: 2
+  - uid: 12987
+    components:
+    - type: Transform
+      pos: 43.5,-49.5
+      parent: 2
+  - uid: 13253
+    components:
+    - type: Transform
+      pos: 77.5,-35.5
+      parent: 2
+  - uid: 13255
+    components:
+    - type: Transform
+      pos: 79.5,-31.5
+      parent: 2
   - uid: 13265
     components:
     - type: Transform
@@ -29904,11 +31622,6 @@ entities:
     - type: Transform
       pos: 2.5,-60.5
       parent: 2
-  - uid: 13560
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
   - uid: 13561
     components:
     - type: Transform
@@ -30214,25 +31927,15 @@ entities:
     - type: Transform
       pos: 37.5,-79.5
       parent: 2
-  - uid: 13634
-    components:
-    - type: Transform
-      pos: 37.5,-78.5
-      parent: 2
   - uid: 13635
     components:
     - type: Transform
-      pos: 38.5,-78.5
+      pos: 38.5,-76.5
       parent: 2
   - uid: 13636
     components:
     - type: Transform
-      pos: 38.5,-77.5
-      parent: 2
-  - uid: 13637
-    components:
-    - type: Transform
-      pos: 38.5,-76.5
+      pos: 37.5,-77.5
       parent: 2
   - uid: 13638
     components:
@@ -30444,86 +32147,6 @@ entities:
     - type: Transform
       pos: 24.5,-24.5
       parent: 2
-  - uid: 13686
-    components:
-    - type: Transform
-      pos: 24.5,-23.5
-      parent: 2
-  - uid: 13687
-    components:
-    - type: Transform
-      pos: 24.5,-22.5
-      parent: 2
-  - uid: 13688
-    components:
-    - type: Transform
-      pos: 25.5,-22.5
-      parent: 2
-  - uid: 13689
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 2
-  - uid: 13690
-    components:
-    - type: Transform
-      pos: 27.5,-22.5
-      parent: 2
-  - uid: 13691
-    components:
-    - type: Transform
-      pos: 28.5,-22.5
-      parent: 2
-  - uid: 13692
-    components:
-    - type: Transform
-      pos: 29.5,-22.5
-      parent: 2
-  - uid: 13693
-    components:
-    - type: Transform
-      pos: 30.5,-22.5
-      parent: 2
-  - uid: 13694
-    components:
-    - type: Transform
-      pos: 31.5,-22.5
-      parent: 2
-  - uid: 13695
-    components:
-    - type: Transform
-      pos: 32.5,-22.5
-      parent: 2
-  - uid: 13696
-    components:
-    - type: Transform
-      pos: 33.5,-22.5
-      parent: 2
-  - uid: 13697
-    components:
-    - type: Transform
-      pos: 34.5,-22.5
-      parent: 2
-  - uid: 13698
-    components:
-    - type: Transform
-      pos: 35.5,-22.5
-      parent: 2
-  - uid: 13699
-    components:
-    - type: Transform
-      pos: 36.5,-22.5
-      parent: 2
-  - uid: 13700
-    components:
-    - type: Transform
-      pos: 37.5,-22.5
-      parent: 2
-  - uid: 13701
-    components:
-    - type: Transform
-      pos: 38.5,-22.5
-      parent: 2
   - uid: 13702
     components:
     - type: Transform
@@ -30949,31 +32572,6 @@ entities:
     - type: Transform
       pos: 42.5,-53.5
       parent: 2
-  - uid: 13789
-    components:
-    - type: Transform
-      pos: 43.5,-53.5
-      parent: 2
-  - uid: 13790
-    components:
-    - type: Transform
-      pos: 44.5,-53.5
-      parent: 2
-  - uid: 13791
-    components:
-    - type: Transform
-      pos: 45.5,-53.5
-      parent: 2
-  - uid: 13792
-    components:
-    - type: Transform
-      pos: 46.5,-53.5
-      parent: 2
-  - uid: 13793
-    components:
-    - type: Transform
-      pos: 47.5,-53.5
-      parent: 2
   - uid: 13795
     components:
     - type: Transform
@@ -30984,16 +32582,6 @@ entities:
     - type: Transform
       pos: 61.5,-15.5
       parent: 2
-  - uid: 13826
-    components:
-    - type: Transform
-      pos: 63.5,-51.5
-      parent: 2
-  - uid: 13827
-    components:
-    - type: Transform
-      pos: 63.5,-48.5
-      parent: 2
   - uid: 13835
     components:
     - type: Transform
@@ -31014,21 +32602,21 @@ entities:
     - type: Transform
       pos: 68.5,-24.5
       parent: 2
+  - uid: 13919
+    components:
+    - type: Transform
+      pos: 77.5,-31.5
+      parent: 2
+  - uid: 13943
+    components:
+    - type: Transform
+      pos: 77.5,-37.5
+      parent: 2
   - uid: 14030
     components:
     - type: Transform
       pos: -22.5,-74.5
       parent: 2
-  - uid: 14083
-    components:
-    - type: Transform
-      pos: 63.5,-52.5
-      parent: 2
-  - uid: 14118
-    components:
-    - type: Transform
-      pos: 63.5,-47.5
-      parent: 2
   - uid: 14143
     components:
     - type: Transform
@@ -31039,40 +32627,35 @@ entities:
     - type: Transform
       pos: 29.5,-71.5
       parent: 2
-  - uid: 14316
-    components:
-    - type: Transform
-      pos: 62.5,-52.5
-      parent: 2
-  - uid: 14358
-    components:
-    - type: Transform
-      pos: 61.5,-52.5
-      parent: 2
   - uid: 14394
     components:
     - type: Transform
       pos: -3.5,-40.5
       parent: 2
-  - uid: 14583
-    components:
-    - type: Transform
-      pos: 58.5,-54.5
-      parent: 2
   - uid: 14722
     components:
     - type: Transform
       pos: -28.5,-72.5
       parent: 2
+  - uid: 14737
+    components:
+    - type: Transform
+      pos: 42.5,-32.5
+      parent: 2
   - uid: 14790
     components:
     - type: Transform
       pos: -21.5,-74.5
       parent: 2
-  - uid: 14814
+  - uid: 14837
     components:
     - type: Transform
-      pos: 63.5,-49.5
+      pos: 95.5,-45.5
+      parent: 2
+  - uid: 14864
+    components:
+    - type: Transform
+      pos: 46.5,-46.5
       parent: 2
   - uid: 14977
     components:
@@ -31559,135 +33142,10 @@ entities:
     - type: Transform
       pos: 28.5,-33.5
       parent: 2
-  - uid: 15236
+  - uid: 15789
     components:
     - type: Transform
-      pos: 38.5,-35.5
-      parent: 2
-  - uid: 15237
-    components:
-    - type: Transform
-      pos: 39.5,-35.5
-      parent: 2
-  - uid: 15238
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
-      parent: 2
-  - uid: 15239
-    components:
-    - type: Transform
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 15240
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
-      parent: 2
-  - uid: 15241
-    components:
-    - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
-  - uid: 15242
-    components:
-    - type: Transform
-      pos: 41.5,-38.5
-      parent: 2
-  - uid: 15243
-    components:
-    - type: Transform
-      pos: 42.5,-38.5
-      parent: 2
-  - uid: 15244
-    components:
-    - type: Transform
-      pos: 42.5,-37.5
-      parent: 2
-  - uid: 15245
-    components:
-    - type: Transform
-      pos: 42.5,-36.5
-      parent: 2
-  - uid: 15246
-    components:
-    - type: Transform
-      pos: 42.5,-35.5
-      parent: 2
-  - uid: 15247
-    components:
-    - type: Transform
-      pos: 43.5,-35.5
-      parent: 2
-  - uid: 15248
-    components:
-    - type: Transform
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 15249
-    components:
-    - type: Transform
-      pos: 44.5,-36.5
-      parent: 2
-  - uid: 15250
-    components:
-    - type: Transform
-      pos: 44.5,-37.5
-      parent: 2
-  - uid: 15251
-    components:
-    - type: Transform
-      pos: 45.5,-37.5
-      parent: 2
-  - uid: 15252
-    components:
-    - type: Transform
-      pos: 46.5,-37.5
-      parent: 2
-  - uid: 15253
-    components:
-    - type: Transform
-      pos: 46.5,-38.5
-      parent: 2
-  - uid: 15254
-    components:
-    - type: Transform
-      pos: 47.5,-38.5
-      parent: 2
-  - uid: 15255
-    components:
-    - type: Transform
-      pos: 48.5,-38.5
-      parent: 2
-  - uid: 15256
-    components:
-    - type: Transform
-      pos: 48.5,-37.5
-      parent: 2
-  - uid: 15259
-    components:
-    - type: Transform
-      pos: 38.5,-34.5
-      parent: 2
-  - uid: 15260
-    components:
-    - type: Transform
-      pos: 38.5,-33.5
-      parent: 2
-  - uid: 15264
-    components:
-    - type: Transform
-      pos: 38.5,-32.5
-      parent: 2
-  - uid: 15508
-    components:
-    - type: Transform
-      pos: 38.5,-31.5
-      parent: 2
-  - uid: 15509
-    components:
-    - type: Transform
-      pos: 37.5,-31.5
+      pos: 46.5,-70.5
       parent: 2
   - uid: 15916
     components:
@@ -32034,11 +33492,6 @@ entities:
     - type: Transform
       pos: -1.5,-74.5
       parent: 2
-  - uid: 17224
-    components:
-    - type: Transform
-      pos: 36.5,-31.5
-      parent: 2
   - uid: 17585
     components:
     - type: Transform
@@ -32324,51 +33777,6 @@ entities:
     - type: Transform
       pos: 77.5,-69.5
       parent: 2
-  - uid: 18665
-    components:
-    - type: Transform
-      pos: 76.5,-69.5
-      parent: 2
-  - uid: 18666
-    components:
-    - type: Transform
-      pos: 75.5,-69.5
-      parent: 2
-  - uid: 18667
-    components:
-    - type: Transform
-      pos: 74.5,-69.5
-      parent: 2
-  - uid: 18668
-    components:
-    - type: Transform
-      pos: 74.5,-68.5
-      parent: 2
-  - uid: 18669
-    components:
-    - type: Transform
-      pos: 74.5,-67.5
-      parent: 2
-  - uid: 18670
-    components:
-    - type: Transform
-      pos: 75.5,-67.5
-      parent: 2
-  - uid: 18671
-    components:
-    - type: Transform
-      pos: 77.5,-67.5
-      parent: 2
-  - uid: 18672
-    components:
-    - type: Transform
-      pos: 78.5,-67.5
-      parent: 2
-  - uid: 18673
-    components:
-    - type: Transform
-      pos: 76.5,-67.5
-      parent: 2
   - uid: 18674
     components:
     - type: Transform
@@ -32404,21 +33812,6 @@ entities:
     - type: Transform
       pos: 78.5,-58.5
       parent: 2
-  - uid: 18681
-    components:
-    - type: Transform
-      pos: 78.5,-59.5
-      parent: 2
-  - uid: 18682
-    components:
-    - type: Transform
-      pos: 78.5,-60.5
-      parent: 2
-  - uid: 18683
-    components:
-    - type: Transform
-      pos: 78.5,-61.5
-      parent: 2
   - uid: 18684
     components:
     - type: Transform
@@ -32489,12 +33882,72 @@ entities:
     - type: Transform
       pos: -45.5,-35.5
       parent: 2
-- proto: CableMV
-  entities:
-  - uid: 256
+  - uid: 19502
     components:
     - type: Transform
-      pos: 64.5,-39.5
+      pos: 45.5,-71.5
+      parent: 2
+  - uid: 19503
+    components:
+    - type: Transform
+      pos: 44.5,-71.5
+      parent: 2
+  - uid: 19504
+    components:
+    - type: Transform
+      pos: 43.5,-71.5
+      parent: 2
+  - uid: 19505
+    components:
+    - type: Transform
+      pos: 42.5,-71.5
+      parent: 2
+  - uid: 19506
+    components:
+    - type: Transform
+      pos: 41.5,-71.5
+      parent: 2
+  - uid: 19507
+    components:
+    - type: Transform
+      pos: 40.5,-71.5
+      parent: 2
+  - uid: 19508
+    components:
+    - type: Transform
+      pos: 39.5,-71.5
+      parent: 2
+  - uid: 19509
+    components:
+    - type: Transform
+      pos: 38.5,-71.5
+      parent: 2
+  - uid: 19510
+    components:
+    - type: Transform
+      pos: 37.5,-71.5
+      parent: 2
+  - uid: 19591
+    components:
+    - type: Transform
+      pos: 2.5,-75.5
+      parent: 2
+  - uid: 19592
+    components:
+    - type: Transform
+      pos: 2.5,-76.5
+      parent: 2
+- proto: CableMV
+  entities:
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 7.5,-49.5
+      parent: 2
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 41.5,-44.5
       parent: 2
   - uid: 527
     components:
@@ -32511,11 +33964,21 @@ entities:
     - type: Transform
       pos: -21.5,-23.5
       parent: 2
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 58.5,-74.5
+      parent: 2
   - uid: 773
     components:
     - type: Transform
       pos: 64.5,-28.5
       parent: 2
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 46.5,-43.5
+      parent: 2
   - uid: 824
     components:
     - type: Transform
@@ -32526,11 +33989,6 @@ entities:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
-  - uid: 1062
-    components:
-    - type: Transform
-      pos: 64.5,-41.5
-      parent: 2
   - uid: 1070
     components:
     - type: Transform
@@ -32576,10 +34034,10 @@ entities:
     - type: Transform
       pos: -7.5,-21.5
       parent: 2
-  - uid: 1885
+  - uid: 1849
     components:
     - type: Transform
-      pos: 63.5,-54.5
+      pos: 33.5,-19.5
       parent: 2
   - uid: 2240
     components:
@@ -32609,7 +34067,7 @@ entities:
   - uid: 2769
     components:
     - type: Transform
-      pos: 6.5,-51.5
+      pos: 5.5,-49.5
       parent: 2
   - uid: 2770
     components:
@@ -32619,7 +34077,7 @@ entities:
   - uid: 2771
     components:
     - type: Transform
-      pos: 5.5,-51.5
+      pos: 4.5,-50.5
       parent: 2
   - uid: 2778
     components:
@@ -32651,11 +34109,6 @@ entities:
     - type: Transform
       pos: 4.5,-59.5
       parent: 2
-  - uid: 2948
-    components:
-    - type: Transform
-      pos: 69.5,-38.5
-      parent: 2
   - uid: 3024
     components:
     - type: Transform
@@ -32666,6 +34119,11 @@ entities:
     - type: Transform
       pos: 61.5,-74.5
       parent: 2
+  - uid: 3051
+    components:
+    - type: Transform
+      pos: 41.5,-41.5
+      parent: 2
   - uid: 3052
     components:
     - type: Transform
@@ -32681,6 +34139,36 @@ entities:
     - type: Transform
       pos: -16.5,-16.5
       parent: 2
+  - uid: 3154
+    components:
+    - type: Transform
+      pos: 57.5,-67.5
+      parent: 2
+  - uid: 3155
+    components:
+    - type: Transform
+      pos: 78.5,-45.5
+      parent: 2
+  - uid: 3170
+    components:
+    - type: Transform
+      pos: 57.5,-69.5
+      parent: 2
+  - uid: 3178
+    components:
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
+  - uid: 3179
+    components:
+    - type: Transform
+      pos: 94.5,-45.5
+      parent: 2
+  - uid: 3193
+    components:
+    - type: Transform
+      pos: 34.5,-19.5
+      parent: 2
   - uid: 3301
     components:
     - type: Transform
@@ -32691,30 +34179,30 @@ entities:
     - type: Transform
       pos: 32.5,-70.5
       parent: 2
-  - uid: 3409
+  - uid: 3384
     components:
     - type: Transform
-      pos: 71.5,-66.5
+      pos: 57.5,-70.5
       parent: 2
-  - uid: 3451
+  - uid: 3386
     components:
     - type: Transform
-      pos: 67.5,-49.5
+      pos: 57.5,-68.5
       parent: 2
-  - uid: 3453
+  - uid: 3391
     components:
     - type: Transform
-      pos: 66.5,-51.5
+      pos: 46.5,-40.5
       parent: 2
-  - uid: 3454
+  - uid: 3403
     components:
     - type: Transform
-      pos: 66.5,-49.5
+      pos: 27.5,-26.5
       parent: 2
-  - uid: 3465
+  - uid: 3423
     components:
     - type: Transform
-      pos: 61.5,-42.5
+      pos: 46.5,-41.5
       parent: 2
   - uid: 3481
     components:
@@ -32736,21 +34224,6 @@ entities:
     - type: Transform
       pos: -47.5,-36.5
       parent: 2
-  - uid: 3561
-    components:
-    - type: Transform
-      pos: 63.5,-52.5
-      parent: 2
-  - uid: 3580
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-  - uid: 3581
-    components:
-    - type: Transform
-      pos: 53.5,-52.5
-      parent: 2
   - uid: 3585
     components:
     - type: Transform
@@ -32766,11 +34239,6 @@ entities:
     - type: Transform
       pos: -48.5,-38.5
       parent: 2
-  - uid: 3611
-    components:
-    - type: Transform
-      pos: 57.5,-75.5
-      parent: 2
   - uid: 3628
     components:
     - type: Transform
@@ -32791,6 +34259,16 @@ entities:
     - type: Transform
       pos: 4.5,-57.5
       parent: 2
+  - uid: 3771
+    components:
+    - type: Transform
+      pos: 30.5,-23.5
+      parent: 2
+  - uid: 3812
+    components:
+    - type: Transform
+      pos: 32.5,-19.5
+      parent: 2
   - uid: 3896
     components:
     - type: Transform
@@ -32801,20 +34279,10 @@ entities:
     - type: Transform
       pos: 58.5,-22.5
       parent: 2
-  - uid: 4000
+  - uid: 4118
     components:
     - type: Transform
-      pos: 60.5,-41.5
-      parent: 2
-  - uid: 4049
-    components:
-    - type: Transform
-      pos: 62.5,-52.5
-      parent: 2
-  - uid: 4063
-    components:
-    - type: Transform
-      pos: 61.5,-52.5
+      pos: 29.5,-23.5
       parent: 2
   - uid: 4128
     components:
@@ -32826,21 +34294,66 @@ entities:
     - type: Transform
       pos: 31.5,-69.5
       parent: 2
+  - uid: 4160
+    components:
+    - type: Transform
+      pos: 78.5,-69.5
+      parent: 2
   - uid: 4194
     components:
     - type: Transform
       pos: 59.5,-21.5
       parent: 2
+  - uid: 4258
+    components:
+    - type: Transform
+      pos: 31.5,-19.5
+      parent: 2
+  - uid: 4347
+    components:
+    - type: Transform
+      pos: 31.5,-20.5
+      parent: 2
+  - uid: 4356
+    components:
+    - type: Transform
+      pos: 31.5,-21.5
+      parent: 2
+  - uid: 4399
+    components:
+    - type: Transform
+      pos: 31.5,-22.5
+      parent: 2
+  - uid: 4405
+    components:
+    - type: Transform
+      pos: 95.5,-47.5
+      parent: 2
+  - uid: 4419
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
   - uid: 4438
     components:
     - type: Transform
       pos: 4.5,-56.5
       parent: 2
+  - uid: 4557
+    components:
+    - type: Transform
+      pos: 6.5,-49.5
+      parent: 2
   - uid: 4558
     components:
     - type: Transform
       pos: 29.5,-68.5
       parent: 2
+  - uid: 4562
+    components:
+    - type: Transform
+      pos: 25.5,-23.5
+      parent: 2
   - uid: 4691
     components:
     - type: Transform
@@ -32871,6 +34384,36 @@ entities:
     - type: Transform
       pos: 82.5,-45.5
       parent: 2
+  - uid: 4916
+    components:
+    - type: Transform
+      pos: 46.5,-48.5
+      parent: 2
+  - uid: 4919
+    components:
+    - type: Transform
+      pos: 46.5,-47.5
+      parent: 2
+  - uid: 4920
+    components:
+    - type: Transform
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 4925
+    components:
+    - type: Transform
+      pos: 46.5,-45.5
+      parent: 2
+  - uid: 4926
+    components:
+    - type: Transform
+      pos: 46.5,-44.5
+      parent: 2
+  - uid: 4999
+    components:
+    - type: Transform
+      pos: 4.5,-49.5
+      parent: 2
   - uid: 5009
     components:
     - type: Transform
@@ -32901,6 +34444,21 @@ entities:
     - type: Transform
       pos: -32.5,-83.5
       parent: 2
+  - uid: 5318
+    components:
+    - type: Transform
+      pos: 58.5,-66.5
+      parent: 2
+  - uid: 5323
+    components:
+    - type: Transform
+      pos: 95.5,-45.5
+      parent: 2
+  - uid: 5333
+    components:
+    - type: Transform
+      pos: 41.5,-49.5
+      parent: 2
   - uid: 5379
     components:
     - type: Transform
@@ -32916,25 +34474,10 @@ entities:
     - type: Transform
       pos: 58.5,-18.5
       parent: 2
-  - uid: 5432
+  - uid: 5412
     components:
     - type: Transform
-      pos: 65.5,-52.5
-      parent: 2
-  - uid: 5435
-    components:
-    - type: Transform
-      pos: 64.5,-52.5
-      parent: 2
-  - uid: 5462
-    components:
-    - type: Transform
-      pos: 42.5,-74.5
-      parent: 2
-  - uid: 5474
-    components:
-    - type: Transform
-      pos: 60.5,-42.5
+      pos: 3.5,-59.5
       parent: 2
   - uid: 5558
     components:
@@ -32976,11 +34519,6 @@ entities:
     - type: Transform
       pos: -39.5,-45.5
       parent: 2
-  - uid: 5600
-    components:
-    - type: Transform
-      pos: 66.5,-50.5
-      parent: 2
   - uid: 5748
     components:
     - type: Transform
@@ -33151,21 +34689,51 @@ entities:
     - type: Transform
       pos: 79.5,-45.5
       parent: 2
+  - uid: 5827
+    components:
+    - type: Transform
+      pos: 42.5,-49.5
+      parent: 2
+  - uid: 5828
+    components:
+    - type: Transform
+      pos: 43.5,-49.5
+      parent: 2
+  - uid: 5831
+    components:
+    - type: Transform
+      pos: 44.5,-49.5
+      parent: 2
   - uid: 6025
     components:
     - type: Transform
       pos: 12.5,-21.5
       parent: 2
-  - uid: 6041
+  - uid: 6118
     components:
     - type: Transform
-      pos: 66.5,-48.5
+      pos: 51.5,-48.5
+      parent: 2
+  - uid: 6217
+    components:
+    - type: Transform
+      pos: 51.5,-50.5
       parent: 2
   - uid: 6361
     components:
     - type: Transform
       pos: 27.5,-65.5
       parent: 2
+  - uid: 6374
+    components:
+    - type: Transform
+      pos: 41.5,-45.5
+      parent: 2
+  - uid: 6382
+    components:
+    - type: Transform
+      pos: 49.5,-47.5
+      parent: 2
   - uid: 6404
     components:
     - type: Transform
@@ -33186,6 +34754,11 @@ entities:
     - type: Transform
       pos: 27.5,-68.5
       parent: 2
+  - uid: 6424
+    components:
+    - type: Transform
+      pos: 51.5,-51.5
+      parent: 2
   - uid: 6473
     components:
     - type: Transform
@@ -33261,11 +34834,21 @@ entities:
     - type: Transform
       pos: 29.5,-69.5
       parent: 2
+  - uid: 6639
+    components:
+    - type: Transform
+      pos: 70.5,-66.5
+      parent: 2
   - uid: 6653
     components:
     - type: Transform
       pos: 12.5,-26.5
       parent: 2
+  - uid: 6670
+    components:
+    - type: Transform
+      pos: 73.5,-64.5
+      parent: 2
   - uid: 6679
     components:
     - type: Transform
@@ -33281,25 +34864,110 @@ entities:
     - type: Transform
       pos: 12.5,-22.5
       parent: 2
+  - uid: 6711
+    components:
+    - type: Transform
+      pos: 73.5,-62.5
+      parent: 2
+  - uid: 6716
+    components:
+    - type: Transform
+      pos: 73.5,-63.5
+      parent: 2
+  - uid: 6717
+    components:
+    - type: Transform
+      pos: 70.5,-64.5
+      parent: 2
+  - uid: 6901
+    components:
+    - type: Transform
+      pos: 51.5,-49.5
+      parent: 2
+  - uid: 7000
+    components:
+    - type: Transform
+      pos: 51.5,-47.5
+      parent: 2
+  - uid: 7036
+    components:
+    - type: Transform
+      pos: 70.5,-69.5
+      parent: 2
+  - uid: 7037
+    components:
+    - type: Transform
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 7038
+    components:
+    - type: Transform
+      pos: 72.5,-64.5
+      parent: 2
+  - uid: 7039
+    components:
+    - type: Transform
+      pos: 71.5,-64.5
+      parent: 2
+  - uid: 7041
+    components:
+    - type: Transform
+      pos: 70.5,-70.5
+      parent: 2
+  - uid: 7044
+    components:
+    - type: Transform
+      pos: 70.5,-67.5
+      parent: 2
+  - uid: 7045
+    components:
+    - type: Transform
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 7101
+    components:
+    - type: Transform
+      pos: 47.5,-46.5
+      parent: 2
+  - uid: 7113
+    components:
+    - type: Transform
+      pos: 72.5,-62.5
+      parent: 2
   - uid: 7126
     components:
     - type: Transform
       pos: -32.5,-74.5
       parent: 2
+  - uid: 7143
+    components:
+    - type: Transform
+      pos: 48.5,-46.5
+      parent: 2
+  - uid: 7152
+    components:
+    - type: Transform
+      pos: 48.5,-45.5
+      parent: 2
   - uid: 7174
     components:
     - type: Transform
       pos: 58.5,-75.5
       parent: 2
-  - uid: 7179
+  - uid: 7214
     components:
     - type: Transform
-      pos: 68.5,-38.5
+      pos: 58.5,-71.5
       parent: 2
-  - uid: 7195
+  - uid: 7219
     components:
     - type: Transform
-      pos: 67.5,-44.5
+      pos: 49.5,-45.5
+      parent: 2
+  - uid: 7224
+    components:
+    - type: Transform
+      pos: 48.5,-47.5
       parent: 2
   - uid: 7225
     components:
@@ -33336,10 +35004,15 @@ entities:
     - type: Transform
       pos: 75.5,-71.5
       parent: 2
-  - uid: 7291
+  - uid: 7275
     components:
     - type: Transform
-      pos: 60.5,-40.5
+      pos: 28.5,-26.5
+      parent: 2
+  - uid: 7286
+    components:
+    - type: Transform
+      pos: 41.5,-46.5
       parent: 2
   - uid: 7324
     components:
@@ -33351,6 +35024,11 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 2
+  - uid: 7377
+    components:
+    - type: Transform
+      pos: 28.5,-25.5
+      parent: 2
   - uid: 7462
     components:
     - type: Transform
@@ -33376,16 +35054,6 @@ entities:
     - type: Transform
       pos: 91.5,-45.5
       parent: 2
-  - uid: 7477
-    components:
-    - type: Transform
-      pos: 90.5,-45.5
-      parent: 2
-  - uid: 7478
-    components:
-    - type: Transform
-      pos: 89.5,-45.5
-      parent: 2
   - uid: 7479
     components:
     - type: Transform
@@ -33396,15 +35064,30 @@ entities:
     - type: Transform
       pos: 88.5,-47.5
       parent: 2
-  - uid: 7497
+  - uid: 7534
     components:
     - type: Transform
-      pos: 84.5,-47.5
+      pos: 57.5,-71.5
       parent: 2
-  - uid: 7500
+  - uid: 7577
     components:
     - type: Transform
-      pos: 93.5,-46.5
+      pos: 58.5,-73.5
+      parent: 2
+  - uid: 7602
+    components:
+    - type: Transform
+      pos: 95.5,-43.5
+      parent: 2
+  - uid: 7604
+    components:
+    - type: Transform
+      pos: 28.5,-24.5
+      parent: 2
+  - uid: 7620
+    components:
+    - type: Transform
+      pos: 94.5,-47.5
       parent: 2
   - uid: 7703
     components:
@@ -33416,46 +35099,51 @@ entities:
     - type: Transform
       pos: -2.5,-48.5
       parent: 2
-  - uid: 7745
-    components:
-    - type: Transform
-      pos: 63.5,-56.5
-      parent: 2
-  - uid: 7746
-    components:
-    - type: Transform
-      pos: 66.5,-52.5
-      parent: 2
   - uid: 7946
     components:
     - type: Transform
       pos: 65.5,-30.5
       parent: 2
-  - uid: 7961
-    components:
-    - type: Transform
-      pos: 74.5,-69.5
-      parent: 2
-  - uid: 8003
-    components:
-    - type: Transform
-      pos: 67.5,-38.5
-      parent: 2
   - uid: 8070
     components:
     - type: Transform
       pos: 64.5,-29.5
       parent: 2
+  - uid: 8082
+    components:
+    - type: Transform
+      pos: 57.5,-66.5
+      parent: 2
+  - uid: 8084
+    components:
+    - type: Transform
+      pos: 46.5,-42.5
+      parent: 2
+  - uid: 8087
+    components:
+    - type: Transform
+      pos: 45.5,-49.5
+      parent: 2
+  - uid: 8090
+    components:
+    - type: Transform
+      pos: 45.5,-48.5
+      parent: 2
+  - uid: 8116
+    components:
+    - type: Transform
+      pos: 41.5,-43.5
+      parent: 2
+  - uid: 8117
+    components:
+    - type: Transform
+      pos: 41.5,-42.5
+      parent: 2
   - uid: 8123
     components:
     - type: Transform
       pos: 74.5,-71.5
       parent: 2
-  - uid: 8162
-    components:
-    - type: Transform
-      pos: 64.5,-38.5
-      parent: 2
   - uid: 8350
     components:
     - type: Transform
@@ -33466,26 +35154,16 @@ entities:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
-  - uid: 8577
+  - uid: 8595
     components:
     - type: Transform
-      pos: 58.5,-52.5
-      parent: 2
-  - uid: 8578
-    components:
-    - type: Transform
-      pos: 55.5,-52.5
+      pos: 50.5,-47.5
       parent: 2
   - uid: 8698
     components:
     - type: Transform
       pos: 17.5,-94.5
       parent: 2
-  - uid: 8823
-    components:
-    - type: Transform
-      pos: 66.5,-47.5
-      parent: 2
   - uid: 8916
     components:
     - type: Transform
@@ -33516,31 +35194,21 @@ entities:
     - type: Transform
       pos: 68.5,-19.5
       parent: 2
-  - uid: 9333
+  - uid: 9266
     components:
     - type: Transform
-      pos: 60.5,-52.5
+      pos: 38.5,-72.5
       parent: 2
-  - uid: 9334
+  - uid: 9310
     components:
     - type: Transform
-      pos: 59.5,-52.5
-      parent: 2
-  - uid: 9417
-    components:
-    - type: Transform
-      pos: 66.5,-45.5
+      pos: 94.5,-43.5
       parent: 2
   - uid: 9419
     components:
     - type: Transform
       pos: 4.5,-39.5
       parent: 2
-  - uid: 9666
-    components:
-    - type: Transform
-      pos: 66.5,-42.5
-      parent: 2
   - uid: 10019
     components:
     - type: Transform
@@ -33561,31 +35229,11 @@ entities:
     - type: Transform
       pos: 0.5,-35.5
       parent: 2
-  - uid: 10271
-    components:
-    - type: Transform
-      pos: 64.5,-31.5
-      parent: 2
   - uid: 10274
     components:
     - type: Transform
       pos: 64.5,-30.5
       parent: 2
-  - uid: 10282
-    components:
-    - type: Transform
-      pos: 63.5,-42.5
-      parent: 2
-  - uid: 10286
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
-  - uid: 10287
-    components:
-    - type: Transform
-      pos: 63.5,-53.5
-      parent: 2
   - uid: 10316
     components:
     - type: Transform
@@ -33596,15 +35244,10 @@ entities:
     - type: Transform
       pos: 61.5,-19.5
       parent: 2
-  - uid: 10339
+  - uid: 10401
     components:
     - type: Transform
-      pos: 57.5,-52.5
-      parent: 2
-  - uid: 10340
-    components:
-    - type: Transform
-      pos: 56.5,-52.5
+      pos: 84.5,-44.5
       parent: 2
   - uid: 10519
     components:
@@ -33881,21 +35524,6 @@ entities:
     - type: Transform
       pos: 4.5,-60.5
       parent: 2
-  - uid: 10595
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
-  - uid: 10596
-    components:
-    - type: Transform
-      pos: 2.5,-60.5
-      parent: 2
-  - uid: 10597
-    components:
-    - type: Transform
-      pos: 1.5,-60.5
-      parent: 2
   - uid: 10598
     components:
     - type: Transform
@@ -34161,16 +35789,6 @@ entities:
     - type: Transform
       pos: 20.5,-69.5
       parent: 2
-  - uid: 10663
-    components:
-    - type: Transform
-      pos: 42.5,-73.5
-      parent: 2
-  - uid: 10672
-    components:
-    - type: Transform
-      pos: 63.5,-55.5
-      parent: 2
   - uid: 10677
     components:
     - type: Transform
@@ -34274,132 +35892,12 @@ entities:
   - uid: 10698
     components:
     - type: Transform
-      pos: 48.5,-37.5
-      parent: 2
-  - uid: 10699
-    components:
-    - type: Transform
-      pos: 48.5,-38.5
+      pos: 41.5,-47.5
       parent: 2
   - uid: 10700
     components:
     - type: Transform
-      pos: 47.5,-38.5
-      parent: 2
-  - uid: 10701
-    components:
-    - type: Transform
-      pos: 46.5,-38.5
-      parent: 2
-  - uid: 10702
-    components:
-    - type: Transform
-      pos: 46.5,-37.5
-      parent: 2
-  - uid: 10703
-    components:
-    - type: Transform
-      pos: 45.5,-37.5
-      parent: 2
-  - uid: 10704
-    components:
-    - type: Transform
-      pos: 44.5,-37.5
-      parent: 2
-  - uid: 10705
-    components:
-    - type: Transform
-      pos: 44.5,-36.5
-      parent: 2
-  - uid: 10706
-    components:
-    - type: Transform
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 10707
-    components:
-    - type: Transform
-      pos: 43.5,-35.5
-      parent: 2
-  - uid: 10708
-    components:
-    - type: Transform
-      pos: 42.5,-35.5
-      parent: 2
-  - uid: 10709
-    components:
-    - type: Transform
-      pos: 42.5,-36.5
-      parent: 2
-  - uid: 10710
-    components:
-    - type: Transform
-      pos: 42.5,-37.5
-      parent: 2
-  - uid: 10711
-    components:
-    - type: Transform
-      pos: 42.5,-38.5
-      parent: 2
-  - uid: 10712
-    components:
-    - type: Transform
-      pos: 41.5,-38.5
-      parent: 2
-  - uid: 10713
-    components:
-    - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
-  - uid: 10714
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
-      parent: 2
-  - uid: 10715
-    components:
-    - type: Transform
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 10716
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
-      parent: 2
-  - uid: 10717
-    components:
-    - type: Transform
-      pos: 39.5,-35.5
-      parent: 2
-  - uid: 10718
-    components:
-    - type: Transform
-      pos: 38.5,-35.5
-      parent: 2
-  - uid: 10719
-    components:
-    - type: Transform
-      pos: 37.5,-35.5
-      parent: 2
-  - uid: 10720
-    components:
-    - type: Transform
-      pos: 37.5,-36.5
-      parent: 2
-  - uid: 10721
-    components:
-    - type: Transform
-      pos: 37.5,-37.5
-      parent: 2
-  - uid: 10722
-    components:
-    - type: Transform
-      pos: 37.5,-38.5
-      parent: 2
-  - uid: 10723
-    components:
-    - type: Transform
-      pos: 37.5,-39.5
+      pos: 41.5,-48.5
       parent: 2
   - uid: 10724
     components:
@@ -34451,51 +35949,21 @@ entities:
     - type: Transform
       pos: 35.5,-40.5
       parent: 2
-  - uid: 10753
-    components:
-    - type: Transform
-      pos: 62.5,-42.5
-      parent: 2
   - uid: 10772
     components:
     - type: Transform
       pos: 63.5,-19.5
       parent: 2
-  - uid: 10805
+  - uid: 10785
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      pos: 2.5,-59.5
       parent: 2
   - uid: 10827
     components:
     - type: Transform
       pos: 93.5,-47.5
       parent: 2
-  - uid: 10828
-    components:
-    - type: Transform
-      pos: 71.5,-65.5
-      parent: 2
-  - uid: 10829
-    components:
-    - type: Transform
-      pos: 72.5,-65.5
-      parent: 2
-  - uid: 10830
-    components:
-    - type: Transform
-      pos: 73.5,-65.5
-      parent: 2
-  - uid: 10831
-    components:
-    - type: Transform
-      pos: 73.5,-66.5
-      parent: 2
-  - uid: 10835
-    components:
-    - type: Transform
-      pos: 78.5,-45.5
-      parent: 2
   - uid: 10836
     components:
     - type: Transform
@@ -34506,100 +35974,10 @@ entities:
     - type: Transform
       pos: 77.5,-44.5
       parent: 2
-  - uid: 10838
-    components:
-    - type: Transform
-      pos: 76.5,-44.5
-      parent: 2
-  - uid: 10843
-    components:
-    - type: Transform
-      pos: 46.5,-36.5
-      parent: 2
-  - uid: 10844
-    components:
-    - type: Transform
-      pos: 46.5,-35.5
-      parent: 2
-  - uid: 10845
-    components:
-    - type: Transform
-      pos: 47.5,-35.5
-      parent: 2
-  - uid: 10846
-    components:
-    - type: Transform
-      pos: 48.5,-35.5
-      parent: 2
-  - uid: 10847
-    components:
-    - type: Transform
-      pos: 49.5,-35.5
-      parent: 2
-  - uid: 10848
-    components:
-    - type: Transform
-      pos: 50.5,-35.5
-      parent: 2
-  - uid: 10849
-    components:
-    - type: Transform
-      pos: 50.5,-36.5
-      parent: 2
-  - uid: 10850
-    components:
-    - type: Transform
-      pos: 50.5,-37.5
-      parent: 2
   - uid: 10851
     components:
     - type: Transform
-      pos: 50.5,-38.5
-      parent: 2
-  - uid: 10852
-    components:
-    - type: Transform
-      pos: 50.5,-39.5
-      parent: 2
-  - uid: 10853
-    components:
-    - type: Transform
-      pos: 50.5,-40.5
-      parent: 2
-  - uid: 10854
-    components:
-    - type: Transform
-      pos: 51.5,-40.5
-      parent: 2
-  - uid: 10855
-    components:
-    - type: Transform
-      pos: 52.5,-40.5
-      parent: 2
-  - uid: 10856
-    components:
-    - type: Transform
-      pos: 52.5,-41.5
-      parent: 2
-  - uid: 10857
-    components:
-    - type: Transform
-      pos: 52.5,-42.5
-      parent: 2
-  - uid: 10858
-    components:
-    - type: Transform
-      pos: 52.5,-43.5
-      parent: 2
-  - uid: 10859
-    components:
-    - type: Transform
-      pos: 52.5,-44.5
-      parent: 2
-  - uid: 10860
-    components:
-    - type: Transform
-      pos: 52.5,-45.5
+      pos: 95.5,-44.5
       parent: 2
   - uid: 10863
     components:
@@ -35406,20 +36784,25 @@ entities:
     - type: Transform
       pos: -12.5,-10.5
       parent: 2
-  - uid: 11612
+  - uid: 11413
     components:
     - type: Transform
-      pos: 30.5,-24.5
+      pos: 50.5,-28.5
+      parent: 2
+  - uid: 11416
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
       parent: 2
   - uid: 11613
     components:
     - type: Transform
-      pos: 30.5,-23.5
+      pos: 52.5,-28.5
       parent: 2
   - uid: 11614
     components:
     - type: Transform
-      pos: 29.5,-23.5
+      pos: 53.5,-28.5
       parent: 2
   - uid: 11615
     components:
@@ -35439,7 +36822,7 @@ entities:
   - uid: 11618
     components:
     - type: Transform
-      pos: 25.5,-23.5
+      pos: 53.5,-29.5
       parent: 2
   - uid: 11619
     components:
@@ -35511,11 +36894,181 @@ entities:
     - type: Transform
       pos: 14.5,-20.5
       parent: 2
+  - uid: 11634
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
+      parent: 2
+  - uid: 11635
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
+  - uid: 11636
+    components:
+    - type: Transform
+      pos: 54.5,-31.5
+      parent: 2
+  - uid: 11639
+    components:
+    - type: Transform
+      pos: 54.5,-32.5
+      parent: 2
+  - uid: 11640
+    components:
+    - type: Transform
+      pos: 55.5,-32.5
+      parent: 2
+  - uid: 11641
+    components:
+    - type: Transform
+      pos: 56.5,-32.5
+      parent: 2
+  - uid: 11642
+    components:
+    - type: Transform
+      pos: 57.5,-32.5
+      parent: 2
+  - uid: 11643
+    components:
+    - type: Transform
+      pos: 58.5,-32.5
+      parent: 2
+  - uid: 11646
+    components:
+    - type: Transform
+      pos: 59.5,-32.5
+      parent: 2
+  - uid: 11647
+    components:
+    - type: Transform
+      pos: 60.5,-32.5
+      parent: 2
+  - uid: 11659
+    components:
+    - type: Transform
+      pos: 61.5,-32.5
+      parent: 2
+  - uid: 11660
+    components:
+    - type: Transform
+      pos: 62.5,-32.5
+      parent: 2
+  - uid: 11661
+    components:
+    - type: Transform
+      pos: 63.5,-32.5
+      parent: 2
+  - uid: 11662
+    components:
+    - type: Transform
+      pos: 64.5,-32.5
+      parent: 2
+  - uid: 11663
+    components:
+    - type: Transform
+      pos: 64.5,-31.5
+      parent: 2
+  - uid: 11664
+    components:
+    - type: Transform
+      pos: 64.5,-33.5
+      parent: 2
+  - uid: 11665
+    components:
+    - type: Transform
+      pos: 64.5,-34.5
+      parent: 2
+  - uid: 11667
+    components:
+    - type: Transform
+      pos: 64.5,-35.5
+      parent: 2
+  - uid: 11676
+    components:
+    - type: Transform
+      pos: 65.5,-35.5
+      parent: 2
+  - uid: 11677
+    components:
+    - type: Transform
+      pos: 65.5,-36.5
+      parent: 2
+  - uid: 11684
+    components:
+    - type: Transform
+      pos: 65.5,-37.5
+      parent: 2
+  - uid: 11685
+    components:
+    - type: Transform
+      pos: 65.5,-38.5
+      parent: 2
+  - uid: 11686
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
+  - uid: 11691
+    components:
+    - type: Transform
+      pos: 65.5,-40.5
+      parent: 2
+  - uid: 11692
+    components:
+    - type: Transform
+      pos: 65.5,-41.5
+      parent: 2
+  - uid: 11693
+    components:
+    - type: Transform
+      pos: 65.5,-42.5
+      parent: 2
+  - uid: 11694
+    components:
+    - type: Transform
+      pos: 65.5,-43.5
+      parent: 2
+  - uid: 11695
+    components:
+    - type: Transform
+      pos: 65.5,-44.5
+      parent: 2
+  - uid: 11696
+    components:
+    - type: Transform
+      pos: 65.5,-45.5
+      parent: 2
+  - uid: 11697
+    components:
+    - type: Transform
+      pos: 65.5,-46.5
+      parent: 2
+  - uid: 11698
+    components:
+    - type: Transform
+      pos: 65.5,-47.5
+      parent: 2
+  - uid: 11699
+    components:
+    - type: Transform
+      pos: 65.5,-48.5
+      parent: 2
+  - uid: 11700
+    components:
+    - type: Transform
+      pos: 66.5,-48.5
+      parent: 2
   - uid: 11701
     components:
     - type: Transform
       pos: 65.5,-27.5
       parent: 2
+  - uid: 11702
+    components:
+    - type: Transform
+      pos: 67.5,-48.5
+      parent: 2
   - uid: 11802
     components:
     - type: Transform
@@ -35536,6 +37089,11 @@ entities:
     - type: Transform
       pos: 66.5,-25.5
       parent: 2
+  - uid: 11910
+    components:
+    - type: Transform
+      pos: 54.5,-33.5
+      parent: 2
   - uid: 11952
     components:
     - type: Transform
@@ -36106,56 +37664,16 @@ entities:
     - type: Transform
       pos: -13.5,-12.5
       parent: 2
-  - uid: 12791
+  - uid: 12781
     components:
     - type: Transform
-      pos: 56.5,-72.5
-      parent: 2
-  - uid: 12801
-    components:
-    - type: Transform
-      pos: 57.5,-70.5
+      pos: 55.5,-37.5
       parent: 2
   - uid: 12826
     components:
     - type: Transform
       pos: 70.5,-23.5
       parent: 2
-  - uid: 12840
-    components:
-    - type: Transform
-      pos: 66.5,-38.5
-      parent: 2
-  - uid: 12860
-    components:
-    - type: Transform
-      pos: 65.5,-38.5
-      parent: 2
-  - uid: 12870
-    components:
-    - type: Transform
-      pos: 41.5,-73.5
-      parent: 2
-  - uid: 12871
-    components:
-    - type: Transform
-      pos: 40.5,-73.5
-      parent: 2
-  - uid: 12872
-    components:
-    - type: Transform
-      pos: 39.5,-73.5
-      parent: 2
-  - uid: 12873
-    components:
-    - type: Transform
-      pos: 38.5,-73.5
-      parent: 2
-  - uid: 12874
-    components:
-    - type: Transform
-      pos: 37.5,-73.5
-      parent: 2
   - uid: 12875
     components:
     - type: Transform
@@ -36226,11 +37744,6 @@ entities:
     - type: Transform
       pos: 60.5,-75.5
       parent: 2
-  - uid: 12934
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
   - uid: 13031
     components:
     - type: Transform
@@ -36296,6 +37809,11 @@ entities:
     - type: Transform
       pos: -6.5,-41.5
       parent: 2
+  - uid: 13162
+    components:
+    - type: Transform
+      pos: 64.5,-46.5
+      parent: 2
   - uid: 13163
     components:
     - type: Transform
@@ -36356,6 +37874,16 @@ entities:
     - type: Transform
       pos: 33.5,-95.5
       parent: 2
+  - uid: 13256
+    components:
+    - type: Transform
+      pos: 63.5,-46.5
+      parent: 2
+  - uid: 13257
+    components:
+    - type: Transform
+      pos: 62.5,-46.5
+      parent: 2
   - uid: 13272
     components:
     - type: Transform
@@ -36381,41 +37909,51 @@ entities:
     - type: Transform
       pos: -35.5,-24.5
       parent: 2
+  - uid: 13436
+    components:
+    - type: Transform
+      pos: 61.5,-46.5
+      parent: 2
   - uid: 13449
     components:
     - type: Transform
       pos: -19.5,-19.5
       parent: 2
-  - uid: 13836
+  - uid: 13519
     components:
     - type: Transform
-      pos: 56.5,-71.5
+      pos: 60.5,-46.5
       parent: 2
-  - uid: 13838
+  - uid: 13520
     components:
     - type: Transform
-      pos: 76.5,-69.5
+      pos: 59.5,-46.5
+      parent: 2
+  - uid: 13560
+    components:
+    - type: Transform
+      pos: 58.5,-46.5
+      parent: 2
+  - uid: 13686
+    components:
+    - type: Transform
+      pos: 58.5,-47.5
+      parent: 2
+  - uid: 13687
+    components:
+    - type: Transform
+      pos: 58.5,-48.5
+      parent: 2
+  - uid: 13688
+    components:
+    - type: Transform
+      pos: 57.5,-48.5
       parent: 2
   - uid: 13865
     components:
     - type: Transform
       pos: 65.5,-72.5
       parent: 2
-  - uid: 13874
-    components:
-    - type: Transform
-      pos: 56.5,-73.5
-      parent: 2
-  - uid: 13919
-    components:
-    - type: Transform
-      pos: 57.5,-68.5
-      parent: 2
-  - uid: 13932
-    components:
-    - type: Transform
-      pos: 58.5,-70.5
-      parent: 2
   - uid: 13939
     components:
     - type: Transform
@@ -36441,16 +37979,6 @@ entities:
     - type: Transform
       pos: 85.5,-47.5
       parent: 2
-  - uid: 14304
-    components:
-    - type: Transform
-      pos: 64.5,-40.5
-      parent: 2
-  - uid: 14315
-    components:
-    - type: Transform
-      pos: 56.5,-70.5
-      parent: 2
   - uid: 14322
     components:
     - type: Transform
@@ -36486,16 +38014,6 @@ entities:
     - type: Transform
       pos: 4.5,-38.5
       parent: 2
-  - uid: 14450
-    components:
-    - type: Transform
-      pos: 58.5,-69.5
-      parent: 2
-  - uid: 14555
-    components:
-    - type: Transform
-      pos: 83.5,-47.5
-      parent: 2
   - uid: 14575
     components:
     - type: Transform
@@ -36511,11 +38029,6 @@ entities:
     - type: Transform
       pos: 63.5,-73.5
       parent: 2
-  - uid: 14723
-    components:
-    - type: Transform
-      pos: 75.5,-69.5
-      parent: 2
   - uid: 14782
     components:
     - type: Transform
@@ -36526,20 +38039,30 @@ entities:
     - type: Transform
       pos: 5.5,-25.5
       parent: 2
-  - uid: 15148
+  - uid: 15104
     components:
     - type: Transform
-      pos: 64.5,-35.5
+      pos: 58.5,-72.5
       parent: 2
-  - uid: 15158
+  - uid: 15123
     components:
     - type: Transform
-      pos: 64.5,-32.5
+      pos: 8.5,-49.5
       parent: 2
-  - uid: 15336
+  - uid: 15176
     components:
     - type: Transform
-      pos: 64.5,-37.5
+      pos: 85.5,-44.5
+      parent: 2
+  - uid: 15181
+    components:
+    - type: Transform
+      pos: 84.5,-46.5
+      parent: 2
+  - uid: 15182
+    components:
+    - type: Transform
+      pos: 85.5,-46.5
       parent: 2
   - uid: 15338
     components:
@@ -36571,11 +38094,6 @@ entities:
     - type: Transform
       pos: 51.5,-52.5
       parent: 2
-  - uid: 15399
-    components:
-    - type: Transform
-      pos: 70.5,-38.5
-      parent: 2
   - uid: 15466
     components:
     - type: Transform
@@ -36606,21 +38124,6 @@ entities:
     - type: Transform
       pos: 18.5,-56.5
       parent: 2
-  - uid: 16238
-    components:
-    - type: Transform
-      pos: 64.5,-34.5
-      parent: 2
-  - uid: 16239
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
-  - uid: 16271
-    components:
-    - type: Transform
-      pos: 64.5,-33.5
-      parent: 2
   - uid: 16320
     components:
     - type: Transform
@@ -36631,11 +38134,6 @@ entities:
     - type: Transform
       pos: -18.5,-17.5
       parent: 2
-  - uid: 16448
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
-      parent: 2
   - uid: 16454
     components:
     - type: Transform
@@ -36646,11 +38144,6 @@ entities:
     - type: Transform
       pos: 67.5,-72.5
       parent: 2
-  - uid: 16483
-    components:
-    - type: Transform
-      pos: 58.5,-68.5
-      parent: 2
   - uid: 16484
     components:
     - type: Transform
@@ -36676,11 +38169,6 @@ entities:
     - type: Transform
       pos: 77.5,-69.5
       parent: 2
-  - uid: 16510
-    components:
-    - type: Transform
-      pos: 56.5,-75.5
-      parent: 2
   - uid: 16517
     components:
     - type: Transform
@@ -36711,56 +38199,21 @@ entities:
     - type: Transform
       pos: -15.5,-77.5
       parent: 2
-  - uid: 16868
+  - uid: 17280
     components:
     - type: Transform
-      pos: 67.5,-46.5
+      pos: 64.5,-44.5
       parent: 2
-  - uid: 16869
+  - uid: 17283
     components:
     - type: Transform
-      pos: 66.5,-46.5
-      parent: 2
-  - uid: 16870
-    components:
-    - type: Transform
-      pos: 71.5,-46.5
-      parent: 2
-  - uid: 16871
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
-      parent: 2
-  - uid: 16872
-    components:
-    - type: Transform
-      pos: 70.5,-46.5
-      parent: 2
-  - uid: 16873
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-  - uid: 16874
-    components:
-    - type: Transform
-      pos: 66.5,-43.5
-      parent: 2
-  - uid: 17267
-    components:
-    - type: Transform
-      pos: 75.5,-44.5
+      pos: 63.5,-44.5
       parent: 2
   - uid: 17436
     components:
     - type: Transform
       pos: 20.5,-62.5
       parent: 2
-  - uid: 17471
-    components:
-    - type: Transform
-      pos: 52.5,-52.5
-      parent: 2
   - uid: 17512
     components:
     - type: Transform
@@ -36771,21 +38224,6 @@ entities:
     - type: Transform
       pos: -7.5,-20.5
       parent: 2
-  - uid: 17855
-    components:
-    - type: Transform
-      pos: 68.5,-46.5
-      parent: 2
-  - uid: 17859
-    components:
-    - type: Transform
-      pos: 69.5,-46.5
-      parent: 2
-  - uid: 17866
-    components:
-    - type: Transform
-      pos: 72.5,-46.5
-      parent: 2
   - uid: 17927
     components:
     - type: Transform
@@ -36841,11 +38279,6 @@ entities:
     - type: Transform
       pos: 50.5,-57.5
       parent: 2
-  - uid: 18229
-    components:
-    - type: Transform
-      pos: 56.5,-74.5
-      parent: 2
   - uid: 18231
     components:
     - type: Transform
@@ -36911,16 +38344,6 @@ entities:
     - type: Transform
       pos: 83.5,-44.5
       parent: 2
-  - uid: 18604
-    components:
-    - type: Transform
-      pos: 83.5,-43.5
-      parent: 2
-  - uid: 18605
-    components:
-    - type: Transform
-      pos: 84.5,-43.5
-      parent: 2
   - uid: 18606
     components:
     - type: Transform
@@ -36966,71 +38389,6 @@ entities:
     - type: Transform
       pos: 93.5,-43.5
       parent: 2
-  - uid: 18615
-    components:
-    - type: Transform
-      pos: 93.5,-44.5
-      parent: 2
-  - uid: 18698
-    components:
-    - type: Transform
-      pos: 71.5,-67.5
-      parent: 2
-  - uid: 18699
-    components:
-    - type: Transform
-      pos: 71.5,-68.5
-      parent: 2
-  - uid: 18700
-    components:
-    - type: Transform
-      pos: 72.5,-68.5
-      parent: 2
-  - uid: 18701
-    components:
-    - type: Transform
-      pos: 73.5,-68.5
-      parent: 2
-  - uid: 18702
-    components:
-    - type: Transform
-      pos: 74.5,-68.5
-      parent: 2
-  - uid: 18703
-    components:
-    - type: Transform
-      pos: 74.5,-67.5
-      parent: 2
-  - uid: 18704
-    components:
-    - type: Transform
-      pos: 75.5,-67.5
-      parent: 2
-  - uid: 18705
-    components:
-    - type: Transform
-      pos: 76.5,-67.5
-      parent: 2
-  - uid: 18706
-    components:
-    - type: Transform
-      pos: 77.5,-67.5
-      parent: 2
-  - uid: 18707
-    components:
-    - type: Transform
-      pos: 78.5,-67.5
-      parent: 2
-  - uid: 18708
-    components:
-    - type: Transform
-      pos: 79.5,-67.5
-      parent: 2
-  - uid: 18709
-    components:
-    - type: Transform
-      pos: 79.5,-68.5
-      parent: 2
   - uid: 18710
     components:
     - type: Transform
@@ -37076,6 +38434,11 @@ entities:
     - type: Transform
       pos: -18.5,-15.5
       parent: 2
+  - uid: 19063
+    components:
+    - type: Transform
+      pos: 54.5,-34.5
+      parent: 2
   - uid: 19072
     components:
     - type: Transform
@@ -37096,6 +38459,186 @@ entities:
     - type: Transform
       pos: -45.5,-35.5
       parent: 2
+  - uid: 19368
+    components:
+    - type: Transform
+      pos: 54.5,-35.5
+      parent: 2
+  - uid: 19623
+    components:
+    - type: Transform
+      pos: 9.5,-49.5
+      parent: 2
+  - uid: 19624
+    components:
+    - type: Transform
+      pos: 9.5,-48.5
+      parent: 2
+  - uid: 19625
+    components:
+    - type: Transform
+      pos: 9.5,-47.5
+      parent: 2
+  - uid: 19626
+    components:
+    - type: Transform
+      pos: 9.5,-46.5
+      parent: 2
+  - uid: 19646
+    components:
+    - type: Transform
+      pos: 62.5,-21.5
+      parent: 2
+  - uid: 19752
+    components:
+    - type: Transform
+      pos: 54.5,-36.5
+      parent: 2
+  - uid: 19753
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
+      parent: 2
+  - uid: 19754
+    components:
+    - type: Transform
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 19758
+    components:
+    - type: Transform
+      pos: 55.5,-38.5
+      parent: 2
+  - uid: 19759
+    components:
+    - type: Transform
+      pos: 55.5,-39.5
+      parent: 2
+  - uid: 19760
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
+  - uid: 19761
+    components:
+    - type: Transform
+      pos: 56.5,-40.5
+      parent: 2
+  - uid: 19762
+    components:
+    - type: Transform
+      pos: 55.5,-35.5
+      parent: 2
+  - uid: 19763
+    components:
+    - type: Transform
+      pos: 56.5,-35.5
+      parent: 2
+  - uid: 19764
+    components:
+    - type: Transform
+      pos: 57.5,-35.5
+      parent: 2
+  - uid: 19765
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
+  - uid: 19766
+    components:
+    - type: Transform
+      pos: 59.5,-35.5
+      parent: 2
+  - uid: 19767
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
+  - uid: 19768
+    components:
+    - type: Transform
+      pos: 60.5,-36.5
+      parent: 2
+  - uid: 19769
+    components:
+    - type: Transform
+      pos: 60.5,-37.5
+      parent: 2
+  - uid: 19770
+    components:
+    - type: Transform
+      pos: 60.5,-38.5
+      parent: 2
+  - uid: 19771
+    components:
+    - type: Transform
+      pos: 60.5,-39.5
+      parent: 2
+  - uid: 19772
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
+      parent: 2
+  - uid: 19773
+    components:
+    - type: Transform
+      pos: 64.5,-48.5
+      parent: 2
+  - uid: 19774
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
+      parent: 2
+  - uid: 19926
+    components:
+    - type: Transform
+      pos: 26.5,-22.5
+      parent: 2
+  - uid: 19927
+    components:
+    - type: Transform
+      pos: 26.5,-21.5
+      parent: 2
+  - uid: 19928
+    components:
+    - type: Transform
+      pos: 26.5,-20.5
+      parent: 2
+  - uid: 19929
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 2
+  - uid: 19930
+    components:
+    - type: Transform
+      pos: 26.5,-18.5
+      parent: 2
+  - uid: 19931
+    components:
+    - type: Transform
+      pos: 26.5,-17.5
+      parent: 2
+  - uid: 19932
+    components:
+    - type: Transform
+      pos: 26.5,-16.5
+      parent: 2
+  - uid: 19933
+    components:
+    - type: Transform
+      pos: 26.5,-15.5
+      parent: 2
+  - uid: 19934
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 2
+  - uid: 19935
+    components:
+    - type: Transform
+      pos: 25.5,-15.5
+      parent: 2
 - proto: CableTerminal
   entities:
   - uid: 3002
@@ -37108,6 +38651,12 @@ entities:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
+  - uid: 4343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-45.5
+      parent: 2
   - uid: 4401
     components:
     - type: Transform
@@ -37148,12 +38697,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-7.5
       parent: 2
-  - uid: 17697
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 84.5,-45.5
-      parent: 2
   - uid: 17823
     components:
     - type: Transform
@@ -37214,6 +38757,24 @@ entities:
     - type: Transform
       pos: -20.522596,-33.289913
       parent: 2
+  - uid: 19615
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.744207,-32.486958
+      parent: 2
+  - uid: 19616
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.320597,-32.493908
+      parent: 2
+  - uid: 19617
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.52893,-32.65374
+      parent: 2
 - proto: CandlePurpleSmall
   entities:
   - uid: 4411
@@ -37255,21 +38816,21 @@ entities:
       parent: 2
 - proto: CarbonDioxideCanister
   entities:
-  - uid: 3939
+  - uid: 7181
     components:
     - type: Transform
-      pos: 51.5,-71.5
-      parent: 2
-  - uid: 3940
-    components:
-    - type: Transform
-      pos: 51.5,-72.5
+      pos: 41.5,-73.5
       parent: 2
   - uid: 7822
     components:
     - type: Transform
       pos: 38.5,-59.5
       parent: 2
+  - uid: 9269
+    components:
+    - type: Transform
+      pos: 41.5,-72.5
+      parent: 2
 - proto: CargoMailTeleporter
   entities:
   - uid: 3833
@@ -37279,6 +38840,36 @@ entities:
       parent: 2
 - proto: Carpet
   entities:
+  - uid: 256
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-53.5
+      parent: 2
+  - uid: 3540
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-52.5
+      parent: 2
+  - uid: 3726
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-53.5
+      parent: 2
+  - uid: 4380
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-52.5
+      parent: 2
+  - uid: 5301
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-37.5
+      parent: 2
   - uid: 7087
     components:
     - type: Transform
@@ -37304,35 +38895,23 @@ entities:
     - type: Transform
       pos: 36.5,-49.5
       parent: 2
-  - uid: 10330
+  - uid: 7117
     components:
     - type: Transform
-      pos: 57.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 54.5,-38.5
       parent: 2
-  - uid: 10790
+  - uid: 7177
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-53.5
       parent: 2
-  - uid: 12883
+  - uid: 7202
     components:
     - type: Transform
-      pos: 71.5,-47.5
-      parent: 2
-  - uid: 13834
-    components:
-    - type: Transform
-      pos: 71.5,-48.5
-      parent: 2
-  - uid: 16200
-    components:
-    - type: Transform
-      pos: 70.5,-47.5
-      parent: 2
-  - uid: 16205
-    components:
-    - type: Transform
-      pos: 70.5,-48.5
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-52.5
       parent: 2
   - uid: 17424
     components:
@@ -37421,6 +39000,11 @@ entities:
     - type: Transform
       pos: -0.5,-66.5
       parent: 2
+  - uid: 3582
+    components:
+    - type: Transform
+      pos: 54.5,-57.5
+      parent: 2
   - uid: 3587
     components:
     - type: Transform
@@ -37441,11 +39025,6 @@ entities:
     - type: Transform
       pos: 54.5,-56.5
       parent: 2
-  - uid: 3915
-    components:
-    - type: Transform
-      pos: 54.5,-57.5
-      parent: 2
   - uid: 4752
     components:
     - type: Transform
@@ -37696,22 +39275,12 @@ entities:
     - type: Transform
       pos: -5.5,-61.5
       parent: 2
-  - uid: 8627
+  - uid: 8126
     components:
     - type: Transform
-      pos: 55.5,-57.5
+      pos: 52.5,-57.5
       parent: 2
-  - uid: 9219
-    components:
-    - type: Transform
-      pos: 55.5,-55.5
-      parent: 2
-  - uid: 9252
-    components:
-    - type: Transform
-      pos: 55.5,-56.5
-      parent: 2
-  - uid: 9373
+  - uid: 8135
     components:
     - type: Transform
       pos: 53.5,-57.5
@@ -37731,16 +39300,41 @@ entities:
     - type: Transform
       pos: 54.5,-55.5
       parent: 2
-  - uid: 14698
-    components:
-    - type: Transform
-      pos: 52.5,-57.5
-      parent: 2
   - uid: 15390
     components:
     - type: Transform
       pos: 52.5,-55.5
       parent: 2
+  - uid: 19610
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-33.5
+      parent: 2
+  - uid: 19611
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-32.5
+      parent: 2
+  - uid: 19612
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-32.5
+      parent: 2
+  - uid: 19613
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-31.5
+      parent: 2
+  - uid: 19614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-32.5
+      parent: 2
 - proto: CarpetBlue
   entities:
   - uid: 5129
@@ -37858,6 +39452,31 @@ entities:
     - type: Transform
       pos: -51.5,-60.5
       parent: 2
+- proto: CarpetChapel
+  entities:
+  - uid: 5030
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-31.5
+      parent: 2
+  - uid: 7206
+    components:
+    - type: Transform
+      pos: -20.5,-33.5
+      parent: 2
+  - uid: 12850
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-31.5
+      parent: 2
+  - uid: 19390
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-33.5
+      parent: 2
 - proto: CarpetGreen
   entities:
   - uid: 5945
@@ -38601,83 +40220,6 @@ entities:
       rot: 0.7853981633974483 rad
       pos: 4.501627,-10.320071
       parent: 2
-  - uid: 18837
-    components:
-    - type: Transform
-      rot: -0.6108652381980153 rad
-      pos: 59.640903,-49.893475
-      parent: 2
-  - uid: 18838
-    components:
-    - type: Transform
-      rot: 0.3490658503988659 rad
-      pos: 59.109653,-50.15407
-      parent: 2
-  - uid: 18839
-    components:
-    - type: Transform
-      rot: -1.0471975511965976 rad
-      pos: 58.536736,-49.69542
-      parent: 2
-  - uid: 18840
-    components:
-    - type: Transform
-      rot: -0.3490658503988659 rad
-      pos: 59.005486,-49.309734
-      parent: 2
-  - uid: 18870
-    components:
-    - type: Transform
-      rot: 0.4188790204786391 rad
-      pos: 58.067986,-49.236767
-      parent: 2
-  - uid: 18871
-    components:
-    - type: Transform
-      rot: 1.6231562043547265 rad
-      pos: 57.422153,-50.07068
-      parent: 2
-  - uid: 18872
-    components:
-    - type: Transform
-      rot: 0.24434609527920614 rad
-      pos: 56.939404,-49.486263
-      parent: 2
-  - uid: 18875
-    components:
-    - type: Transform
-      pos: 57.265903,-49.184647
-      parent: 2
-  - uid: 18878
-    components:
-    - type: Transform
-      rot: 0.4363323129985824 rad
-      pos: 56.526318,-49.841354
-      parent: 2
-  - uid: 18879
-    components:
-    - type: Transform
-      rot: -0.3490658503988659 rad
-      pos: 57.213818,-48.74684
-      parent: 2
-  - uid: 18882
-    components:
-    - type: Transform
-      rot: 0.5934119456780721 rad
-      pos: 57.536736,-49.476517
-      parent: 2
-  - uid: 18884
-    components:
-    - type: Transform
-      rot: 2.3387411976724017 rad
-      pos: 56.533154,-49.26804
-      parent: 2
-  - uid: 18915
-    components:
-    - type: Transform
-      rot: 2.6878070480712677 rad
-      pos: 56.69982,-49.017864
-      parent: 2
   - uid: 19051
     components:
     - type: Transform
@@ -38713,6 +40255,60 @@ entities:
       rot: 0.9599310885968813 rad
       pos: -29.21888,-36.33141
       parent: 2
+  - uid: 20069
+    components:
+    - type: Transform
+      rot: 0.6981317007977318 rad
+      pos: 55.905697,-42.965652
+      parent: 2
+  - uid: 20070
+    components:
+    - type: Transform
+      rot: 0.5235987755982988 rad
+      pos: 55.29111,-42.69463
+      parent: 2
+  - uid: 20071
+    components:
+    - type: Transform
+      rot: 0.17453292519943295 rad
+      pos: 54.92249,-42.811863
+      parent: 2
+  - uid: 20072
+    components:
+    - type: Transform
+      rot: -0.5235987755982988 rad
+      pos: 54.38486,-42.767597
+      parent: 2
+  - uid: 20073
+    components:
+    - type: Transform
+      rot: -0.17453292519943295 rad
+      pos: 54.78707,-42.6972
+      parent: 2
+  - uid: 20074
+    components:
+    - type: Transform
+      rot: -0.3490658503988659 rad
+      pos: 54.155697,-42.507
+      parent: 2
+  - uid: 20075
+    components:
+    - type: Transform
+      rot: -0.17453292519943295 rad
+      pos: 53.672485,-42.926468
+      parent: 2
+  - uid: 20076
+    components:
+    - type: Transform
+      rot: -0.17453292519943295 rad
+      pos: 54.97457,-42.269817
+      parent: 2
+  - uid: 20077
+    components:
+    - type: Transform
+      rot: 0.08726646259971647 rad
+      pos: 54.526653,-42.457447
+      parent: 2
 - proto: Catwalk
   entities:
   - uid: 488
@@ -38720,21 +40316,28 @@ entities:
     - type: Transform
       pos: 77.5,-52.5
       parent: 2
+  - uid: 730
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,-88.5
+      parent: 2
   - uid: 1485
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -59.5,-25.5
       parent: 2
-  - uid: 2883
+  - uid: 1856
     components:
     - type: Transform
-      pos: 76.5,-35.5
+      pos: 85.5,-43.5
       parent: 2
-  - uid: 2917
+  - uid: 1997
     components:
     - type: Transform
-      pos: 71.5,-31.5
+      rot: 3.141592653589793 rad
+      pos: 37.5,-81.5
       parent: 2
   - uid: 2930
     components:
@@ -38751,16 +40354,25 @@ entities:
     - type: Transform
       pos: 68.5,-21.5
       parent: 2
-  - uid: 3337
+  - uid: 3119
     components:
     - type: Transform
-      pos: 66.5,-56.5
+      pos: 74.5,-29.5
       parent: 2
-  - uid: 3338
+  - uid: 3213
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-48.5
+      pos: 77.5,-28.5
+      parent: 2
+  - uid: 3282
+    components:
+    - type: Transform
+      pos: 74.5,-35.5
+      parent: 2
+  - uid: 3302
+    components:
+    - type: Transform
+      pos: 74.5,-39.5
       parent: 2
   - uid: 3344
     components:
@@ -38782,21 +40394,15 @@ entities:
     - type: Transform
       pos: 31.5,-72.5
       parent: 2
-  - uid: 3380
+  - uid: 3450
     components:
     - type: Transform
-      pos: 56.5,-71.5
+      pos: 50.5,-26.5
       parent: 2
-  - uid: 3425
+  - uid: 3471
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-49.5
-      parent: 2
-  - uid: 3435
-    components:
-    - type: Transform
-      pos: 75.5,-30.5
+      pos: 49.5,-26.5
       parent: 2
   - uid: 3508
     components:
@@ -38813,16 +40419,168 @@ entities:
     - type: Transform
       pos: -15.5,-65.5
       parent: 2
+  - uid: 3632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-28.5
+      parent: 2
+  - uid: 3677
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-32.5
+      parent: 2
+  - uid: 3678
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-31.5
+      parent: 2
   - uid: 3688
     components:
     - type: Transform
       pos: 33.5,-35.5
       parent: 2
-  - uid: 4185
+  - uid: 3713
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-46.5
+      pos: 79.5,-31.5
+      parent: 2
+  - uid: 3748
+    components:
+    - type: Transform
+      pos: 77.5,-27.5
+      parent: 2
+  - uid: 3753
+    components:
+    - type: Transform
+      pos: 73.5,-29.5
+      parent: 2
+  - uid: 3782
+    components:
+    - type: Transform
+      pos: 72.5,-29.5
+      parent: 2
+  - uid: 3784
+    components:
+    - type: Transform
+      pos: 77.5,-31.5
+      parent: 2
+  - uid: 3785
+    components:
+    - type: Transform
+      pos: 29.5,-32.5
+      parent: 2
+  - uid: 3788
+    components:
+    - type: Transform
+      pos: 31.5,-32.5
+      parent: 2
+  - uid: 3789
+    components:
+    - type: Transform
+      pos: 30.5,-32.5
+      parent: 2
+  - uid: 3798
+    components:
+    - type: Transform
+      pos: 78.5,-31.5
+      parent: 2
+  - uid: 3801
+    components:
+    - type: Transform
+      pos: 74.5,-36.5
+      parent: 2
+  - uid: 3820
+    components:
+    - type: Transform
+      pos: 99.5,-54.5
+      parent: 2
+  - uid: 3827
+    components:
+    - type: Transform
+      pos: 101.5,-49.5
+      parent: 2
+  - uid: 3828
+    components:
+    - type: Transform
+      pos: 101.5,-47.5
+      parent: 2
+  - uid: 3830
+    components:
+    - type: Transform
+      pos: 101.5,-48.5
+      parent: 2
+  - uid: 3836
+    components:
+    - type: Transform
+      pos: 101.5,-43.5
+      parent: 2
+  - uid: 3837
+    components:
+    - type: Transform
+      pos: 101.5,-41.5
+      parent: 2
+  - uid: 3838
+    components:
+    - type: Transform
+      pos: 101.5,-42.5
+      parent: 2
+  - uid: 3839
+    components:
+    - type: Transform
+      pos: 101.5,-46.5
+      parent: 2
+  - uid: 3840
+    components:
+    - type: Transform
+      pos: 101.5,-44.5
+      parent: 2
+  - uid: 3841
+    components:
+    - type: Transform
+      pos: 101.5,-45.5
+      parent: 2
+  - uid: 3857
+    components:
+    - type: Transform
+      pos: 100.5,-39.5
+      parent: 2
+  - uid: 3859
+    components:
+    - type: Transform
+      pos: 100.5,-38.5
+      parent: 2
+  - uid: 3860
+    components:
+    - type: Transform
+      pos: 100.5,-40.5
+      parent: 2
+  - uid: 3861
+    components:
+    - type: Transform
+      pos: 99.5,-36.5
+      parent: 2
+  - uid: 3863
+    components:
+    - type: Transform
+      pos: 99.5,-34.5
+      parent: 2
+  - uid: 3864
+    components:
+    - type: Transform
+      pos: 99.5,-35.5
+      parent: 2
+  - uid: 3882
+    components:
+    - type: Transform
+      pos: 100.5,-37.5
+      parent: 2
+  - uid: 4193
+    components:
+    - type: Transform
+      pos: 51.5,-26.5
       parent: 2
   - uid: 4642
     components:
@@ -39051,6 +40809,18 @@ entities:
     - type: Transform
       pos: -17.5,-70.5
       parent: 2
+  - uid: 5296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-32.5
+      parent: 2
+  - uid: 5299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-32.5
+      parent: 2
   - uid: 5378
     components:
     - type: Transform
@@ -39161,11 +40931,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,-50.5
       parent: 2
-  - uid: 6092
-    components:
-    - type: Transform
-      pos: 70.5,-24.5
-      parent: 2
   - uid: 6227
     components:
     - type: Transform
@@ -39184,16 +40949,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-25.5
       parent: 2
+  - uid: 6381
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-31.5
+      parent: 2
+  - uid: 7084
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-28.5
+      parent: 2
   - uid: 7191
     components:
     - type: Transform
       pos: 74.5,-52.5
       parent: 2
-  - uid: 7232
-    components:
-    - type: Transform
-      pos: 68.5,-37.5
-      parent: 2
   - uid: 7284
     components:
     - type: Transform
@@ -39209,120 +40981,30 @@ entities:
     - type: Transform
       pos: 33.5,-70.5
       parent: 2
-  - uid: 7600
+  - uid: 7411
     components:
     - type: Transform
-      pos: 99.5,-43.5
-      parent: 2
-  - uid: 7601
-    components:
-    - type: Transform
-      pos: 99.5,-41.5
-      parent: 2
-  - uid: 7602
-    components:
-    - type: Transform
-      pos: 99.5,-44.5
-      parent: 2
-  - uid: 7603
-    components:
-    - type: Transform
-      pos: 99.5,-42.5
-      parent: 2
-  - uid: 7604
-    components:
-    - type: Transform
-      pos: 99.5,-45.5
-      parent: 2
-  - uid: 7605
-    components:
-    - type: Transform
-      pos: 99.5,-46.5
-      parent: 2
-  - uid: 7606
-    components:
-    - type: Transform
-      pos: 99.5,-47.5
-      parent: 2
-  - uid: 7607
-    components:
-    - type: Transform
-      pos: 99.5,-48.5
+      pos: 86.5,-47.5
       parent: 2
   - uid: 7608
     components:
     - type: Transform
-      pos: 99.5,-49.5
+      pos: 75.5,-45.5
       parent: 2
   - uid: 7609
     components:
     - type: Transform
-      pos: 98.5,-50.5
-      parent: 2
-  - uid: 7610
-    components:
-    - type: Transform
-      pos: 98.5,-51.5
-      parent: 2
-  - uid: 7611
-    components:
-    - type: Transform
-      pos: 98.5,-52.5
-      parent: 2
-  - uid: 7612
-    components:
-    - type: Transform
-      pos: 98.5,-53.5
-      parent: 2
-  - uid: 7613
-    components:
-    - type: Transform
-      pos: 97.5,-54.5
-      parent: 2
-  - uid: 7614
-    components:
-    - type: Transform
-      pos: 97.5,-55.5
-      parent: 2
-  - uid: 7615
-    components:
-    - type: Transform
-      pos: 97.5,-56.5
-      parent: 2
-  - uid: 7616
-    components:
-    - type: Transform
-      pos: 98.5,-40.5
-      parent: 2
-  - uid: 7617
-    components:
-    - type: Transform
-      pos: 98.5,-39.5
-      parent: 2
-  - uid: 7618
-    components:
-    - type: Transform
-      pos: 98.5,-38.5
-      parent: 2
-  - uid: 7619
-    components:
-    - type: Transform
-      pos: 98.5,-37.5
-      parent: 2
-  - uid: 7620
-    components:
-    - type: Transform
-      pos: 97.5,-36.5
+      pos: 75.5,-46.5
       parent: 2
   - uid: 7621
     components:
     - type: Transform
-      pos: 97.5,-35.5
+      pos: 86.5,-43.5
       parent: 2
   - uid: 7622
     components:
     - type: Transform
-      pos: 97.5,-34.5
+      pos: 85.5,-47.5
       parent: 2
   - uid: 7714
     components:
@@ -39334,25 +41016,21 @@ entities:
     - type: Transform
       pos: 78.5,-35.5
       parent: 2
-  - uid: 7716
+  - uid: 7886
     components:
     - type: Transform
-      pos: 78.5,-36.5
+      pos: -11.5,-35.5
       parent: 2
-  - uid: 7722
+  - uid: 7925
     components:
     - type: Transform
-      pos: 77.5,-27.5
+      pos: 75.5,-47.5
       parent: 2
-  - uid: 7723
+  - uid: 8071
     components:
     - type: Transform
-      pos: 77.5,-28.5
-      parent: 2
-  - uid: 7724
-    components:
-    - type: Transform
-      pos: 77.5,-29.5
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-30.5
       parent: 2
   - uid: 8102
     components:
@@ -39374,31 +41052,11 @@ entities:
     - type: Transform
       pos: 78.5,-49.5
       parent: 2
-  - uid: 8110
-    components:
-    - type: Transform
-      pos: 78.5,-40.5
-      parent: 2
-  - uid: 8111
-    components:
-    - type: Transform
-      pos: 78.5,-41.5
-      parent: 2
   - uid: 8112
     components:
     - type: Transform
       pos: 78.5,-38.5
       parent: 2
-  - uid: 8117
-    components:
-    - type: Transform
-      pos: 72.5,-71.5
-      parent: 2
-  - uid: 8118
-    components:
-    - type: Transform
-      pos: 73.5,-71.5
-      parent: 2
   - uid: 8119
     components:
     - type: Transform
@@ -39419,31 +41077,6 @@ entities:
     - type: Transform
       pos: 77.5,-71.5
       parent: 2
-  - uid: 8146
-    components:
-    - type: Transform
-      pos: 67.5,-66.5
-      parent: 2
-  - uid: 8147
-    components:
-    - type: Transform
-      pos: 67.5,-67.5
-      parent: 2
-  - uid: 8148
-    components:
-    - type: Transform
-      pos: 67.5,-68.5
-      parent: 2
-  - uid: 8149
-    components:
-    - type: Transform
-      pos: 67.5,-69.5
-      parent: 2
-  - uid: 8150
-    components:
-    - type: Transform
-      pos: 67.5,-70.5
-      parent: 2
   - uid: 8155
     components:
     - type: Transform
@@ -39454,11 +41087,6 @@ entities:
     - type: Transform
       pos: 65.5,-73.5
       parent: 2
-  - uid: 8157
-    components:
-    - type: Transform
-      pos: 62.5,-74.5
-      parent: 2
   - uid: 8158
     components:
     - type: Transform
@@ -39467,12 +41095,7 @@ entities:
   - uid: 8159
     components:
     - type: Transform
-      pos: 60.5,-75.5
-      parent: 2
-  - uid: 8160
-    components:
-    - type: Transform
-      pos: 61.5,-75.5
+      pos: 75.5,-48.5
       parent: 2
   - uid: 8327
     components:
@@ -39546,61 +41169,167 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-79.5
       parent: 2
+  - uid: 8406
+    components:
+    - type: Transform
+      pos: 99.5,-56.5
+      parent: 2
+  - uid: 8407
+    components:
+    - type: Transform
+      pos: 100.5,-53.5
+      parent: 2
+  - uid: 8408
+    components:
+    - type: Transform
+      pos: 99.5,-55.5
+      parent: 2
+  - uid: 8465
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-43.5
+      parent: 2
+  - uid: 8466
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-42.5
+      parent: 2
+  - uid: 8467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-41.5
+      parent: 2
+  - uid: 8468
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-40.5
+      parent: 2
+  - uid: 8499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-39.5
+      parent: 2
+  - uid: 8500
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-37.5
+      parent: 2
+  - uid: 8501
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-36.5
+      parent: 2
+  - uid: 8502
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-35.5
+      parent: 2
+  - uid: 8511
+    components:
+    - type: Transform
+      pos: 99.5,-57.5
+      parent: 2
+  - uid: 8568
+    components:
+    - type: Transform
+      pos: 100.5,-52.5
+      parent: 2
+  - uid: 8569
+    components:
+    - type: Transform
+      pos: 100.5,-50.5
+      parent: 2
+  - uid: 8570
+    components:
+    - type: Transform
+      pos: 100.5,-51.5
+      parent: 2
+  - uid: 8827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-28.5
+      parent: 2
   - uid: 8913
     components:
     - type: Transform
       pos: 82.5,-24.5
       parent: 2
-  - uid: 9310
+  - uid: 9254
     components:
     - type: Transform
-      pos: 69.5,-55.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-44.5
       parent: 2
-  - uid: 9721
+  - uid: 9258
     components:
     - type: Transform
-      pos: 56.5,-72.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-45.5
       parent: 2
-  - uid: 10332
+  - uid: 9281
     components:
     - type: Transform
-      pos: 70.5,-55.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 9287
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-47.5
+      parent: 2
+  - uid: 9711
+    components:
+    - type: Transform
+      pos: 37.5,-30.5
       parent: 2
   - uid: 10530
     components:
     - type: Transform
       pos: -25.5,-21.5
       parent: 2
-  - uid: 10676
+  - uid: 11793
     components:
     - type: Transform
-      pos: 68.5,-55.5
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-32.5
       parent: 2
-  - uid: 10811
+  - uid: 11834
     components:
     - type: Transform
-      pos: 75.5,-31.5
+      pos: 77.5,-29.5
       parent: 2
-  - uid: 10823
+  - uid: 12410
     components:
     - type: Transform
-      pos: 56.5,-73.5
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-56.5
       parent: 2
   - uid: 12854
     components:
     - type: Transform
       pos: 33.5,-72.5
       parent: 2
+  - uid: 12992
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-33.5
+      parent: 2
   - uid: 13812
     components:
     - type: Transform
       pos: 68.5,-19.5
       parent: 2
-  - uid: 13848
-    components:
-    - type: Transform
-      pos: 67.5,-37.5
-      parent: 2
   - uid: 13885
     components:
     - type: Transform
@@ -39611,12 +41340,22 @@ entities:
     - type: Transform
       pos: -28.5,-71.5
       parent: 2
+  - uid: 14070
+    components:
+    - type: Transform
+      pos: 74.5,-38.5
+      parent: 2
   - uid: 14121
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-63.5
       parent: 2
+  - uid: 14809
+    components:
+    - type: Transform
+      pos: 74.5,-37.5
+      parent: 2
   - uid: 15261
     components:
     - type: Transform
@@ -39627,20 +41366,95 @@ entities:
     - type: Transform
       pos: 32.5,-35.5
       parent: 2
+  - uid: 15402
+    components:
+    - type: Transform
+      pos: 71.5,-62.5
+      parent: 2
+  - uid: 15426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-49.5
+      parent: 2
   - uid: 15431
     components:
     - type: Transform
       pos: 30.5,-71.5
       parent: 2
+  - uid: 15443
+    components:
+    - type: Transform
+      pos: 79.5,-63.5
+      parent: 2
+  - uid: 15444
+    components:
+    - type: Transform
+      pos: 79.5,-64.5
+      parent: 2
+  - uid: 15445
+    components:
+    - type: Transform
+      pos: 79.5,-62.5
+      parent: 2
+  - uid: 15446
+    components:
+    - type: Transform
+      pos: 79.5,-66.5
+      parent: 2
+  - uid: 15447
+    components:
+    - type: Transform
+      pos: 79.5,-67.5
+      parent: 2
+  - uid: 15448
+    components:
+    - type: Transform
+      pos: 79.5,-65.5
+      parent: 2
+  - uid: 15451
+    components:
+    - type: Transform
+      pos: 70.5,-67.5
+      parent: 2
   - uid: 15452
     components:
     - type: Transform
-      pos: 74.5,-45.5
+      pos: 70.5,-66.5
       parent: 2
   - uid: 15453
     components:
     - type: Transform
-      pos: 74.5,-46.5
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 15454
+    components:
+    - type: Transform
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 15518
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 79.5,-58.5
+      parent: 2
+  - uid: 15520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-48.5
+      parent: 2
+  - uid: 15547
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-49.5
+      parent: 2
+  - uid: 15548
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-50.5
       parent: 2
   - uid: 16004
     components:
@@ -39648,99 +41462,80 @@ entities:
       rot: 3.141592653589793 rad
       pos: 78.5,-39.5
       parent: 2
-  - uid: 16284
+  - uid: 16031
     components:
     - type: Transform
-      pos: 74.5,-47.5
+      pos: 55.5,-53.5
       parent: 2
-  - uid: 16528
+  - uid: 16032
     components:
     - type: Transform
-      pos: 74.5,-48.5
+      pos: 56.5,-54.5
       parent: 2
-  - uid: 16565
+  - uid: 16040
+    components:
+    - type: Transform
+      pos: 68.5,-23.5
+      parent: 2
+  - uid: 16148
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 51.5,-46.5
+      pos: -31.5,-18.5
       parent: 2
-  - uid: 16566
+  - uid: 16164
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-30.5
       parent: 2
-  - uid: 16567
+  - uid: 16175
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-30.5
       parent: 2
-  - uid: 16570
+  - uid: 16193
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-35.5
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-30.5
       parent: 2
-  - uid: 16571
+  - uid: 16587
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-56.5
       parent: 2
-  - uid: 16572
+  - uid: 16588
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-56.5
       parent: 2
-  - uid: 16573
+  - uid: 16589
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-38.5
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-56.5
       parent: 2
-  - uid: 16574
+  - uid: 16590
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-35.5
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-51.5
       parent: 2
-  - uid: 16575
+  - uid: 16591
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-56.5
       parent: 2
-  - uid: 16577
+  - uid: 16592
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-32.5
-      parent: 2
-  - uid: 16578
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-33.5
-      parent: 2
-  - uid: 16582
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-38.5
-      parent: 2
-  - uid: 16583
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-37.5
-      parent: 2
-  - uid: 16584
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-56.5
       parent: 2
   - uid: 16594
     components:
@@ -39754,24 +41549,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -40.5,-79.5
       parent: 2
-  - uid: 16596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.5,-79.5
-      parent: 2
-  - uid: 16597
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -38.5,-79.5
-      parent: 2
-  - uid: 16598
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -37.5,-79.5
-      parent: 2
   - uid: 16599
     components:
     - type: Transform
@@ -39796,6 +41573,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -35.5,-73.5
       parent: 2
+  - uid: 16607
+    components:
+    - type: Transform
+      pos: 71.5,-61.5
+      parent: 2
+  - uid: 16608
+    components:
+    - type: Transform
+      pos: 71.5,-60.5
+      parent: 2
+  - uid: 16609
+    components:
+    - type: Transform
+      pos: 71.5,-59.5
+      parent: 2
   - uid: 16764
     components:
     - type: Transform
@@ -39832,26 +41624,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-43.5
       parent: 2
-  - uid: 17093
-    components:
-    - type: Transform
-      pos: 52.5,-29.5
-      parent: 2
-  - uid: 17102
-    components:
-    - type: Transform
-      pos: -35.5,-76.5
-      parent: 2
-  - uid: 17118
-    components:
-    - type: Transform
-      pos: -35.5,-77.5
-      parent: 2
-  - uid: 17119
-    components:
-    - type: Transform
-      pos: -35.5,-78.5
-      parent: 2
   - uid: 17174
     components:
     - type: Transform
@@ -39978,6 +41750,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-65.5
       parent: 2
+  - uid: 17413
+    components:
+    - type: Transform
+      pos: 54.5,-69.5
+      parent: 2
+  - uid: 17414
+    components:
+    - type: Transform
+      pos: 54.5,-68.5
+      parent: 2
   - uid: 17431
     components:
     - type: Transform
@@ -40018,30 +41800,6 @@ entities:
     - type: Transform
       pos: 21.5,-63.5
       parent: 2
-  - uid: 17718
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 75.5,-67.5
-      parent: 2
-  - uid: 17719
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-67.5
-      parent: 2
-  - uid: 17720
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-67.5
-      parent: 2
-  - uid: 17721
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 78.5,-67.5
-      parent: 2
   - uid: 17723
     components:
     - type: Transform
@@ -40072,56 +41830,11 @@ entities:
     - type: Transform
       pos: 76.5,-52.5
       parent: 2
-  - uid: 17856
-    components:
-    - type: Transform
-      pos: 75.5,-35.5
-      parent: 2
-  - uid: 17857
-    components:
-    - type: Transform
-      pos: 74.5,-35.5
-      parent: 2
-  - uid: 17858
-    components:
-    - type: Transform
-      pos: 73.5,-35.5
-      parent: 2
-  - uid: 17860
-    components:
-    - type: Transform
-      pos: 73.5,-33.5
-      parent: 2
-  - uid: 17861
-    components:
-    - type: Transform
-      pos: 71.5,-29.5
-      parent: 2
-  - uid: 17862
-    components:
-    - type: Transform
-      pos: 73.5,-32.5
-      parent: 2
   - uid: 17869
     components:
     - type: Transform
       pos: -24.5,-21.5
       parent: 2
-  - uid: 17870
-    components:
-    - type: Transform
-      pos: 71.5,-30.5
-      parent: 2
-  - uid: 17871
-    components:
-    - type: Transform
-      pos: 73.5,-31.5
-      parent: 2
-  - uid: 17998
-    components:
-    - type: Transform
-      pos: 75.5,-32.5
-      parent: 2
   - uid: 18477
     components:
     - type: Transform
@@ -40191,6 +41904,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 82.5,-70.5
       parent: 2
+  - uid: 18861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-70.5
+      parent: 2
   - uid: 18892
     components:
     - type: Transform
@@ -40245,24 +41964,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,-93.5
       parent: 2
-  - uid: 19078
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-31.5
-      parent: 2
-  - uid: 19079
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-31.5
-      parent: 2
-  - uid: 19080
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-31.5
-      parent: 2
   - uid: 19329
     components:
     - type: Transform
@@ -40288,24 +41989,25 @@ entities:
     - type: Transform
       pos: -45.5,-36.5
       parent: 2
-  - uid: 19386
-    components:
-    - type: Transform
-      pos: 45.5,-72.5
-      parent: 2
-  - uid: 19387
-    components:
-    - type: Transform
-      pos: 46.5,-72.5
-      parent: 2
   - uid: 19409
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 36.5,-91.5
       parent: 2
+  - uid: 19539
+    components:
+    - type: Transform
+      pos: -9.5,-56.5
+      parent: 2
 - proto: Chair
   entities:
+  - uid: 748
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-38.5
+      parent: 2
   - uid: 1266
     components:
     - type: Transform
@@ -40318,23 +42020,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 59.5,-27.5
       parent: 2
-  - uid: 3021
+  - uid: 3649
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-37.5
-      parent: 2
-  - uid: 4304
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-49.5
-      parent: 2
-  - uid: 4305
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-50.5
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-51.5
       parent: 2
   - uid: 4867
     components:
@@ -40434,12 +42124,6 @@ entities:
     - type: Transform
       pos: -13.5,-59.5
       parent: 2
-  - uid: 5852
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-61.5
-      parent: 2
   - uid: 6145
     components:
     - type: Transform
@@ -40487,18 +42171,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -35.5,-15.5
       parent: 2
-  - uid: 12857
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-36.5
-      parent: 2
-  - uid: 12858
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-35.5
-      parent: 2
   - uid: 13852
     components:
     - type: Transform
@@ -40548,11 +42220,11 @@ entities:
     - type: Transform
       pos: 26.5,-81.5
       parent: 2
-  - uid: 17601
+  - uid: 17899
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 66.5,-46.5
+      pos: -15.5,-60.5
       parent: 2
   - uid: 18535
     components:
@@ -40607,17 +42279,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-28.5
       parent: 2
-  - uid: 348
-    components:
-    - type: Transform
-      pos: 21.5,-18.5
-      parent: 2
   - uid: 877
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,-31.5
       parent: 2
+  - uid: 915
+    components:
+    - type: Transform
+      pos: 34.5,-17.5
+      parent: 2
   - uid: 2198
     components:
     - type: Transform
@@ -40630,12 +42302,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5554351,-26.347584
       parent: 2
-  - uid: 3209
+  - uid: 4613
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-20.5
+      parent: 2
+  - uid: 4614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 20.5,-20.5
       parent: 2
+  - uid: 4627
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-19.5
+      parent: 2
   - uid: 5141
     components:
     - type: Transform
@@ -40703,23 +42387,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -61.426323,-25.462961
       parent: 2
-  - uid: 6657
+  - uid: 6904
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-98.5
       parent: 2
   - uid: 6920
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 53.5,-99.5
-      parent: 2
-  - uid: 6921
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-98.5
+      pos: 54.5,-99.5
       parent: 2
   - uid: 7674
     components:
@@ -40727,23 +42405,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 78.5,-20.5
       parent: 2
-  - uid: 7796
+  - uid: 7774
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-20.5
+      pos: 33.5,-17.5
       parent: 2
-  - uid: 7797
+  - uid: 7775
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-19.5
-      parent: 2
-  - uid: 7798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: 32.5,-20.5
       parent: 2
   - uid: 7937
     components:
@@ -40751,34 +42422,42 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-23.5
       parent: 2
-  - uid: 8568
+  - uid: 8845
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 50.5,-25.5
+      pos: 22.5,-19.5
       parent: 2
   - uid: 10302
     components:
     - type: Transform
       pos: 49.5,-20.5
       parent: 2
-  - uid: 11756
+  - uid: 19152
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-25.5
+      parent: 2
+  - uid: 19669
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -46.5,-44.5
       parent: 2
 - proto: ChairFoldingSpawnFolded
   entities:
-  - uid: 9949
+  - uid: 7752
     components:
     - type: Transform
-      pos: 36.415863,-13.360202
+      rot: -1.5707963267948966 rad
+      pos: 47.450993,-25.454924
       parent: 2
-  - uid: 11686
+  - uid: 15417
     components:
     - type: Transform
-      pos: 36.322113,-13.21948
+      rot: -1.5707963267948966 rad
+      pos: 47.482243,-25.298674
       parent: 2
   - uid: 16294
     components:
@@ -40795,19 +42474,36 @@ entities:
     - type: Transform
       pos: 43.51082,-13.164188
       parent: 2
-  - uid: 17954
-    components:
-    - type: Transform
-      pos: 36.525238,-13.125664
-      parent: 2
 - proto: ChairOfficeDark
   entities:
+  - uid: 237
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-46.5
+      parent: 2
   - uid: 2929
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-67.5
       parent: 2
+  - uid: 3460
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-55.5
+      parent: 2
+  - uid: 3527
+    components:
+    - type: Transform
+      pos: 64.5,-43.5
+      parent: 2
+  - uid: 5414
+    components:
+    - type: Transform
+      pos: 58.5,-39.5
+      parent: 2
   - uid: 5479
     components:
     - type: Transform
@@ -40838,26 +42534,38 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,-59.5
       parent: 2
+  - uid: 7169
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.606865,-56.41906
+      parent: 2
   - uid: 7977
     components:
     - type: Transform
       pos: 29.5,-75.5
       parent: 2
-  - uid: 9092
+  - uid: 10421
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-39.5
+      pos: 50.5,-36.5
       parent: 2
-  - uid: 10410
+  - uid: 10424
     components:
     - type: Transform
-      pos: 54.5,-55.5
+      pos: 51.5,-36.5
       parent: 2
-  - uid: 14248
+  - uid: 12942
     components:
     - type: Transform
-      pos: 59.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-38.5
+      parent: 2
+  - uid: 12943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-38.5
       parent: 2
   - uid: 15610
     components:
@@ -40865,34 +42573,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,-67.5
       parent: 2
-  - uid: 17515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-43.5
-      parent: 2
-  - uid: 17516
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-43.5
-      parent: 2
-  - uid: 17517
-    components:
-    - type: Transform
-      pos: 72.5,-41.5
-      parent: 2
-  - uid: 17518
-    components:
-    - type: Transform
-      pos: 71.5,-41.5
-      parent: 2
-  - uid: 17748
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-50.5
-      parent: 2
   - uid: 18595
     components:
     - type: Transform
@@ -40911,26 +42591,38 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-72.5
       parent: 2
-  - uid: 2293
+  - uid: 3927
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.352335,-27.985746
+      pos: 32.5,-15.5
+      parent: 2
+  - uid: 3936
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-12.5
+      parent: 2
+  - uid: 4626
+    components:
+    - type: Transform
+      pos: 30.5,-15.5
       parent: 2
   - uid: 6281
     components:
     - type: Transform
       pos: 21.5,-73.5
       parent: 2
-  - uid: 7766
+  - uid: 7769
     components:
     - type: Transform
-      pos: 30.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: 34.5,-12.5
       parent: 2
-  - uid: 7782
+  - uid: 10414
     components:
     - type: Transform
-      pos: 28.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: 28.41108,-29.119923
       parent: 2
 - proto: ChairPilotSeat
   entities:
@@ -40978,21 +42670,16 @@ entities:
       parent: 2
 - proto: ChairXeno
   entities:
-  - uid: 3386
-    components:
-    - type: Transform
-      pos: 59.5,-62.5
-      parent: 2
   - uid: 5085
     components:
     - type: Transform
       pos: -22.5,-21.5
       parent: 2
-  - uid: 5485
+  - uid: 5419
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 66.5,-70.5
+      pos: 67.5,-63.5
       parent: 2
   - uid: 5544
     components:
@@ -41024,11 +42711,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 41.5,-77.5
       parent: 2
-  - uid: 6901
-    components:
-    - type: Transform
-      pos: 66.5,-68.5
-      parent: 2
   - uid: 7008
     components:
     - type: Transform
@@ -41058,18 +42740,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -51.5,-37.5
       parent: 2
-  - uid: 8359
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-28.5
-      parent: 2
-  - uid: 8817
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-62.5
-      parent: 2
   - uid: 9201
     components:
     - type: Transform
@@ -41088,6 +42758,28 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -53.5,-45.5
       parent: 2
+  - uid: 15433
+    components:
+    - type: Transform
+      pos: 80.5,-63.5
+      parent: 2
+  - uid: 15434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 80.5,-65.5
+      parent: 2
+  - uid: 15484
+    components:
+    - type: Transform
+      pos: 62.5,-59.5
+      parent: 2
+  - uid: 15633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-78.5
+      parent: 2
   - uid: 19198
     components:
     - type: Transform
@@ -41095,14 +42787,11 @@ entities:
       parent: 2
 - proto: CheapLighter
   entities:
-  - uid: 18268
+  - uid: 3613
     components:
     - type: Transform
-      pos: 47.771713,-26.742779
+      pos: 45.30708,-27.668627
       parent: 2
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
 - proto: CheapRollerBed
   entities:
   - uid: 2888
@@ -41110,11 +42799,6 @@ entities:
     - type: Transform
       pos: 4.5,-19.5
       parent: 2
-  - uid: 17880
-    components:
-    - type: Transform
-      pos: 36.237247,-17.218662
-      parent: 2
 - proto: ChemDispenser
   entities:
   - uid: 4427
@@ -41139,12 +42823,31 @@ entities:
   - uid: 699
     components:
     - type: Transform
-      pos: 60.3243,-32.26429
+      pos: 50.284008,-34.290295
       parent: 2
   - uid: 14384
     components:
     - type: Transform
-      pos: 60.46319,-32.208694
+      pos: 50.431988,-34.165295
+      parent: 2
+- proto: ChemistryBottleRobustHarvest
+  entities:
+  - uid: 16200
+    components:
+    - type: Transform
+      pos: 3.406568,-79.26463
+      parent: 2
+- proto: ChemistryEmptyBottle01
+  entities:
+  - uid: 3159
+    components:
+    - type: Transform
+      pos: 66.35149,-62.94295
+      parent: 2
+  - uid: 7197
+    components:
+    - type: Transform
+      pos: 66.50148,-63.087673
       parent: 2
 - proto: ChemistryHotplate
   entities:
@@ -41193,6 +42896,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-35.5
       parent: 2
+- proto: Cigar
+  entities:
+  - uid: 19658
+    components:
+    - type: Transform
+      pos: -48.56308,-44.345364
+      parent: 2
 - proto: CigaretteBanana
   entities:
   - uid: 7237
@@ -41202,15 +42912,10 @@ entities:
       parent: 2
 - proto: CigaretteSpent
   entities:
-  - uid: 9354
+  - uid: 19660
     components:
     - type: Transform
-      pos: 68.70699,-38.075283
-      parent: 2
-  - uid: 10268
-    components:
-    - type: Transform
-      pos: 68.09442,-38.40559
+      pos: -47.900097,-45.23187
       parent: 2
 - proto: CigarGold
   entities:
@@ -41228,6 +42933,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: CigarSpent
+  entities:
+  - uid: 19659
+    components:
+    - type: Transform
+      pos: -47.31308,-45.27867
+      parent: 2
 - proto: CircuitImprinter
   entities:
   - uid: 5897
@@ -41319,11 +43031,6 @@ entities:
     - type: Transform
       pos: -20.5,-30.5
       parent: 2
-  - uid: 313
-    components:
-    - type: Transform
-      pos: -21.5,-29.5
-      parent: 2
   - uid: 314
     components:
     - type: Transform
@@ -41389,11 +43096,6 @@ entities:
     - type: Transform
       pos: -22.5,-28.5
       parent: 2
-  - uid: 1341
-    components:
-    - type: Transform
-      pos: -23.5,-29.5
-      parent: 2
   - uid: 1429
     components:
     - type: Transform
@@ -41469,11 +43171,6 @@ entities:
     - type: Transform
       pos: -17.5,-35.5
       parent: 2
-  - uid: 14808
-    components:
-    - type: Transform
-      pos: -22.5,-29.5
-      parent: 2
   - uid: 16186
     components:
     - type: Transform
@@ -41493,10 +43190,10 @@ entities:
       parent: 2
 - proto: ClosetChefFilled
   entities:
-  - uid: 7041
+  - uid: 7203
     components:
     - type: Transform
-      pos: 47.5,-40.5
+      pos: 41.5,-38.5
       parent: 2
 - proto: ClosetEmergencyFilledRandom
   entities:
@@ -41505,11 +43202,21 @@ entities:
     - type: Transform
       pos: 2.5,-64.5
       parent: 2
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 54.5,-48.5
+      parent: 2
   - uid: 3194
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
+  - uid: 3769
+    components:
+    - type: Transform
+      pos: 29.5,-34.5
+      parent: 2
   - uid: 5343
     components:
     - type: Transform
@@ -41550,6 +43257,11 @@ entities:
     - type: Transform
       pos: 0.5,-77.5
       parent: 2
+  - uid: 6915
+    components:
+    - type: Transform
+      pos: 49.5,-100.5
+      parent: 2
   - uid: 6919
     components:
     - type: Transform
@@ -41580,20 +43292,25 @@ entities:
     - type: Transform
       pos: 27.5,-77.5
       parent: 2
+  - uid: 8374
+    components:
+    - type: Transform
+      pos: -38.5,-74.5
+      parent: 2
+  - uid: 9764
+    components:
+    - type: Transform
+      pos: 80.5,-66.5
+      parent: 2
   - uid: 10348
     components:
     - type: Transform
       pos: 18.5,-101.5
       parent: 2
-  - uid: 11474
+  - uid: 10674
     components:
     - type: Transform
-      pos: 49.5,-96.5
-      parent: 2
-  - uid: 12927
-    components:
-    - type: Transform
-      pos: 38.5,-22.5
+      pos: 62.5,-63.5
       parent: 2
   - uid: 12971
     components:
@@ -41605,21 +43322,31 @@ entities:
     - type: Transform
       pos: -59.5,-24.5
       parent: 2
-  - uid: 15257
+  - uid: 15408
     components:
     - type: Transform
-      pos: 28.5,-35.5
+      pos: 50.5,-40.5
+      parent: 2
+  - uid: 15425
+    components:
+    - type: Transform
+      pos: 38.5,-25.5
+      parent: 2
+  - uid: 15596
+    components:
+    - type: Transform
+      pos: 47.5,-31.5
+      parent: 2
+  - uid: 16038
+    components:
+    - type: Transform
+      pos: 9.5,-37.5
       parent: 2
   - uid: 17038
     components:
     - type: Transform
       pos: -12.5,-80.5
       parent: 2
-  - uid: 17352
-    components:
-    - type: Transform
-      pos: -43.5,-76.5
-      parent: 2
   - uid: 17396
     components:
     - type: Transform
@@ -41664,6 +43391,11 @@ entities:
     - type: Transform
       pos: -58.5,-24.5
       parent: 2
+  - uid: 3676
+    components:
+    - type: Transform
+      pos: 35.5,-34.5
+      parent: 2
   - uid: 4552
     components:
     - type: Transform
@@ -41679,6 +43411,11 @@ entities:
     - type: Transform
       pos: 83.5,-23.5
       parent: 2
+  - uid: 7786
+    components:
+    - type: Transform
+      pos: 37.5,-25.5
+      parent: 2
   - uid: 8210
     components:
     - type: Transform
@@ -41689,11 +43426,6 @@ entities:
     - type: Transform
       pos: -24.5,-41.5
       parent: 2
-  - uid: 16287
-    components:
-    - type: Transform
-      pos: 38.5,-37.5
-      parent: 2
   - uid: 17100
     components:
     - type: Transform
@@ -41719,11 +43451,6 @@ entities:
     - type: Transform
       pos: 35.5,-78.5
       parent: 2
-  - uid: 18908
-    components:
-    - type: Transform
-      pos: 5.5,-73.5
-      parent: 2
   - uid: 19187
     components:
     - type: Transform
@@ -41761,20 +43488,45 @@ entities:
     - type: Transform
       pos: 18.5,-91.5
       parent: 2
+  - uid: 10755
+    components:
+    - type: Transform
+      pos: 35.5,-75.5
+      parent: 2
+  - uid: 10812
+    components:
+    - type: Transform
+      pos: 54.5,-49.5
+      parent: 2
   - uid: 12147
     components:
     - type: Transform
       pos: 1.5,-64.5
       parent: 2
-  - uid: 14251
+  - uid: 15410
     components:
     - type: Transform
-      pos: 49.5,-63.5
+      pos: 49.5,-40.5
       parent: 2
-  - uid: 17246
+  - uid: 15412
     components:
     - type: Transform
-      pos: 36.5,-20.5
+      pos: 39.5,-25.5
+      parent: 2
+  - uid: 15640
+    components:
+    - type: Transform
+      pos: 48.5,-63.5
+      parent: 2
+  - uid: 16039
+    components:
+    - type: Transform
+      pos: 10.5,-37.5
+      parent: 2
+  - uid: 16050
+    components:
+    - type: Transform
+      pos: 36.5,-75.5
       parent: 2
   - uid: 17296
     components:
@@ -41816,6 +43568,11 @@ entities:
     - type: Transform
       pos: 19.5,-33.5
       parent: 2
+  - uid: 20050
+    components:
+    - type: Transform
+      pos: 74.5,-70.5
+      parent: 2
 - proto: ClosetJanitorFilled
   entities:
   - uid: 5620
@@ -41830,50 +43587,62 @@ entities:
     - type: Transform
       pos: -7.5,-50.5
       parent: 2
-- proto: ClosetL3VirologyFilled
+- proto: ClosetL3SecurityFilled
   entities:
-  - uid: 7779
-    components:
-    - type: Transform
-      pos: 31.5,-20.5
-      parent: 2
   - uid: 7780
     components:
     - type: Transform
-      pos: 31.5,-19.5
+      pos: 66.5,-18.5
+      parent: 2
+  - uid: 9292
+    components:
+    - type: Transform
+      pos: 66.5,-17.5
+      parent: 2
+- proto: ClosetL3VirologyFilled
+  entities:
+  - uid: 3634
+    components:
+    - type: Transform
+      pos: 36.5,-17.5
+      parent: 2
+  - uid: 4219
+    components:
+    - type: Transform
+      pos: 36.5,-14.5
+      parent: 2
+  - uid: 4220
+    components:
+    - type: Transform
+      pos: 36.5,-18.5
       parent: 2
 - proto: ClosetMaintenanceFilledRandom
   entities:
-  - uid: 4345
+  - uid: 919
     components:
     - type: Transform
-      pos: 66.5,-54.5
+      pos: 37.5,-30.5
+      parent: 2
+  - uid: 3006
+    components:
+    - type: Transform
+      pos: 53.5,-26.5
+      parent: 2
+  - uid: 6013
+    components:
+    - type: Transform
+      pos: 78.5,-30.5
+      parent: 2
+  - uid: 7390
+    components:
+    - type: Transform
+      pos: 75.5,-28.5
       parent: 2
   - uid: 7629
     components:
     - type: Transform
       pos: -53.5,-27.5
       parent: 2
-  - uid: 7705
-    components:
-    - type: Transform
-      pos: 71.5,-26.5
-      parent: 2
-  - uid: 7708
-    components:
-    - type: Transform
-      pos: 74.5,-34.5
-      parent: 2
-  - uid: 8043
-    components:
-    - type: Transform
-      pos: 44.5,-38.5
-      parent: 2
-  - uid: 8046
-    components:
-    - type: Transform
-      pos: 37.5,-24.5
-      parent: 2
   - uid: 8049
     components:
     - type: Transform
@@ -41904,16 +43673,6 @@ entities:
     - type: Transform
       pos: -54.5,-65.5
       parent: 2
-  - uid: 8057
-    components:
-    - type: Transform
-      pos: -38.5,-74.5
-      parent: 2
-  - uid: 8058
-    components:
-    - type: Transform
-      pos: -35.5,-80.5
-      parent: 2
   - uid: 8062
     components:
     - type: Transform
@@ -41939,50 +43698,55 @@ entities:
     - type: Transform
       pos: -46.5,-28.5
       parent: 2
+  - uid: 8373
+    components:
+    - type: Transform
+      pos: -43.5,-76.5
+      parent: 2
   - uid: 8380
     components:
     - type: Transform
       pos: -25.5,-53.5
       parent: 2
-  - uid: 8584
+  - uid: 8504
     components:
     - type: Transform
-      pos: 57.5,-73.5
+      pos: 64.5,-70.5
       parent: 2
-  - uid: 10334
+  - uid: 10672
     components:
     - type: Transform
-      pos: 55.5,-65.5
+      pos: 75.5,-37.5
       parent: 2
-  - uid: 10788
+  - uid: 10673
     components:
     - type: Transform
-      pos: 77.5,-39.5
+      pos: 48.5,-48.5
       parent: 2
-  - uid: 12703
+  - uid: 10748
     components:
     - type: Transform
-      pos: 74.5,-54.5
+      pos: 1.5,-61.5
       parent: 2
-  - uid: 12991
+  - uid: 13158
     components:
     - type: Transform
-      pos: 47.5,-32.5
+      pos: 72.5,-36.5
       parent: 2
   - uid: 13905
     components:
     - type: Transform
       pos: 73.5,-21.5
       parent: 2
-  - uid: 14296
+  - uid: 14242
     components:
     - type: Transform
-      pos: 74.5,-27.5
+      pos: 56.5,-74.5
       parent: 2
-  - uid: 16268
+  - uid: 15477
     components:
     - type: Transform
-      pos: 50.5,-42.5
+      pos: 69.5,-68.5
       parent: 2
   - uid: 17044
     components:
@@ -42004,16 +43768,6 @@ entities:
     - type: Transform
       pos: 3.5,-71.5
       parent: 2
-  - uid: 17887
-    components:
-    - type: Transform
-      pos: 2.5,-59.5
-      parent: 2
-  - uid: 17995
-    components:
-    - type: Transform
-      pos: 72.5,-39.5
-      parent: 2
   - uid: 18250
     components:
     - type: Transform
@@ -42036,11 +43790,6 @@ entities:
     - type: Transform
       pos: -48.5,-55.5
       parent: 2
-  - uid: 7800
-    components:
-    - type: Transform
-      pos: 31.5,-21.5
-      parent: 2
   - uid: 8201
     components:
     - type: Transform
@@ -42051,6 +43800,11 @@ entities:
     - type: Transform
       pos: -45.5,-12.5
       parent: 2
+  - uid: 10776
+    components:
+    - type: Transform
+      pos: 36.5,-20.5
+      parent: 2
   - uid: 17043
     components:
     - type: Transform
@@ -42061,11 +43815,6 @@ entities:
     - type: Transform
       pos: -9.5,-79.5
       parent: 2
-  - uid: 17958
-    components:
-    - type: Transform
-      pos: 35.5,-20.5
-      parent: 2
   - uid: 19389
     components:
     - type: Transform
@@ -42083,11 +43832,40 @@ entities:
     - type: Transform
       pos: -11.5,-74.5
       parent: 2
-  - uid: 19225
+- proto: ClosetWallAtmospherics
+  entities:
+  - uid: 20005
     components:
     - type: Transform
-      pos: 48.5,-30.5
+      pos: -53.5,-24.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 20006
+          - 20007
+          - 20008
 - proto: ClosetWallBlue
   entities:
   - uid: 5967
@@ -42150,25 +43928,17 @@ entities:
           - 6069
           - 6068
           - 6075
-- proto: ClosetWallMaintenanceFilledRandom
-  entities:
-  - uid: 4047
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-67.5
-      parent: 2
 - proto: ClothingBackpack
   entities:
   - uid: 12849
     components:
     - type: Transform
-      pos: 66.59503,-17.370646
+      pos: 66.39443,-29.194597
       parent: 2
   - uid: 14243
     components:
     - type: Transform
-      pos: 66.62203,-17.271994
+      pos: 66.67568,-29.241472
       parent: 2
 - proto: ClothingBackpackDuffelMedical
   entities:
@@ -42208,24 +43978,8 @@ entities:
   - uid: 19414
     components:
     - type: Transform
-      pos: -61.638824,-24.75973
+      pos: -61.625114,-24.788584
       parent: 2
-    - type: Storage
-      storedItems:
-        19415:
-          position: 2,0
-          _rotation: South
-        19417:
-          position: 0,0
-          _rotation: East
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 19415
-          - 19417
 - proto: ClothingBackpackSatchelChemistry
   entities:
   - uid: 2201
@@ -42243,7 +43997,14 @@ entities:
   - uid: 5236
     components:
     - type: Transform
-      pos: 17.505743,-17.404364
+      pos: 20.337646,-17.241425
+      parent: 2
+- proto: ClothingBeltPlantFilled
+  entities:
+  - uid: 15598
+    components:
+    - type: Transform
+      pos: 2.510798,-79.082664
       parent: 2
 - proto: ClothingBeltUtilityEngineering
   entities:
@@ -42281,18 +44042,23 @@ entities:
   - uid: 6987
     components:
     - type: Transform
-      pos: 51.629555,-99.27984
+      pos: 52.425804,-99.20869
       parent: 2
   - uid: 6988
     components:
     - type: Transform
-      pos: 52.44282,-99.49868
+      pos: 52.83198,-99.4205
       parent: 2
   - uid: 7958
     components:
     - type: Transform
       pos: 8.443563,-87.12137
       parent: 2
+  - uid: 19651
+    components:
+    - type: Transform
+      pos: -47.73321,-44.589058
+      parent: 2
 - proto: ClothingEyesGlassesChemical
   entities:
   - uid: 7693
@@ -42314,6 +44080,18 @@ entities:
     - type: Transform
       pos: -9.340807,-26.550825
       parent: 2
+- proto: ClothingEyesHudMedical
+  entities:
+  - uid: 7754
+    components:
+    - type: Transform
+      pos: 20.337646,-17.5383
+      parent: 2
+  - uid: 7798
+    components:
+    - type: Transform
+      pos: 20.634521,-17.44455
+      parent: 2
 - proto: ClothingHandsGlovesBoxingBlue
   entities:
   - uid: 7687
@@ -42335,11 +44113,6 @@ entities:
     - type: Transform
       pos: -14.402835,-60.521347
       parent: 2
-  - uid: 12924
-    components:
-    - type: Transform
-      pos: -64.423996,-28.45623
-      parent: 2
   - uid: 19366
     components:
     - type: Transform
@@ -42350,12 +44123,12 @@ entities:
   - uid: 7938
     components:
     - type: Transform
-      pos: -22.386917,-49.45568
+      pos: -22.36449,-49.554092
       parent: 2
   - uid: 19371
     components:
     - type: Transform
-      pos: -22.50776,-49.283688
+      pos: -22.554304,-49.354877
       parent: 2
 - proto: ClothingHandsGlovesLatex
   entities:
@@ -42383,22 +44156,10 @@ entities:
     - type: Transform
       pos: 9.506972,-24.333637
       parent: 2
-  - uid: 7786
-    components:
-    - type: Transform
-      pos: 27.561043,-15.543834
-      parent: 2
   - uid: 16849
     components:
     - type: Transform
-      pos: 27.414835,-27.933626
-      parent: 2
-- proto: ClothingHeadBandGrey
-  entities:
-  - uid: 17551
-    components:
-    - type: Transform
-      pos: -40.61692,-61.2887
+      pos: 27.47358,-28.431944
       parent: 2
 - proto: ClothingHeadBandMerc
   entities:
@@ -42407,13 +44168,6 @@ entities:
     - type: Transform
       pos: -56.602005,-29.002491
       parent: 2
-- proto: ClothingHeadBandSkull
-  entities:
-  - uid: 17950
-    components:
-    - type: Transform
-      pos: 35.406235,-18.407043
-      parent: 2
 - proto: ClothingHeadFishCap
   entities:
   - uid: 16710
@@ -42439,10 +44193,10 @@ entities:
       parent: 2
 - proto: ClothingHeadHatBeretMerc
   entities:
-  - uid: 11757
+  - uid: 19171
     components:
     - type: Transform
-      pos: 49.279545,-25.185894
+      pos: 40.35338,-25.259914
       parent: 2
 - proto: ClothingHeadHatBrownFlatcap
   entities:
@@ -42470,6 +44224,20 @@ entities:
     - type: Transform
       pos: -43.50235,-23.40171
       parent: 2
+- proto: ClothingHeadHatCardborg
+  entities:
+  - uid: 4463
+    components:
+    - type: Transform
+      pos: -42.64476,-62.24417
+      parent: 2
+- proto: ClothingHeadHatChef
+  entities:
+  - uid: 19742
+    components:
+    - type: Transform
+      pos: 42.692513,-34.382397
+      parent: 2
 - proto: ClothingHeadHatCone
   entities:
   - uid: 2336
@@ -42507,13 +44275,6 @@ entities:
     - type: Transform
       pos: 11.390965,-79.291046
       parent: 2
-- proto: ClothingHeadHatCowboyRed
-  entities:
-  - uid: 19230
-    components:
-    - type: Transform
-      pos: 46.667255,-29.220667
-      parent: 2
 - proto: ClothingHeadHatFedoraBrown
   entities:
   - uid: 6070
@@ -42523,20 +44284,27 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingHeadHatFez
-  entities:
-  - uid: 17549
-    components:
-    - type: Transform
-      pos: -42.550858,-61.1064
-      parent: 2
 - proto: ClothingHeadHatHardhatOrange
   entities:
   - uid: 33
     components:
     - type: Transform
-      pos: 9.14785,-84.3515
+      pos: 9.3677225,-84.24618
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 167
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 167
+    - type: ActionsContainer
 - proto: ClothingHeadHatHardhatYellowDark
   entities:
   - uid: 17536
@@ -42556,7 +44324,14 @@ entities:
   - uid: 17525
     components:
     - type: Transform
-      pos: 83.5435,-72.335686
+      pos: 83.39368,-72.298546
+      parent: 2
+- proto: ClothingHeadHatPaper
+  entities:
+  - uid: 16035
+    components:
+    - type: Transform
+      pos: 61.497665,-57.252792
       parent: 2
 - proto: ClothingHeadHatPartyGreen
   entities:
@@ -42607,19 +44382,12 @@ entities:
     - type: Transform
       pos: -12.630263,-28.354128
       parent: 2
-- proto: ClothingHeadHatWeldingMaskFlame
-  entities:
-  - uid: 3302
-    components:
-    - type: Transform
-      pos: 53.542313,-29.537529
-      parent: 2
 - proto: ClothingHeadHatWeldingMaskFlameBlue
   entities:
-  - uid: 19226
+  - uid: 15457
     components:
     - type: Transform
-      pos: 48.679688,-29.271996
+      pos: 67.39528,-68.335495
       parent: 2
 - proto: ClothingHeadHatYellowsoftFlipped
   entities:
@@ -42630,6 +44398,12 @@ entities:
       parent: 2
 - proto: ClothingHeadHelmetEVA
   entities:
+  - uid: 15545
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.77258,-19.393414
+      parent: 2
   - uid: 16569
     components:
     - type: Transform
@@ -42677,20 +44451,19 @@ entities:
   - uid: 19417
     components:
     - type: Transform
-      parent: 19414
-    - type: Physics
-      canCollide: False
+      pos: -61.573032,-24.340357
+      parent: 2
 - proto: ClothingHeadHelmetRiot
   entities:
   - uid: 11848
     components:
     - type: Transform
-      pos: 67.23555,-31.516634
+      pos: 68.52531,-32.620815
       parent: 2
   - uid: 14558
     components:
     - type: Transform
-      pos: 67.531845,-31.618555
+      pos: 68.27531,-32.564243
       parent: 2
 - proto: ClothingHeadHelmetWizardHelm
   entities:
@@ -42737,7 +44510,14 @@ entities:
     - type: MetaData
       desc: Something about this particular mime mask makes you feel like you should run amok across the station...
     - type: Transform
-      pos: 83.44597,-72.587036
+      pos: 83.56729,-72.486176
+      parent: 2
+- proto: ClothingMultipleHeadphones
+  entities:
+  - uid: 17553
+    components:
+    - type: Transform
+      pos: -37.47268,-60.168076
       parent: 2
 - proto: ClothingNeckBling
   entities:
@@ -42755,27 +44535,27 @@ entities:
       parent: 2
 - proto: ClothingNeckCloakAro
   entities:
-  - uid: 17334
+  - uid: 8150
     components:
     - type: Transform
-      pos: 37.522045,-26.442745
+      pos: 39.571434,-28.464401
       parent: 2
     - type: CollisionWake
       enabled: False
     - type: Conveyed
 - proto: ClothingNeckCloakBi
   entities:
-  - uid: 17329
+  - uid: 6921
     components:
     - type: Transform
-      pos: 56.517162,-96.50428
+      pos: 57.523323,-96.46691
       parent: 2
 - proto: ClothingNeckCloakEnby
   entities:
-  - uid: 17333
+  - uid: 13645
     components:
     - type: Transform
-      pos: 80.59616,-29.47204
+      pos: 79.02105,-25.344301
       parent: 2
 - proto: ClothingNeckCloakGay
   entities:
@@ -42786,10 +44566,10 @@ entities:
       parent: 2
 - proto: ClothingNeckCloakIntersex
   entities:
-  - uid: 17327
+  - uid: 7509
     components:
     - type: Transform
-      pos: 103.49843,-45.428753
+      pos: 105.5457,-45.44423
       parent: 2
 - proto: ClothingNeckCloakLesbian
   entities:
@@ -42807,10 +44587,10 @@ entities:
       parent: 2
 - proto: ClothingNeckCloakPan
   entities:
-  - uid: 17326
+  - uid: 11982
     components:
     - type: Transform
-      pos: 46.512062,-41.474453
+      pos: 44.485863,-38.413647
       parent: 2
 - proto: ClothingNeckCloakPirateCap
   entities:
@@ -42826,19 +44606,12 @@ entities:
     - type: Transform
       pos: 77.515434,-20.379131
       parent: 2
-- proto: ClothingNeckHeadphones
-  entities:
-  - uid: 17553
-    components:
-    - type: Transform
-      pos: -37.47268,-60.168076
-      parent: 2
 - proto: ClothingNeckScarfStripedBlack
   entities:
   - uid: 19011
     components:
     - type: Transform
-      pos: -19.500801,-47.459538
+      pos: -21.34203,-46.832394
       parent: 2
 - proto: ClothingNeckStethoscope
   entities:
@@ -42859,13 +44632,6 @@ entities:
     - type: Transform
       pos: -24.46909,-39.37975
       parent: 2
-- proto: ClothingOuterApron
-  entities:
-  - uid: 19224
-    components:
-    - type: Transform
-      pos: 48.45174,-29.451004
-      parent: 2
 - proto: ClothingOuterApronChef
   entities:
   - uid: 13574
@@ -42878,48 +44644,41 @@ entities:
   - uid: 3326
     components:
     - type: Transform
-      pos: 62.66438,-56.32613
+      pos: 62.646404,-48.329308
       parent: 2
   - uid: 12928
     components:
     - type: Transform
-      pos: 62.516026,-56.163982
+      pos: 62.771404,-48.454395
       parent: 2
   - uid: 18163
     components:
     - type: Transform
-      pos: 62.738453,-56.48828
+      pos: 62.479736,-48.235493
       parent: 2
 - proto: ClothingOuterArmorReflective
   entities:
   - uid: 13210
     components:
     - type: Transform
-      pos: 62.456047,-56.506813
+      pos: 62.485695,-48.574135
       parent: 2
   - uid: 13547
     components:
     - type: Transform
-      pos: 62.19195,-56.32613
+      pos: 62.256527,-48.454395
       parent: 2
 - proto: ClothingOuterArmorRiot
   entities:
   - uid: 13853
     components:
     - type: Transform
-      pos: 67.58277,-31.423977
+      pos: 68.61906,-32.512123
       parent: 2
   - uid: 13944
     components:
     - type: Transform
-      pos: 67.318886,-31.368382
-      parent: 2
-- proto: ClothingOuterCoatExpensive
-  entities:
-  - uid: 19228
-    components:
-    - type: Transform
-      pos: 46.408375,-29.34115
+      pos: 68.40031,-32.439156
       parent: 2
 - proto: ClothingOuterCoatJensen
   entities:
@@ -42938,7 +44697,7 @@ entities:
   - uid: 16581
     components:
     - type: Transform
-      pos: 19.3277,-17.56891
+      pos: 19.48025,-17.483467
       parent: 2
   - uid: 19195
     components:
@@ -42957,13 +44716,6 @@ entities:
     - type: Transform
       pos: 13.521003,-48.48971
       parent: 2
-- proto: ClothingOuterHardsuitAncientEVA
-  entities:
-  - uid: 9460
-    components:
-    - type: Transform
-      pos: -61.45499,-24.300335
-      parent: 2
 - proto: ClothingOuterHardsuitEngineering
   entities:
   - uid: 18248
@@ -43033,14 +44785,14 @@ entities:
   - uid: 16579
     components:
     - type: Transform
-      pos: 18.963116,-17.370857
+      pos: 19.0115,-17.311592
       parent: 2
 - proto: ClothingOuterJacketChef
   entities:
-  - uid: 17121
+  - uid: 11128
     components:
     - type: Transform
-      pos: -36.48301,-78.397415
+      pos: -40.301754,-80.29031
       parent: 2
 - proto: ClothingOuterNunRobe
   entities:
@@ -43068,7 +44820,7 @@ entities:
   - uid: 2736
     components:
     - type: Transform
-      pos: 9.585026,-84.4104
+      pos: 8.878139,-84.412964
       parent: 2
   - uid: 17534
     components:
@@ -43087,12 +44839,12 @@ entities:
     - type: Transform
       pos: 35.344784,-91.27624
       parent: 2
-- proto: ClothingShoesBootsCowboyFancy
+- proto: ClothingOuterWinterHydro
   entities:
-  - uid: 19229
+  - uid: 3873
     components:
     - type: Transform
-      pos: 46.68288,-29.752285
+      pos: -5.464688,-51.46298
       parent: 2
 - proto: ClothingShoesBootsMagSci
   entities:
@@ -43113,10 +44865,10 @@ entities:
       parent: 2
 - proto: ClothingShoesBootsWinterWeb
   entities:
-  - uid: 15425
+  - uid: 3569
     components:
     - type: Transform
-      pos: 71.44248,-48.105747
+      pos: 71.453255,-53.02562
       parent: 2
 - proto: ClothingShoesBootsWork
   entities:
@@ -43142,14 +44894,14 @@ entities:
   - uid: 17526
     components:
     - type: Transform
-      pos: 83.44124,-72.75265
+      pos: 83.45022,-72.70801
       parent: 2
 - proto: ClothingShoesSlippers
   entities:
   - uid: 16481
     components:
     - type: Transform
-      pos: 43.431202,-16.162926
+      pos: 42.48139,-16.580917
       parent: 2
   - uid: 17390
     components:
@@ -43187,12 +44939,12 @@ entities:
   - uid: 12848
     components:
     - type: Transform
-      pos: 66.41339,-17.527605
+      pos: 66.25381,-29.431435
       parent: 2
   - uid: 18042
     components:
     - type: Transform
-      pos: 66.45755,-17.432138
+      pos: 66.51943,-29.493935
       parent: 2
 - proto: ClothingUniformJumpskirtLawyerBlack
   entities:
@@ -43223,19 +44975,19 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 68.67686,-48.527916
+      pos: 68.50647,-53.550026
       parent: 2
 - proto: ClothingUniformJumpsuitColorGrey
   entities:
   - uid: 7216
     components:
     - type: Transform
-      pos: 66.257866,-17.398647
+      pos: 66.75381,-29.444597
       parent: 2
   - uid: 7217
     components:
     - type: Transform
-      pos: 66.26817,-17.333786
+      pos: 66.44131,-29.366472
       parent: 2
 - proto: ClothingUniformJumpsuitColorMaroon
   entities:
@@ -43296,15 +45048,27 @@ entities:
   - uid: 7173
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.37998,-48.309013
+      rot: -1.5707965016404568 rad
+      pos: 68.14163,-53.268776
       parent: 2
 - proto: Cobweb1
   entities:
-  - uid: 3719
+  - uid: 2933
     components:
     - type: Transform
-      pos: 40.5,-32.5
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-51.5
+      parent: 2
+  - uid: 3710
+    components:
+    - type: Transform
+      pos: 77.5,-69.5
+      parent: 2
+  - uid: 7574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-39.5
       parent: 2
   - uid: 8220
     components:
@@ -43323,18 +45087,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-25.5
       parent: 2
-  - uid: 13798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-48.5
-      parent: 2
-  - uid: 16509
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 75.5,-38.5
-      parent: 2
   - uid: 17713
     components:
     - type: Transform
@@ -43353,29 +45105,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,-77.5
       parent: 2
-  - uid: 17717
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-69.5
-      parent: 2
   - uid: 17965
     components:
     - type: Transform
       pos: 72.5,-25.5
       parent: 2
-  - uid: 18218
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 18221
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-33.5
-      parent: 2
   - uid: 18909
     components:
     - type: Transform
@@ -43384,27 +45118,27 @@ entities:
       parent: 2
 - proto: Cobweb2
   entities:
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 74.5,-35.5
+      parent: 2
+  - uid: 8113
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 76.5,-31.5
+      parent: 2
   - uid: 8222
     components:
     - type: Transform
       pos: -44.5,-22.5
       parent: 2
-  - uid: 13799
-    components:
-    - type: Transform
-      pos: 71.5,-45.5
-      parent: 2
-  - uid: 16497
+  - uid: 12989
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 71.5,-29.5
-      parent: 2
-  - uid: 16506
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-30.5
+      pos: 72.5,-29.5
       parent: 2
   - uid: 16507
     components:
@@ -43424,36 +45158,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: -40.5,-80.5
       parent: 2
-  - uid: 17715
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-73.5
-      parent: 2
-  - uid: 17722
-    components:
-    - type: Transform
-      pos: 67.5,-65.5
-      parent: 2
-  - uid: 18220
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
-      parent: 2
 - proto: ComfyChair
   entities:
+  - uid: 3465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-55.5
+      parent: 2
+  - uid: 4177
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-51.5
+      parent: 2
   - uid: 4995
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,-90.5
       parent: 2
-  - uid: 6289
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 70.5,-50.5
-      parent: 2
   - uid: 6724
     components:
     - type: Transform
@@ -43516,41 +45240,42 @@ entities:
     - type: Transform
       pos: 34.5,-48.5
       parent: 2
-  - uid: 7734
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-57.5
-      parent: 2
-  - uid: 8089
-    components:
-    - type: Transform
-      pos: 75.5,-63.5
-      parent: 2
-  - uid: 8090
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-65.5
-      parent: 2
-  - uid: 17170
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 53.5,-57.5
-      parent: 2
-  - uid: 17683
+  - uid: 7110
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 68.5,-46.5
+      pos: 54.5,-56.5
+      parent: 2
+  - uid: 7384
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-73.5
+      parent: 2
+  - uid: 7385
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-73.5
+      parent: 2
+  - uid: 7388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-76.5
+      parent: 2
+  - uid: 10250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-46.5
       parent: 2
 - proto: CommandmentCircuitBoard
   entities:
   - uid: 18626
     components:
     - type: Transform
-      pos: 76.992035,-47.50165
+      pos: 80.45743,-47.240086
       parent: 2
 - proto: CommsComputerCircuitboard
   entities:
@@ -43573,6 +45298,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,-60.5
       parent: 2
+  - uid: 7526
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 86.5,-47.5
+      parent: 2
   - uid: 18594
     components:
     - type: Transform
@@ -43682,11 +45413,10 @@ entities:
       parent: 2
 - proto: ComputerCargoOrdersSecurity
   entities:
-  - uid: 10561
+  - uid: 9332
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-33.5
+      pos: 66.5,-37.5
       parent: 2
 - proto: ComputerCargoOrdersService
   entities:
@@ -43696,17 +45426,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,-50.5
       parent: 2
-  - uid: 8411
+  - uid: 8585
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-58.5
-      parent: 2
-  - uid: 17635
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-62.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-58.5
       parent: 2
 - proto: ComputerComms
   entities:
@@ -43723,12 +45447,6 @@ entities:
       parent: 2
 - proto: ComputerCrewMonitoring
   entities:
-  - uid: 3543
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-46.5
-      parent: 2
   - uid: 5109
     components:
     - type: Transform
@@ -43741,13 +45459,36 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-40.5
       parent: 2
-- proto: ComputerCriminalRecords
-  entities:
-  - uid: 3547
+  - uid: 6370
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-39.5
+      pos: 57.5,-39.5
+      parent: 2
+  - uid: 12821
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-58.5
+      parent: 2
+- proto: ComputerCriminalRecords
+  entities:
+  - uid: 373
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-14.5
+      parent: 2
+  - uid: 4212
+    components:
+    - type: Transform
+      pos: 68.5,-50.5
+      parent: 2
+  - uid: 5202
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-44.5
       parent: 2
   - uid: 5542
     components:
@@ -43761,27 +45502,38 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-50.5
       parent: 2
-  - uid: 10248
+  - uid: 7267
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 60.5,-46.5
+      pos: 59.5,-39.5
       parent: 2
-  - uid: 15445
+  - uid: 8558
     components:
     - type: Transform
-      pos: 58.5,-26.5
+      pos: 59.5,-26.5
       parent: 2
-  - uid: 16106
-    components:
-    - type: Transform
-      pos: 68.5,-45.5
-      parent: 2
-  - uid: 18166
+  - uid: 10244
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 72.5,-50.5
+      pos: 73.5,-46.5
+      parent: 2
+- proto: ComputerFrame
+  entities:
+  - uid: 7207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -39.5,-80.5
+      parent: 2
+- proto: ComputerFundingAllocation
+  entities:
+  - uid: 15385
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-57.5
       parent: 2
 - proto: ComputerId
   entities:
@@ -43837,6 +45589,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-50.5
       parent: 2
+  - uid: 7527
+    components:
+    - type: Transform
+      pos: 86.5,-43.5
+      parent: 2
   - uid: 10232
     components:
     - type: Transform
@@ -43851,11 +45608,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -54.5,-46.5
       parent: 2
-  - uid: 6912
+  - uid: 17228
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-101.5
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-103.5
       parent: 2
 - proto: ComputerResearchAndDevelopment
   entities:
@@ -43881,18 +45638,18 @@ entities:
       parent: 2
 - proto: ComputerSalvageExpedition
   entities:
-  - uid: 6904
-    components:
-    - type: Transform
-      pos: 52.5,-96.5
-      parent: 2
-- proto: ComputerSalvageJobBoard
-  entities:
-  - uid: 561
+  - uid: 6894
     components:
     - type: Transform
       pos: 53.5,-96.5
       parent: 2
+- proto: ComputerSalvageJobBoard
+  entities:
+  - uid: 6924
+    components:
+    - type: Transform
+      pos: 54.5,-96.5
+      parent: 2
 - proto: ComputerShuttleCargo
   entities:
   - uid: 6714
@@ -43932,50 +45689,34 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -57.5,-68.5
       parent: 2
-- proto: ComputerStationRecords
-  entities:
-  - uid: 15486
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-29.5
-      parent: 2
 - proto: ComputerSurveillanceCameraMonitor
   entities:
-  - uid: 538
+  - uid: 1158
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-14.5
+      pos: 69.5,-50.5
       parent: 2
   - uid: 8248
     components:
     - type: Transform
       pos: -51.5,-36.5
       parent: 2
+  - uid: 9225
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-38.5
+      parent: 2
+  - uid: 9288
+    components:
+    - type: Transform
+      pos: 58.5,-26.5
+      parent: 2
   - uid: 13269
     components:
     - type: Transform
       pos: 7.5,-48.5
       parent: 2
-  - uid: 15489
-    components:
-    - type: Transform
-      pos: 59.5,-26.5
-      parent: 2
-- proto: ComputerSurveillanceWirelessCameraMonitor
-  entities:
-  - uid: 7040
-    components:
-    - type: Transform
-      pos: 69.5,-45.5
-      parent: 2
-  - uid: 10774
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-45.5
-      parent: 2
 - proto: ComputerTelevision
   entities:
   - uid: 5478
@@ -44048,6 +45789,18 @@ entities:
       parent: 2
 - proto: ConveyorBelt
   entities:
+  - uid: 1073
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-27.5
+      parent: 2
+  - uid: 1140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-27.5
+      parent: 2
   - uid: 2500
     components:
     - type: Transform
@@ -44060,11 +45813,33 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 18.5,-84.5
       parent: 2
-  - uid: 3387
+  - uid: 2883
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 58.5,-81.5
+      pos: 76.5,-67.5
+      parent: 2
+  - uid: 3168
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-29.5
+      parent: 2
+  - uid: 3314
+    components:
+    - type: Transform
+      pos: 72.5,-68.5
+      parent: 2
+  - uid: 3530
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-26.5
+      parent: 2
+  - uid: 3531
+    components:
+    - type: Transform
+      pos: 46.5,-26.5
       parent: 2
   - uid: 3681
     components:
@@ -44072,17 +45847,44 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-90.5
       parent: 2
-  - uid: 3792
+  - uid: 3717
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 43.5,-26.5
+      pos: 45.5,-30.5
       parent: 2
-  - uid: 3816
+  - uid: 3718
+    components:
+    - type: Transform
+      pos: 45.5,-29.5
+      parent: 2
+  - uid: 3719
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 42.5,-26.5
+      pos: 39.5,-28.5
+      parent: 2
+  - uid: 3720
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-28.5
+      parent: 2
+  - uid: 3721
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 40.5,-28.5
+      parent: 2
+  - uid: 3725
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-28.5
+      parent: 2
+  - uid: 3729
+    components:
+    - type: Transform
+      pos: 46.5,-27.5
       parent: 2
   - uid: 4946
     components:
@@ -44330,324 +46132,55 @@ entities:
     - type: Transform
       pos: 19.5,-84.5
       parent: 2
-  - uid: 5296
+  - uid: 5374
+    components:
+    - type: Transform
+      pos: 72.5,-73.5
+      parent: 2
+  - uid: 6139
+    components:
+    - type: Transform
+      pos: 46.5,-28.5
+      parent: 2
+  - uid: 6388
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.5,-26.5
+      pos: 35.5,-28.5
       parent: 2
-  - uid: 5297
+  - uid: 6396
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 36.5,-26.5
+      pos: 37.5,-28.5
       parent: 2
-  - uid: 5298
+  - uid: 6397
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 37.5,-26.5
+      pos: 43.5,-26.5
       parent: 2
-  - uid: 5299
+  - uid: 6400
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 38.5,-26.5
+      pos: 40.5,-27.5
       parent: 2
-  - uid: 5300
+  - uid: 6401
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 39.5,-26.5
-      parent: 2
-  - uid: 5301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-26.5
-      parent: 2
-  - uid: 5302
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-26.5
-      parent: 2
-  - uid: 5306
-    components:
-    - type: Transform
-      pos: 46.5,-25.5
-      parent: 2
-  - uid: 5307
-    components:
-    - type: Transform
-      pos: 46.5,-26.5
-      parent: 2
-  - uid: 5310
-    components:
-    - type: Transform
-      pos: 55.5,-26.5
-      parent: 2
-  - uid: 5311
-    components:
-    - type: Transform
-      pos: 55.5,-27.5
-      parent: 2
-  - uid: 5312
-    components:
-    - type: Transform
-      pos: 55.5,-28.5
-      parent: 2
-  - uid: 5313
-    components:
-    - type: Transform
-      pos: 55.5,-29.5
-      parent: 2
-  - uid: 5314
-    components:
-    - type: Transform
-      pos: 55.5,-30.5
-      parent: 2
-  - uid: 5315
-    components:
-    - type: Transform
-      pos: 55.5,-31.5
-      parent: 2
-  - uid: 5316
-    components:
-    - type: Transform
-      pos: 52.5,-32.5
-      parent: 2
-  - uid: 5317
-    components:
-    - type: Transform
-      pos: 52.5,-33.5
-      parent: 2
-  - uid: 5318
-    components:
-    - type: Transform
-      pos: 55.5,-34.5
-      parent: 2
-  - uid: 5319
-    components:
-    - type: Transform
-      pos: 55.5,-35.5
-      parent: 2
-  - uid: 5320
-    components:
-    - type: Transform
-      pos: 52.5,-36.5
-      parent: 2
-  - uid: 5321
-    components:
-    - type: Transform
-      pos: 52.5,-37.5
-      parent: 2
-  - uid: 5322
-    components:
-    - type: Transform
-      pos: 55.5,-38.5
-      parent: 2
-  - uid: 5323
-    components:
-    - type: Transform
-      pos: 55.5,-39.5
-      parent: 2
-  - uid: 5324
-    components:
-    - type: Transform
-      pos: 55.5,-40.5
-      parent: 2
-  - uid: 5325
-    components:
-    - type: Transform
-      pos: 55.5,-41.5
-      parent: 2
-  - uid: 5326
-    components:
-    - type: Transform
-      pos: 55.5,-42.5
-      parent: 2
-  - uid: 5327
-    components:
-    - type: Transform
-      pos: 55.5,-43.5
-      parent: 2
-  - uid: 5328
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-44.5
-      parent: 2
-  - uid: 5329
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-44.5
-      parent: 2
-  - uid: 5330
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-44.5
-      parent: 2
-  - uid: 5331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.5,-44.5
-      parent: 2
-  - uid: 5332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-44.5
-      parent: 2
-  - uid: 5333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-44.5
-      parent: 2
-  - uid: 5334
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 49.5,-44.5
-      parent: 2
-  - uid: 5335
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-36.5
-      parent: 2
-  - uid: 5336
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-36.5
-      parent: 2
-  - uid: 5337
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-36.5
-      parent: 2
-  - uid: 5338
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-32.5
-      parent: 2
-  - uid: 5339
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-32.5
-      parent: 2
-  - uid: 5341
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-27.5
-      parent: 2
-  - uid: 5342
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-27.5
-      parent: 2
-  - uid: 5344
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
       pos: 44.5,-26.5
       parent: 2
-  - uid: 5350
+  - uid: 6403
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-25.5
+      pos: 72.5,-75.5
       parent: 2
-  - uid: 5351
+  - uid: 6412
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-25.5
-      parent: 2
-  - uid: 5358
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-26.5
-      parent: 2
-  - uid: 5359
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-26.5
-      parent: 2
-  - uid: 5360
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-26.5
-      parent: 2
-  - uid: 5361
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-34.5
-      parent: 2
-  - uid: 5362
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-34.5
-      parent: 2
-  - uid: 5363
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-34.5
-      parent: 2
-  - uid: 5364
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-38.5
-      parent: 2
-  - uid: 5365
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-38.5
-      parent: 2
-  - uid: 5366
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-38.5
-      parent: 2
-  - uid: 5370
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-44.5
-      parent: 2
-  - uid: 6127
-    components:
-    - type: Transform
-      pos: 61.5,-71.5
-      parent: 2
-  - uid: 6128
-    components:
-    - type: Transform
-      pos: 59.5,-73.5
-      parent: 2
-  - uid: 6129
-    components:
-    - type: Transform
-      pos: 59.5,-75.5
+      pos: 72.5,-74.5
       parent: 2
   - uid: 6708
     components:
@@ -44655,145 +46188,152 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-91.5
       parent: 2
-  - uid: 7132
+  - uid: 6868
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 59.5,-81.5
+      pos: 51.5,-96.5
       parent: 2
-  - uid: 7133
+  - uid: 6918
     components:
     - type: Transform
-      pos: 59.5,-80.5
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-96.5
       parent: 2
-  - uid: 7136
+  - uid: 7408
     components:
     - type: Transform
-      pos: 59.5,-78.5
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-68.5
       parent: 2
-  - uid: 7137
+  - uid: 7571
     components:
     - type: Transform
-      pos: 59.5,-77.5
+      rot: -1.5707963267948966 rad
+      pos: 75.5,-68.5
       parent: 2
-  - uid: 7139
-    components:
-    - type: Transform
-      pos: 59.5,-76.5
-      parent: 2
-  - uid: 7141
-    components:
-    - type: Transform
-      pos: 59.5,-74.5
-      parent: 2
-  - uid: 7142
-    components:
-    - type: Transform
-      pos: 59.5,-72.5
-      parent: 2
-  - uid: 7143
-    components:
-    - type: Transform
-      pos: 62.5,-69.5
-      parent: 2
-  - uid: 7704
+  - uid: 7891
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 60.5,-66.5
+      pos: 36.5,-28.5
       parent: 2
-  - uid: 7706
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-71.5
-      parent: 2
-  - uid: 7727
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-72.5
-      parent: 2
-  - uid: 7728
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-72.5
-      parent: 2
-  - uid: 7730
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-81.5
-      parent: 2
-  - uid: 8219
-    components:
-    - type: Transform
-      pos: 62.5,-70.5
-      parent: 2
-  - uid: 8566
+  - uid: 8075
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 50.5,-27.5
+      pos: 75.5,-61.5
       parent: 2
-  - uid: 8580
+  - uid: 8077
     components:
     - type: Transform
-      pos: 59.5,-79.5
+      pos: 77.5,-63.5
       parent: 2
-  - uid: 8637
+  - uid: 8089
+    components:
+    - type: Transform
+      pos: 45.5,-34.5
+      parent: 2
+  - uid: 8148
+    components:
+    - type: Transform
+      pos: 45.5,-31.5
+      parent: 2
+  - uid: 8822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 76.5,-61.5
+      parent: 2
+  - uid: 9301
+    components:
+    - type: Transform
+      pos: 77.5,-61.5
+      parent: 2
+  - uid: 9305
+    components:
+    - type: Transform
+      pos: 77.5,-62.5
+      parent: 2
+  - uid: 10278
+    components:
+    - type: Transform
+      pos: 77.5,-65.5
+      parent: 2
+  - uid: 10301
+    components:
+    - type: Transform
+      pos: 77.5,-66.5
+      parent: 2
+  - uid: 10306
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-67.5
+      parent: 2
+  - uid: 10703
+    components:
+    - type: Transform
+      pos: 72.5,-72.5
+      parent: 2
+  - uid: 10704
+    components:
+    - type: Transform
+      pos: 72.5,-71.5
+      parent: 2
+  - uid: 11460
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-68.5
+      parent: 2
+  - uid: 11690
+    components:
+    - type: Transform
+      pos: 72.5,-69.5
+      parent: 2
+  - uid: 11899
+    components:
+    - type: Transform
+      pos: 75.5,-67.5
+      parent: 2
+  - uid: 11903
+    components:
+    - type: Transform
+      pos: 72.5,-70.5
+      parent: 2
+  - uid: 11978
+    components:
+    - type: Transform
+      pos: 45.5,-36.5
+      parent: 2
+  - uid: 11979
+    components:
+    - type: Transform
+      pos: 45.5,-35.5
+      parent: 2
+  - uid: 11980
+    components:
+    - type: Transform
+      pos: 45.5,-33.5
+      parent: 2
+  - uid: 12955
+    components:
+    - type: Transform
+      pos: 45.5,-32.5
+      parent: 2
+  - uid: 12962
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 52.5,-27.5
-      parent: 2
-  - uid: 8801
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-66.5
-      parent: 2
-  - uid: 8804
-    components:
-    - type: Transform
-      pos: 62.5,-67.5
-      parent: 2
-  - uid: 11693
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-27.5
-      parent: 2
-  - uid: 11694
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-27.5
-      parent: 2
-  - uid: 11695
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-27.5
-      parent: 2
-  - uid: 16537
-    components:
-    - type: Transform
-      pos: 62.5,-66.5
-      parent: 2
-  - uid: 17406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-32.5
+      pos: 43.5,-27.5
       parent: 2
 - proto: CorporateCircuitBoard
   entities:
   - uid: 18621
     components:
     - type: Transform
-      pos: 76.60105,-47.30546
+      pos: 80.12597,-47.469414
       parent: 2
 - proto: CrateArtifactContainer
   entities:
@@ -44809,34 +46349,39 @@ entities:
       parent: 2
 - proto: CrateCoffin
   entities:
-  - uid: 10301
+  - uid: 3715
     components:
     - type: Transform
-      pos: 35.5,-25.5
+      pos: 34.5,-26.5
       parent: 2
-  - uid: 17707
+  - uid: 5029
     components:
     - type: Transform
-      pos: -24.5,-29.5
+      pos: -22.5,-29.5
       parent: 2
-  - uid: 19390
+  - uid: 5031
     components:
     - type: Transform
-      pos: -24.5,-30.5
+      pos: -21.5,-29.5
+      parent: 2
+  - uid: 7605
+    components:
+    - type: Transform
+      pos: 35.5,-26.5
       parent: 2
 - proto: CrateContrabandStorageSecure
   entities:
-  - uid: 10331
+  - uid: 9219
     components:
     - type: Transform
-      pos: 60.5,-43.5
+      pos: 56.5,-36.5
       parent: 2
 - proto: CrateEmergencyInternals
   entities:
-  - uid: 10756
+  - uid: 8086
     components:
     - type: Transform
-      pos: 57.5,-62.5
+      pos: 63.5,-66.5
       parent: 2
 - proto: CrateEmergencyRadiation
   entities:
@@ -44884,6 +46429,11 @@ entities:
     - type: Transform
       pos: 28.5,-11.5
       parent: 2
+  - uid: 5203
+    components:
+    - type: Transform
+      pos: 29.5,-11.5
+      parent: 2
 - proto: CrateEngineeringAMEJar
   entities:
   - uid: 8027
@@ -44905,11 +46455,21 @@ entities:
       parent: 2
 - proto: CrateEngineeringCableBulk
   entities:
+  - uid: 11754
+    components:
+    - type: Transform
+      pos: -15.5,-61.5
+      parent: 2
   - uid: 16516
     components:
     - type: Transform
       pos: -14.5,-64.5
       parent: 2
+  - uid: 18860
+    components:
+    - type: Transform
+      pos: 54.5,-70.5
+      parent: 2
 - proto: CrateEngineeringCableHV
   entities:
   - uid: 3369
@@ -45006,11 +46566,6 @@ entities:
     - type: Transform
       pos: 27.5,-95.5
       parent: 2
-  - uid: 17957
-    components:
-    - type: Transform
-      pos: 33.5,-23.5
-      parent: 2
 - proto: CrateFreezer
   entities:
   - uid: 5993
@@ -45032,27 +46587,11 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-  - uid: 7043
+  - uid: 12842
     components:
     - type: Transform
-      pos: 46.5,-45.5
+      pos: 45.5,-38.5
       parent: 2
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7044
-          - 7045
-          - 7046
-          - 7047
-          - 7048
-          - 7049
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 13205
     components:
     - type: Transform
@@ -45078,8 +46617,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -45096,45 +46635,34 @@ entities:
           showEnts: False
           occludes: True
           ents:
+          - 561
+          - 5788
+          - 6036
           - 6024
-          - 6026
           - 6027
           - 6028
-          - 6029
           - 6030
           - 6031
-          - 6032
           - 6033
           - 6034
           - 6035
-          - 6036
+          - 6026
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
-  - uid: 8099
+  - uid: 7383
     components:
     - type: Transform
-      pos: 69.5,-68.5
+      pos: 55.5,-65.5
+      parent: 2
+- proto: CrateHydroponicsSeeds
+  entities:
+  - uid: 19590
+    components:
+    - type: Transform
+      pos: 6.5,-73.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: CrateLockBoxEngineering
   entities:
   - uid: 15392
@@ -45151,22 +46679,22 @@ entities:
       parent: 2
 - proto: CrateLockBoxScience
   entities:
+  - uid: 536
+    components:
+    - type: Transform
+      pos: -10.5,-15.5
+      parent: 2
   - uid: 4348
     components:
     - type: Transform
       pos: -20.5,-27.5
       parent: 2
-  - uid: 7099
-    components:
-    - type: Transform
-      pos: -14.5,-21.5
-      parent: 2
 - proto: CrateLockBoxSecurity
   entities:
-  - uid: 12856
+  - uid: 9795
     components:
     - type: Transform
-      pos: 66.5,-40.5
+      pos: 67.5,-43.5
       parent: 2
 - proto: CrateLockBoxService
   entities:
@@ -45199,11 +46727,6 @@ entities:
     - type: Transform
       pos: -31.5,-70.5
       parent: 2
-  - uid: 15800
-    components:
-    - type: Transform
-      pos: -11.5,-64.5
-      parent: 2
 - proto: CrateMaterialSteel
   entities:
   - uid: 9912
@@ -45211,12 +46734,17 @@ entities:
     - type: Transform
       pos: -31.5,-68.5
       parent: 2
-- proto: CrateMindShieldImplants
-  entities:
-  - uid: 16980
+  - uid: 11942
     components:
     - type: Transform
-      pos: 68.5,-35.5
+      pos: -11.5,-64.5
+      parent: 2
+- proto: CrateMindShieldImplants
+  entities:
+  - uid: 6628
+    components:
+    - type: Transform
+      pos: 68.5,-36.5
       parent: 2
 - proto: CrateNPCHamlet
   entities:
@@ -45246,17 +46774,17 @@ entities:
       parent: 2
 - proto: CrateSecurityTrackingMindshieldImplants
   entities:
-  - uid: 15462
+  - uid: 7223
     components:
     - type: Transform
-      pos: 58.5,-56.5
+      pos: 58.5,-48.5
       parent: 2
 - proto: CrateServiceJanitorialSupplies
   entities:
-  - uid: 15413
+  - uid: 2158
     components:
     - type: Transform
-      pos: 60.5,-65.5
+      pos: 75.5,-60.5
       parent: 2
 - proto: CrateSurgery
   entities:
@@ -45277,7 +46805,7 @@ entities:
   - uid: 5693
     components:
     - type: Transform
-      pos: -21.583178,-46.518047
+      pos: -21.571196,-46.384167
       parent: 2
   - uid: 7685
     components:
@@ -45299,7 +46827,7 @@ entities:
   - uid: 19375
     components:
     - type: Transform
-      pos: 80.55276,-27.64461
+      pos: 78.83267,-25.61246
       parent: 2
   - uid: 19376
     components:
@@ -45316,14 +46844,11 @@ entities:
       parent: 2
 - proto: CrewMonitoringServer
   entities:
-  - uid: 15383
+  - uid: 18836
     components:
     - type: Transform
-      pos: -47.5,-38.5
+      pos: 13.5,-16.5
       parent: 2
-    - type: SingletonDeviceNetServer
-      active: False
-      available: False
 - proto: CriminalRecordsComputerCircuitboard
   entities:
   - uid: 18304
@@ -45363,7 +46888,7 @@ entities:
   - uid: 5592
     components:
     - type: Transform
-      pos: -53.47501,-42.818943
+      pos: -53.56222,-43.09171
       parent: 2
   - uid: 5593
     components:
@@ -45430,16 +46955,16 @@ entities:
     - type: Transform
       pos: 14.5,-22.5
       parent: 2
+  - uid: 7884
+    components:
+    - type: Transform
+      pos: 15.5,-22.5
+      parent: 2
   - uid: 16700
     components:
     - type: Transform
       pos: -3.5,-75.5
       parent: 2
-  - uid: 17418
-    components:
-    - type: Transform
-      pos: 15.5,-22.5
-      parent: 2
 - proto: CryoPodDestroyed
   entities:
   - uid: 3028
@@ -45474,23 +46999,6 @@ entities:
     - type: Transform
       pos: 13.567814,-24.401138
       parent: 2
-- proto: CrystalSpawner
-  entities:
-  - uid: 17343
-    components:
-    - type: Transform
-      pos: -37.5,-80.5
-      parent: 2
-  - uid: 17347
-    components:
-    - type: Transform
-      pos: -40.5,-75.5
-      parent: 2
-  - uid: 18377
-    components:
-    - type: Transform
-      pos: -40.5,-77.5
-      parent: 2
 - proto: CurtainsBlueOpen
   entities:
   - uid: 243
@@ -45559,27 +47067,20 @@ entities:
       parent: 2
 - proto: CurtainsRedOpen
   entities:
-  - uid: 3030
+  - uid: 3568
     components:
     - type: Transform
-      pos: 66.5,-50.5
+      pos: 54.5,-37.5
       parent: 2
-  - uid: 7094
+  - uid: 3868
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      pos: 70.5,-53.5
       parent: 2
-  - uid: 16272
+  - uid: 10277
     components:
     - type: Transform
-      pos: 71.5,-47.5
-      parent: 2
-- proto: CyborgEndoskeleton
-  entities:
-  - uid: 17946
-    components:
-    - type: Transform
-      pos: 35.46804,-15.35495
+      pos: 67.5,-46.5
       parent: 2
 - proto: d6Dice
   entities:
@@ -45608,47 +47109,61 @@ entities:
     - type: Transform
       pos: 12.444342,-95.34313
       parent: 2
-- proto: DefaultStationBeaconAICore
+- proto: DawInstrumentMachineCircuitboard
   entities:
-  - uid: 16345
+  - uid: 19536
     components:
     - type: Transform
-      pos: 89.5,-45.5
+      pos: 27.314516,-38.06209
+      parent: 2
+- proto: DefaultStationBeaconAICore
+  entities:
+  - uid: 7532
+    components:
+    - type: Transform
+      pos: 92.5,-45.5
+      parent: 2
+- proto: DefaultStationBeaconAIUpload
+  entities:
+  - uid: 18127
+    components:
+    - type: Transform
+      pos: 81.5,-45.5
       parent: 2
 - proto: DefaultStationBeaconAME
   entities:
-  - uid: 16220
+  - uid: 19487
     components:
     - type: Transform
-      pos: -11.5,-35.5
+      pos: -10.5,-35.5
       parent: 2
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
   - uid: 15342
     components:
     - type: Transform
-      pos: -13.5,-16.5
+      pos: -13.5,-17.5
       parent: 2
 - proto: DefaultStationBeaconArmory
   entities:
-  - uid: 6096
-    components:
-    - type: Transform
-      pos: 60.5,-57.5
-      parent: 2
   - uid: 15449
     components:
     - type: Transform
       pos: 68.5,-34.5
       parent: 2
     - type: NavMapBeacon
-      text: Mini-Armory
+      defaultText: Mini-Armory
+  - uid: 18100
+    components:
+    - type: Transform
+      pos: 60.5,-49.5
+      parent: 2
 - proto: DefaultStationBeaconArrivals
   entities:
   - uid: 16222
     components:
     - type: Transform
-      pos: 3.5,2.5
+      pos: 3.5,1.5
       parent: 2
 - proto: DefaultStationBeaconArtifactLab
   entities:
@@ -45689,10 +47204,10 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconBrigMed
   entities:
-  - uid: 7204
+  - uid: 18105
     components:
     - type: Transform
-      pos: 58.5,-32.5
+      pos: 51.5,-32.5
       parent: 2
 - proto: DefaultStationBeaconCaptainsQuarters
   entities:
@@ -45715,7 +47230,7 @@ entities:
   - uid: 16243
     components:
     - type: Transform
-      pos: 24.5,-84.5
+      pos: 24.5,-83.5
       parent: 2
 - proto: DefaultStationBeaconCERoom
   entities:
@@ -45756,17 +47271,17 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconDetectiveRoom
   entities:
-  - uid: 6097
+  - uid: 18115
     components:
     - type: Transform
-      pos: 69.5,-52.5
+      pos: 70.5,-47.5
       parent: 2
 - proto: DefaultStationBeaconDisposals
   entities:
-  - uid: 13900
+  - uid: 11865
     components:
     - type: Transform
-      pos: 60.5,-69.5
+      pos: 75.5,-65.5
       parent: 2
 - proto: DefaultStationBeaconDorms
   entities:
@@ -45780,7 +47295,7 @@ entities:
   - uid: 16226
     components:
     - type: Transform
-      pos: -20.5,-61.5
+      pos: -14.5,-60.5
       parent: 2
 - proto: DefaultStationBeaconEscapePod
   entities:
@@ -45790,21 +47305,21 @@ entities:
       pos: -46.5,-77.5
       parent: 2
     - type: NavMapBeacon
-      text: Southwestern Escape Pod
+      defaultText: SW Escape Pod
   - uid: 16256
     components:
     - type: Transform
       pos: -46.5,-13.5
       parent: 2
     - type: NavMapBeacon
-      text: Northwestern Escape Pod
+      defaultText: NW Escape Pod
   - uid: 16678
     components:
     - type: Transform
       pos: -5.5,-78.5
       parent: 2
     - type: NavMapBeacon
-      text: Southern Escape Pods
+      defaultText: Southern Escape Pods
 - proto: DefaultStationBeaconEvac
   entities:
   - uid: 16254
@@ -45817,7 +47332,7 @@ entities:
   - uid: 16233
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: 4.5,-15.5
       parent: 2
 - proto: DefaultStationBeaconGravGen
   entities:
@@ -45836,10 +47351,10 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconHOSRoom
   entities:
-  - uid: 7202
+  - uid: 18071
     components:
     - type: Transform
-      pos: 70.5,-46.5
+      pos: 67.5,-51.5
       parent: 2
 - proto: DefaultStationBeaconJanitorsCloset
   entities:
@@ -45851,12 +47366,11 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconKitchen
   entities:
-  - uid: 16230
+  - uid: 16228
     components:
     - type: Transform
-      pos: 40.5,-43.5
+      pos: 41.5,-43.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconLawOffice
   entities:
   - uid: 7210
@@ -45879,22 +47393,12 @@ entities:
       pos: 14.5,-29.5
       parent: 2
     - type: BombingTarget
-- proto: DefaultStationBeaconMedical
-  entities:
-  - uid: 7768
-    components:
-    - type: Transform
-      pos: 29.5,-16.5
-      parent: 2
-    - type: NavMapBeacon
-      text: Virology
-    - type: BombingTarget
 - proto: DefaultStationBeaconMorgue
   entities:
-  - uid: 16250
+  - uid: 8744
     components:
     - type: Transform
-      pos: 31.5,-27.5
+      pos: 31.5,-28.5
       parent: 2
 - proto: DefaultStationBeaconPermaBrig
   entities:
@@ -45904,12 +47408,14 @@ entities:
       pos: 46.5,-17.5
       parent: 2
     - type: BombingTarget
+    - type: NavMapBeacon
+      defaultText: Genpop
 - proto: DefaultStationBeaconPowerBank
   entities:
   - uid: 16248
     components:
     - type: Transform
-      pos: -23.5,-64.5
+      pos: -23.5,-63.5
       parent: 2
 - proto: DefaultStationBeaconQMRoom
   entities:
@@ -45935,12 +47441,11 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconSalvage
   entities:
-  - uid: 16262
+  - uid: 8736
     components:
     - type: Transform
-      pos: 50.5,-99.5
+      pos: 52.5,-99.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconScience
   entities:
   - uid: 16215
@@ -45951,10 +47456,10 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconSecurity
   entities:
-  - uid: 7211
+  - uid: 18001
     components:
     - type: Transform
-      pos: 66.5,-42.5
+      pos: 59.5,-33.5
       parent: 2
 - proto: DefaultStationBeaconSecurityCheckpoint
   entities:
@@ -45978,43 +47483,33 @@ entities:
       pos: -23.5,-71.5
       parent: 2
     - type: BombingTarget
-- proto: DefaultStationBeaconSolars
+- proto: DefaultStationBeaconSolarsE
   entities:
-  - uid: 16263
+  - uid: 8642
     components:
     - type: Transform
-      pos: 99.5,-45.5
+      pos: 101.5,-45.5
       parent: 2
-    - type: NavMapBeacon
-      text: Eastern Solars
-  - uid: 16264
+- proto: DefaultStationBeaconSolarsNW
+  entities:
+  - uid: 8763
     components:
     - type: Transform
       pos: -64.5,-21.5
       parent: 2
-    - type: NavMapBeacon
-      text: Northwestern Solars
-  - uid: 16265
+- proto: DefaultStationBeaconSolarsSW
+  entities:
+  - uid: 10671
     components:
     - type: Transform
       pos: -64.5,-69.5
       parent: 2
-    - type: NavMapBeacon
-      text: Southwestern Solars
-- proto: DefaultStationBeaconTechVault
-  entities:
-  - uid: 16228
-    components:
-    - type: Transform
-      pos: 28.5,-62.5
-      parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconTEG
   entities:
-  - uid: 4463
+  - uid: 3076
     components:
     - type: Transform
-      pos: 40.5,-70.5
+      pos: 46.5,-69.5
       parent: 2
 - proto: DefaultStationBeaconTelecoms
   entities:
@@ -46024,56 +47519,56 @@ entities:
       pos: 34.5,-94.5
       parent: 2
     - type: NavMapBeacon
-      text: Cargo Telecoms
+      defaultText: Cargo Telecoms
   - uid: 2987
     components:
     - type: Transform
       pos: 6.5,-24.5
       parent: 2
     - type: NavMapBeacon
-      text: Medical Telecoms
-  - uid: 6093
-    components:
-    - type: Transform
-      pos: 68.5,-38.5
-      parent: 2
-    - type: NavMapBeacon
-      text: Security Telecoms
+      defaultText: Medical Telecoms
   - uid: 7294
     components:
     - type: Transform
       pos: -25.5,-21.5
       parent: 2
     - type: NavMapBeacon
-      text: Science Telecoms
+      defaultText: Science Telecoms
   - uid: 7917
     components:
     - type: Transform
       pos: -31.5,-64.5
       parent: 2
     - type: NavMapBeacon
-      text: Engineer Telecoms
-  - uid: 12841
+      defaultText: Engineer Telecoms
+  - uid: 8743
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      pos: 85.5,-47.5
       parent: 2
     - type: NavMapBeacon
-      text: Common Telecoms
+      defaultText: Common Telecoms
   - uid: 13820
     components:
     - type: Transform
       pos: 20.5,-61.5
       parent: 2
     - type: NavMapBeacon
-      text: Service Telecoms
+      defaultText: Service Telecoms
   - uid: 14253
     components:
     - type: Transform
       pos: -45.5,-37.5
       parent: 2
     - type: NavMapBeacon
-      text: Command Telecoms
+      defaultText: Command Telecoms
+  - uid: 18114
+    components:
+    - type: Transform
+      pos: 52.5,-28.5
+      parent: 2
+    - type: NavMapBeacon
+      defaultText: Security Telecoms
 - proto: DefaultStationBeaconTheater
   entities:
   - uid: 16236
@@ -46083,7 +47578,7 @@ entities:
       parent: 2
     - type: NavMapBeacon
       color: '#9FED58FF'
-      text: Clown & Mime Room
+      defaultText: Clown & Mime Room
   - uid: 16255
     components:
     - type: Transform
@@ -46091,7 +47586,7 @@ entities:
       parent: 2
     - type: NavMapBeacon
       color: '#9FED58FF'
-      text: Reporter
+      defaultText: Reporter
 - proto: DefaultStationBeaconToolRoom
   entities:
   - uid: 16217
@@ -46101,18 +47596,17 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconVault
   entities:
-  - uid: 16229
+  - uid: 18573
     components:
     - type: Transform
-      pos: 10.5,-41.5
+      pos: 10.5,-42.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconWardensOffice
   entities:
-  - uid: 13933
+  - uid: 18066
     components:
     - type: Transform
-      pos: 58.5,-44.5
+      pos: 57.5,-38.5
       parent: 2
 - proto: Defibrillator
   entities:
@@ -46126,13 +47620,15 @@ entities:
     - type: Transform
       pos: -52.604927,-39.291473
       parent: 2
-- proto: DefibrillatorCabinetFilled
+- proto: DefibrillatorCabinet
   entities:
-  - uid: 582
+  - uid: 2218
     components:
     - type: Transform
-      pos: 60.5,-30.5
+      pos: 51.5,-30.5
       parent: 2
+- proto: DefibrillatorCabinetFilled
+  entities:
   - uid: 5238
     components:
     - type: Transform
@@ -46154,11 +47650,11 @@ entities:
     - type: Transform
       pos: 13.5,-68.5
       parent: 2
-  - uid: 15334
+  - uid: 17131
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
       parent: 2
   - uid: 17273
     components:
@@ -46170,11 +47666,6 @@ entities:
     - type: Transform
       pos: 5.5,-18.5
       parent: 2
-  - uid: 17295
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 2
   - uid: 18378
     components:
     - type: Transform
@@ -46233,13 +47724,19 @@ entities:
       parent: 2
 - proto: DiseaseDiagnoser
   entities:
-  - uid: 908
+  - uid: 9610
     components:
     - type: Transform
-      pos: 28.5,-15.5
+      pos: 35.5,-11.5
       parent: 2
 - proto: DisposalBend
   entities:
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-20.5
+      parent: 2
   - uid: 1189
     components:
     - type: Transform
@@ -46269,6 +47766,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-59.5
       parent: 2
+  - uid: 1815
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-64.5
+      parent: 2
   - uid: 2104
     components:
     - type: Transform
@@ -46281,11 +47784,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-56.5
       parent: 2
-  - uid: 2302
+  - uid: 3317
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-27.5
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-64.5
+      parent: 2
+  - uid: 3352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-61.5
       parent: 2
   - uid: 3385
     components:
@@ -46293,30 +47802,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,-57.5
       parent: 2
-  - uid: 3602
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-47.5
-      parent: 2
   - uid: 3603
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 64.5,-29.5
       parent: 2
-  - uid: 4266
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-46.5
-      parent: 2
-  - uid: 4272
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-51.5
-      parent: 2
   - uid: 4288
     components:
     - type: Transform
@@ -46328,35 +47819,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-70.5
       parent: 2
-  - uid: 5193
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-70.5
-      parent: 2
-  - uid: 5426
+  - uid: 6359
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -10.5,-20.5
-      parent: 2
-  - uid: 5730
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-67.5
-      parent: 2
-  - uid: 5734
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-66.5
-      parent: 2
-  - uid: 5736
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-67.5
+      pos: 40.5,-44.5
       parent: 2
   - uid: 6408
     components:
@@ -46373,27 +47840,21 @@ entities:
     - type: Transform
       pos: 15.5,-64.5
       parent: 2
-  - uid: 7258
+  - uid: 7232
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-70.5
+      pos: 22.5,-25.5
       parent: 2
-  - uid: 7306
+  - uid: 7565
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-76.5
+      pos: 35.5,-29.5
       parent: 2
-  - uid: 7707
+  - uid: 7890
     components:
     - type: Transform
-      pos: 22.5,-27.5
-      parent: 2
-  - uid: 7759
-    components:
-    - type: Transform
-      pos: 63.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: -16.5,-59.5
       parent: 2
   - uid: 7916
     components:
@@ -46411,17 +47872,89 @@ entities:
     - type: Transform
       pos: 9.5,-67.5
       parent: 2
-  - uid: 7942
+  - uid: 7996
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 48.5,-53.5
+      pos: -15.5,-61.5
       parent: 2
-  - uid: 8576
+  - uid: 8411
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-42.5
+      parent: 2
+  - uid: 8516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-76.5
+      parent: 2
+  - uid: 8517
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-43.5
+      pos: 56.5,-75.5
+      parent: 2
+  - uid: 8518
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-75.5
+      parent: 2
+  - uid: 8519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-74.5
+      parent: 2
+  - uid: 8520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-74.5
+      parent: 2
+  - uid: 8521
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-73.5
+      parent: 2
+  - uid: 8522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-73.5
+      parent: 2
+  - uid: 8523
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-72.5
+      parent: 2
+  - uid: 8527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-72.5
+      parent: 2
+  - uid: 8528
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-71.5
+      parent: 2
+  - uid: 8529
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-71.5
+      parent: 2
+  - uid: 8593
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-58.5
       parent: 2
   - uid: 8720
     components:
@@ -46464,35 +47997,51 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,-65.5
       parent: 2
-  - uid: 8865
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-30.5
-      parent: 2
   - uid: 8927
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-40.5
       parent: 2
-  - uid: 8960
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-51.5
-      parent: 2
-  - uid: 9337
+  - uid: 8975
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 63.5,-49.5
+      pos: 54.5,-42.5
       parent: 2
-  - uid: 10324
+  - uid: 9204
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 43.5,-54.5
+      pos: 64.5,-32.5
+      parent: 2
+  - uid: 9540
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-39.5
+      parent: 2
+  - uid: 9675
+    components:
+    - type: Transform
+      pos: 62.5,-38.5
+      parent: 2
+  - uid: 10333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-24.5
+      parent: 2
+  - uid: 10339
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 2
+  - uid: 10393
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-24.5
       parent: 2
   - uid: 10517
     components:
@@ -46500,11 +48049,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-64.5
       parent: 2
-  - uid: 12579
+  - uid: 11937
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-29.5
+      parent: 2
+  - uid: 13637
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 43.5,-53.5
+      pos: 37.5,-76.5
       parent: 2
   - uid: 14239
     components:
@@ -46512,16 +48067,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 27.5,-57.5
       parent: 2
-  - uid: 14287
-    components:
-    - type: Transform
-      pos: 66.5,-43.5
-      parent: 2
-  - uid: 14700
-    components:
-    - type: Transform
-      pos: 25.5,-30.5
-      parent: 2
   - uid: 14850
     components:
     - type: Transform
@@ -46578,23 +48123,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-37.5
       parent: 2
-  - uid: 14927
-    components:
-    - type: Transform
-      pos: 1.5,-52.5
-      parent: 2
-  - uid: 14928
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-53.5
-      parent: 2
   - uid: 14966
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 39.5,-53.5
       parent: 2
+  - uid: 15383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-78.5
+      parent: 2
   - uid: 15510
     components:
     - type: Transform
@@ -46619,18 +48159,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-78.5
       parent: 2
-  - uid: 15545
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-78.5
-      parent: 2
-  - uid: 15546
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-76.5
-      parent: 2
   - uid: 15552
     components:
     - type: Transform
@@ -46740,12 +48268,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-57.5
       parent: 2
-  - uid: 15787
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.5,-61.5
-      parent: 2
   - uid: 15831
     components:
     - type: Transform
@@ -46780,11 +48302,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-11.5
       parent: 2
-  - uid: 15849
-    components:
-    - type: Transform
-      pos: 23.5,-13.5
-      parent: 2
   - uid: 15867
     components:
     - type: Transform
@@ -46903,6 +48420,84 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-56.5
       parent: 2
+  - uid: 16483
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-53.5
+      parent: 2
+  - uid: 16497
+    components:
+    - type: Transform
+      pos: 56.5,-53.5
+      parent: 2
+  - uid: 16506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-54.5
+      parent: 2
+  - uid: 16509
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-57.5
+      parent: 2
+  - uid: 16510
+    components:
+    - type: Transform
+      pos: 71.5,-57.5
+      parent: 2
+  - uid: 16571
+    components:
+    - type: Transform
+      pos: 70.5,-56.5
+      parent: 2
+  - uid: 16572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-56.5
+      parent: 2
+  - uid: 16573
+    components:
+    - type: Transform
+      pos: 59.5,-55.5
+      parent: 2
+  - uid: 16574
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-55.5
+      parent: 2
+  - uid: 16575
+    components:
+    - type: Transform
+      pos: 58.5,-54.5
+      parent: 2
+  - uid: 16586
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-32.5
+      parent: 2
+  - uid: 16640
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-44.5
+      parent: 2
+  - uid: 16641
+    components:
+    - type: Transform
+      pos: 65.5,-36.5
+      parent: 2
+  - uid: 16643
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-44.5
+      parent: 2
   - uid: 16937
     components:
     - type: Transform
@@ -46920,17 +48515,24 @@ entities:
     - type: Transform
       pos: 8.5,-61.5
       parent: 2
-  - uid: 18372
-    components:
-    - type: Transform
-      pos: 21.5,-25.5
-      parent: 2
   - uid: 19369
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-49.5
       parent: 2
+  - uid: 19471
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-77.5
+      parent: 2
+  - uid: 19744
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-53.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 4039
@@ -46950,17 +48552,27 @@ entities:
     - type: Transform
       pos: -7.5,-29.5
       parent: 2
-  - uid: 8806
+  - uid: 7894
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-46.5
+      pos: 26.5,-77.5
       parent: 2
-  - uid: 10673
+  - uid: 7969
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-56.5
+      parent: 2
+  - uid: 8978
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 64.5,-43.5
+      pos: 62.5,-32.5
+      parent: 2
+  - uid: 9871
+    components:
+    - type: Transform
+      pos: 7.5,-60.5
       parent: 2
   - uid: 15507
     components:
@@ -46986,12 +48598,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-52.5
       parent: 2
-  - uid: 15779
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-56.5
-      parent: 2
   - uid: 15898
     components:
     - type: Transform
@@ -47015,10 +48621,27 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-67.5
       parent: 2
-  - uid: 10661
+  - uid: 8594
     components:
     - type: Transform
-      pos: 64.5,-31.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-64.5
+      parent: 2
+  - uid: 8596
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-58.5
+      parent: 2
+  - uid: 9669
+    components:
+    - type: Transform
+      pos: 61.5,-39.5
+      parent: 2
+  - uid: 9798
+    components:
+    - type: Transform
+      pos: 7.5,-59.5
       parent: 2
   - uid: 15537
     components:
@@ -47032,11 +48655,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-79.5
       parent: 2
-  - uid: 15632
-    components:
-    - type: Transform
-      pos: 7.5,-59.5
-      parent: 2
   - uid: 15645
     components:
     - type: Transform
@@ -47047,12 +48665,6 @@ entities:
     - type: Transform
       pos: 25.5,-32.5
       parent: 2
-  - uid: 15694
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-23.5
-      parent: 2
   - uid: 15703
     components:
     - type: Transform
@@ -47077,19 +48689,43 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-48.5
       parent: 2
-- proto: DisposalPipe
-  entities:
-  - uid: 285
+  - uid: 16582
     components:
     - type: Transform
-      pos: 21.5,-26.5
+      pos: 61.5,-36.5
       parent: 2
+- proto: DisposalPipe
+  entities:
   - uid: 339
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,-58.5
       parent: 2
+  - uid: 378
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-20.5
+      parent: 2
+  - uid: 379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-20.5
+      parent: 2
+  - uid: 528
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-20.5
+      parent: 2
+  - uid: 533
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-20.5
+      parent: 2
   - uid: 1462
     components:
     - type: Transform
@@ -47119,39 +48755,32 @@ entities:
     - type: Transform
       pos: 20.5,-71.5
       parent: 2
+  - uid: 2960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-76.5
+      parent: 2
+  - uid: 3058
+    components:
+    - type: Transform
+      pos: 37.5,-77.5
+      parent: 2
+  - uid: 3329
+    components:
+    - type: Transform
+      pos: 73.5,-63.5
+      parent: 2
   - uid: 3350
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-73.5
+      pos: 73.5,-62.5
       parent: 2
   - uid: 3351
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 57.5,-70.5
-      parent: 2
-  - uid: 3352
-    components:
-    - type: Transform
-      pos: 58.5,-68.5
-      parent: 2
-  - uid: 3353
-    components:
-    - type: Transform
-      pos: 58.5,-69.5
-      parent: 2
-  - uid: 3354
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-74.5
-      parent: 2
-  - uid: 3355
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-75.5
+      pos: 72.5,-64.5
       parent: 2
   - uid: 3383
     components:
@@ -47159,29 +48788,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-69.5
       parent: 2
-  - uid: 3455
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-48.5
-      parent: 2
-  - uid: 3456
-    components:
-    - type: Transform
-      pos: 64.5,-32.5
-      parent: 2
-  - uid: 3461
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-49.5
-      parent: 2
-  - uid: 3462
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-50.5
-      parent: 2
   - uid: 3776
     components:
     - type: Transform
@@ -47194,17 +48800,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-65.5
       parent: 2
-  - uid: 3961
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-48.5
-      parent: 2
-  - uid: 4165
-    components:
-    - type: Transform
-      pos: 64.5,-40.5
-      parent: 2
   - uid: 4351
     components:
     - type: Transform
@@ -47223,27 +48818,21 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-20.5
       parent: 2
-  - uid: 5101
+  - uid: 5381
     components:
     - type: Transform
-      pos: -10.5,-19.5
+      pos: 22.5,-27.5
       parent: 2
-  - uid: 5373
+  - uid: 5430
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-71.5
+      pos: 22.5,-26.5
       parent: 2
-  - uid: 5374
+  - uid: 5445
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-72.5
-      parent: 2
-  - uid: 5460
-    components:
-    - type: Transform
-      pos: -10.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-25.5
       parent: 2
   - uid: 5732
     components:
@@ -47255,53 +48844,28 @@ entities:
     - type: Transform
       pos: -7.5,-28.5
       parent: 2
-  - uid: 6065
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-47.5
-      parent: 2
   - uid: 6084
     components:
     - type: Transform
       pos: 64.5,-30.5
       parent: 2
-  - uid: 6087
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-49.5
-      parent: 2
-  - uid: 6088
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-47.5
-      parent: 2
-  - uid: 6089
-    components:
-    - type: Transform
-      pos: 64.5,-33.5
-      parent: 2
-  - uid: 6090
-    components:
-    - type: Transform
-      pos: 64.5,-34.5
-      parent: 2
   - uid: 6351
     components:
     - type: Transform
-      pos: 40.5,-45.5
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-44.5
       parent: 2
-  - uid: 6409
+  - uid: 6355
     components:
     - type: Transform
-      pos: 40.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-44.5
       parent: 2
   - uid: 6414
     components:
     - type: Transform
-      pos: 40.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-44.5
       parent: 2
   - uid: 6426
     components:
@@ -47355,50 +48919,82 @@ entities:
     - type: Transform
       pos: 40.5,-42.5
       parent: 2
+  - uid: 7028
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-53.5
+      parent: 2
+  - uid: 7049
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-29.5
+      parent: 2
+  - uid: 7050
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-29.5
+      parent: 2
+  - uid: 7053
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-29.5
+      parent: 2
+  - uid: 7054
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-29.5
+      parent: 2
   - uid: 7106
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-64.5
       parent: 2
-  - uid: 7110
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-43.5
-      parent: 2
-  - uid: 7111
-    components:
-    - type: Transform
-      pos: 66.5,-46.5
-      parent: 2
   - uid: 7145
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 45.5,-76.5
       parent: 2
-  - uid: 7224
+  - uid: 7292
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-28.5
+      parent: 2
+  - uid: 7338
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 52.5,-51.5
+      pos: 29.5,-29.5
       parent: 2
-  - uid: 7235
-    components:
-    - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 7236
+  - uid: 7372
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 55.5,-51.5
+      pos: 30.5,-29.5
       parent: 2
-  - uid: 7311
+  - uid: 7914
     components:
     - type: Transform
-      pos: 64.5,-39.5
+      pos: -15.5,-60.5
+      parent: 2
+  - uid: 7928
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-56.5
+      parent: 2
+  - uid: 7942
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-42.5
       parent: 2
   - uid: 7968
     components:
@@ -47406,6 +49002,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-72.5
       parent: 2
+  - uid: 7993
+    components:
+    - type: Transform
+      pos: 55.5,-44.5
+      parent: 2
   - uid: 8060
     components:
     - type: Transform
@@ -47442,40 +49043,135 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-69.5
       parent: 2
-  - uid: 8231
-    components:
-    - type: Transform
-      pos: 24.5,-27.5
-      parent: 2
   - uid: 8376
     components:
     - type: Transform
       pos: 22.5,-28.5
       parent: 2
-  - uid: 8377
+  - uid: 8435
     components:
     - type: Transform
-      pos: 24.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 61.5,-41.5
       parent: 2
-  - uid: 8378
+  - uid: 8530
     components:
     - type: Transform
-      pos: 24.5,-24.5
+      rot: 3.141592653589793 rad
+      pos: 70.5,-65.5
       parent: 2
-  - uid: 8607
+  - uid: 8531
     components:
     - type: Transform
-      pos: 24.5,-26.5
+      rot: 3.141592653589793 rad
+      pos: 70.5,-66.5
       parent: 2
-  - uid: 8610
+  - uid: 8532
     components:
     - type: Transform
-      pos: 24.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 70.5,-67.5
       parent: 2
-  - uid: 8617
+  - uid: 8533
     components:
     - type: Transform
-      pos: 24.5,-29.5
+      rot: 3.141592653589793 rad
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 8534
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-69.5
+      parent: 2
+  - uid: 8535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-70.5
+      parent: 2
+  - uid: 8536
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-71.5
+      parent: 2
+  - uid: 8537
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-71.5
+      parent: 2
+  - uid: 8538
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-72.5
+      parent: 2
+  - uid: 8539
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-73.5
+      parent: 2
+  - uid: 8540
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-74.5
+      parent: 2
+  - uid: 8541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-75.5
+      parent: 2
+  - uid: 8542
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-75.5
+      parent: 2
+  - uid: 8543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-75.5
+      parent: 2
+  - uid: 8544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-75.5
+      parent: 2
+  - uid: 8553
+    components:
+    - type: Transform
+      pos: 25.5,-28.5
+      parent: 2
+  - uid: 8561
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-54.5
+      parent: 2
+  - uid: 8581
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-61.5
+      parent: 2
+  - uid: 8597
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-42.5
+      parent: 2
+  - uid: 8598
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-42.5
       parent: 2
   - uid: 8619
     components:
@@ -47497,6 +49193,12 @@ entities:
     - type: Transform
       pos: -2.5,-37.5
       parent: 2
+  - uid: 8688
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-42.5
+      parent: 2
   - uid: 8696
     components:
     - type: Transform
@@ -47514,6 +49216,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-41.5
       parent: 2
+  - uid: 8749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-42.5
+      parent: 2
+  - uid: 8795
+    components:
+    - type: Transform
+      pos: 55.5,-46.5
+      parent: 2
   - uid: 8796
     components:
     - type: Transform
@@ -47604,42 +49317,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-39.5
       parent: 2
-  - uid: 8975
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-53.5
-      parent: 2
-  - uid: 8977
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-53.5
-      parent: 2
-  - uid: 8978
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-53.5
-      parent: 2
-  - uid: 8979
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-53.5
-      parent: 2
-  - uid: 8994
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-23.5
-      parent: 2
   - uid: 9037
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -37.5,-65.5
       parent: 2
+  - uid: 9252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-31.5
+      parent: 2
   - uid: 9260
     components:
     - type: Transform
@@ -47694,53 +49383,147 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 50.5,-76.5
       parent: 2
-  - uid: 9288
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-44.5
-      parent: 2
-  - uid: 9289
+  - uid: 9334
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 63.5,-43.5
-      parent: 2
-  - uid: 9290
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
-      parent: 2
-  - uid: 9291
-    components:
-    - type: Transform
-      pos: 66.5,-45.5
-      parent: 2
-  - uid: 9292
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
+      pos: 63.5,-32.5
       parent: 2
   - uid: 9429
     components:
     - type: Transform
       pos: -2.5,-33.5
       parent: 2
+  - uid: 9676
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-40.5
+      parent: 2
+  - uid: 9678
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+  - uid: 9697
+    components:
+    - type: Transform
+      pos: 55.5,-45.5
+      parent: 2
+  - uid: 9722
+    components:
+    - type: Transform
+      pos: 55.5,-47.5
+      parent: 2
+  - uid: 9882
+    components:
+    - type: Transform
+      pos: 25.5,-27.5
+      parent: 2
+  - uid: 9883
+    components:
+    - type: Transform
+      pos: 30.5,-21.5
+      parent: 2
+  - uid: 9884
+    components:
+    - type: Transform
+      pos: 25.5,-26.5
+      parent: 2
   - uid: 9906
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-43.5
       parent: 2
-  - uid: 10327
+  - uid: 10280
     components:
     - type: Transform
-      pos: 64.5,-38.5
+      pos: 25.5,-25.5
       parent: 2
-  - uid: 10761
+  - uid: 10284
     components:
     - type: Transform
-      pos: 64.5,-41.5
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-24.5
+      parent: 2
+  - uid: 10295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-24.5
+      parent: 2
+  - uid: 10296
+    components:
+    - type: Transform
+      pos: 25.5,-29.5
+      parent: 2
+  - uid: 10297
+    components:
+    - type: Transform
+      pos: 25.5,-30.5
+      parent: 2
+  - uid: 10319
+    components:
+    - type: Transform
+      pos: 55.5,-51.5
+      parent: 2
+  - uid: 10330
+    components:
+    - type: Transform
+      pos: 55.5,-52.5
+      parent: 2
+  - uid: 10331
+    components:
+    - type: Transform
+      pos: 30.5,-22.5
+      parent: 2
+  - uid: 10396
+    components:
+    - type: Transform
+      pos: 30.5,-18.5
+      parent: 2
+  - uid: 10398
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 2
+  - uid: 10409
+    components:
+    - type: Transform
+      pos: 30.5,-20.5
+      parent: 2
+  - uid: 10410
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-24.5
+      parent: 2
+  - uid: 10435
+    components:
+    - type: Transform
+      pos: 55.5,-50.5
+      parent: 2
+  - uid: 10498
+    components:
+    - type: Transform
+      pos: 30.5,-23.5
+      parent: 2
+  - uid: 10511
+    components:
+    - type: Transform
+      pos: 55.5,-49.5
+      parent: 2
+  - uid: 10515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-24.5
+      parent: 2
+  - uid: 10561
+    components:
+    - type: Transform
+      pos: 55.5,-48.5
       parent: 2
   - uid: 11088
     components:
@@ -47748,81 +49531,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-68.5
       parent: 2
-  - uid: 11667
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-46.5
-      parent: 2
-  - uid: 11703
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-51.5
-      parent: 2
-  - uid: 11704
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-51.5
-      parent: 2
-  - uid: 11705
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-51.5
-      parent: 2
   - uid: 13153
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-44.5
       parent: 2
-  - uid: 13452
-    components:
-    - type: Transform
-      pos: -10.5,-17.5
-      parent: 2
-  - uid: 13821
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 50.5,-51.5
-      parent: 2
-  - uid: 13935
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-51.5
-      parent: 2
-  - uid: 13936
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-51.5
-      parent: 2
-  - uid: 13937
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-51.5
-      parent: 2
-  - uid: 13940
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-45.5
-      parent: 2
-  - uid: 14344
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
-  - uid: 14357
-    components:
-    - type: Transform
-      pos: 64.5,-35.5
-      parent: 2
   - uid: 14451
     components:
     - type: Transform
@@ -48524,12 +50238,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,-76.5
       parent: 2
-  - uid: 15526
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 38.5,-77.5
-      parent: 2
   - uid: 15527
     components:
     - type: Transform
@@ -48542,12 +50250,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,-78.5
       parent: 2
-  - uid: 15529
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-78.5
-      parent: 2
   - uid: 15530
     components:
     - type: Transform
@@ -48602,12 +50304,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,-78.5
       parent: 2
-  - uid: 15542
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 26.5,-77.5
-      parent: 2
   - uid: 15549
     components:
     - type: Transform
@@ -48899,16 +50595,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-59.5
       parent: 2
-  - uid: 15633
-    components:
-    - type: Transform
-      pos: 7.5,-60.5
-      parent: 2
-  - uid: 15640
-    components:
-    - type: Transform
-      pos: 7.5,-58.5
-      parent: 2
   - uid: 15641
     components:
     - type: Transform
@@ -49100,36 +50786,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,-23.5
       parent: 2
-  - uid: 15696
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-23.5
-      parent: 2
-  - uid: 15697
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-23.5
-      parent: 2
-  - uid: 15698
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-23.5
-      parent: 2
-  - uid: 15699
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-23.5
-      parent: 2
-  - uid: 15700
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-23.5
-      parent: 2
   - uid: 15704
     components:
     - type: Transform
@@ -49398,12 +51054,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-56.5
       parent: 2
-  - uid: 15778
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-56.5
-      parent: 2
   - uid: 15780
     components:
     - type: Transform
@@ -49422,30 +51072,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-57.5
       parent: 2
-  - uid: 15788
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-60.5
-      parent: 2
-  - uid: 15789
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-59.5
-      parent: 2
-  - uid: 15790
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-58.5
-      parent: 2
-  - uid: 15791
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-57.5
-      parent: 2
   - uid: 15792
     components:
     - type: Transform
@@ -49630,51 +51256,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,-13.5
       parent: 2
-  - uid: 15850
-    components:
-    - type: Transform
-      pos: 23.5,-22.5
-      parent: 2
-  - uid: 15851
-    components:
-    - type: Transform
-      pos: 23.5,-21.5
-      parent: 2
-  - uid: 15852
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 2
-  - uid: 15853
-    components:
-    - type: Transform
-      pos: 23.5,-19.5
-      parent: 2
-  - uid: 15854
-    components:
-    - type: Transform
-      pos: 23.5,-18.5
-      parent: 2
-  - uid: 15855
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 2
-  - uid: 15856
-    components:
-    - type: Transform
-      pos: 23.5,-16.5
-      parent: 2
-  - uid: 15857
-    components:
-    - type: Transform
-      pos: 23.5,-15.5
-      parent: 2
-  - uid: 15858
-    components:
-    - type: Transform
-      pos: 23.5,-14.5
-      parent: 2
   - uid: 15859
     components:
     - type: Transform
@@ -50324,12 +51905,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-58.5
       parent: 2
-  - uid: 16019
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-58.5
-      parent: 2
   - uid: 16020
     components:
     - type: Transform
@@ -50346,84 +51921,6 @@ entities:
     - type: Transform
       pos: 29.5,-53.5
       parent: 2
-  - uid: 16028
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-54.5
-      parent: 2
-  - uid: 16029
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-54.5
-      parent: 2
-  - uid: 16030
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-54.5
-      parent: 2
-  - uid: 16031
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 33.5,-54.5
-      parent: 2
-  - uid: 16032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,-54.5
-      parent: 2
-  - uid: 16033
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 35.5,-54.5
-      parent: 2
-  - uid: 16034
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-54.5
-      parent: 2
-  - uid: 16035
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,-54.5
-      parent: 2
-  - uid: 16036
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-54.5
-      parent: 2
-  - uid: 16037
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-54.5
-      parent: 2
-  - uid: 16038
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-54.5
-      parent: 2
-  - uid: 16039
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-54.5
-      parent: 2
-  - uid: 16040
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-54.5
-      parent: 2
   - uid: 16057
     components:
     - type: Transform
@@ -50610,27 +52107,197 @@ entities:
     - type: Transform
       pos: -47.5,-36.5
       parent: 2
-  - uid: 16521
+  - uid: 16523
     components:
     - type: Transform
-      pos: -10.5,-16.5
+      pos: 71.5,-63.5
+      parent: 2
+  - uid: 16528
+    components:
+    - type: Transform
+      pos: 71.5,-62.5
+      parent: 2
+  - uid: 16529
+    components:
+    - type: Transform
+      pos: 71.5,-61.5
+      parent: 2
+  - uid: 16537
+    components:
+    - type: Transform
+      pos: 71.5,-60.5
+      parent: 2
+  - uid: 16538
+    components:
+    - type: Transform
+      pos: 71.5,-59.5
+      parent: 2
+  - uid: 16539
+    components:
+    - type: Transform
+      pos: 71.5,-58.5
+      parent: 2
+  - uid: 16541
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-56.5
+      parent: 2
+  - uid: 16542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-56.5
+      parent: 2
+  - uid: 16551
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-56.5
+      parent: 2
+  - uid: 16552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-56.5
+      parent: 2
+  - uid: 16563
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-56.5
+      parent: 2
+  - uid: 16565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-56.5
+      parent: 2
+  - uid: 16566
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-56.5
+      parent: 2
+  - uid: 16567
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-56.5
+      parent: 2
+  - uid: 16568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-56.5
+      parent: 2
+  - uid: 16570
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-56.5
+      parent: 2
+  - uid: 16577
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-54.5
+      parent: 2
+  - uid: 16578
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-37.5
+      parent: 2
+  - uid: 16583
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-35.5
+      parent: 2
+  - uid: 16584
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-34.5
+      parent: 2
+  - uid: 16585
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-33.5
+      parent: 2
+  - uid: 16803
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-36.5
+      parent: 2
+  - uid: 16808
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-36.5
+      parent: 2
+  - uid: 16809
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-36.5
+      parent: 2
+  - uid: 16861
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-37.5
+      parent: 2
+  - uid: 16862
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-38.5
       parent: 2
   - uid: 16863
     components:
     - type: Transform
-      pos: 48.5,-52.5
+      rot: 3.141592653589793 rad
+      pos: 65.5,-39.5
       parent: 2
   - uid: 16864
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-51.5
+      rot: 3.141592653589793 rad
+      pos: 65.5,-40.5
+      parent: 2
+  - uid: 16865
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-41.5
+      parent: 2
+  - uid: 16866
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-42.5
       parent: 2
   - uid: 16867
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-43.5
+      parent: 2
+  - uid: 16868
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 51.5,-51.5
+      pos: 67.5,-44.5
+      parent: 2
+  - uid: 16869
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-44.5
       parent: 2
   - uid: 16938
     components:
@@ -50679,27 +52346,146 @@ entities:
     - type: Transform
       pos: -2.5,-31.5
       parent: 2
-  - uid: 18341
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-25.5
-      parent: 2
-- proto: DisposalPipeBroken
-  entities:
-  - uid: 7201
+  - uid: 17213
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 60.5,-66.5
+      pos: -20.5,-49.5
       parent: 2
-  - uid: 14973
+  - uid: 17295
     components:
     - type: Transform
-      pos: 39.5,-47.5
+      pos: 25.5,-59.5
+      parent: 2
+  - uid: 19453
+    components:
+    - type: Transform
+      pos: 25.5,-60.5
+      parent: 2
+  - uid: 19455
+    components:
+    - type: Transform
+      pos: 25.5,-61.5
+      parent: 2
+  - uid: 19456
+    components:
+    - type: Transform
+      pos: 25.5,-62.5
+      parent: 2
+  - uid: 19457
+    components:
+    - type: Transform
+      pos: 25.5,-63.5
+      parent: 2
+  - uid: 19458
+    components:
+    - type: Transform
+      pos: 25.5,-64.5
+      parent: 2
+  - uid: 19459
+    components:
+    - type: Transform
+      pos: 25.5,-65.5
+      parent: 2
+  - uid: 19460
+    components:
+    - type: Transform
+      pos: 25.5,-66.5
+      parent: 2
+  - uid: 19461
+    components:
+    - type: Transform
+      pos: 25.5,-67.5
+      parent: 2
+  - uid: 19462
+    components:
+    - type: Transform
+      pos: 25.5,-68.5
+      parent: 2
+  - uid: 19463
+    components:
+    - type: Transform
+      pos: 25.5,-69.5
+      parent: 2
+  - uid: 19464
+    components:
+    - type: Transform
+      pos: 25.5,-70.5
+      parent: 2
+  - uid: 19465
+    components:
+    - type: Transform
+      pos: 25.5,-71.5
+      parent: 2
+  - uid: 19466
+    components:
+    - type: Transform
+      pos: 25.5,-72.5
+      parent: 2
+  - uid: 19467
+    components:
+    - type: Transform
+      pos: 25.5,-73.5
+      parent: 2
+  - uid: 19468
+    components:
+    - type: Transform
+      pos: 25.5,-74.5
+      parent: 2
+  - uid: 19469
+    components:
+    - type: Transform
+      pos: 25.5,-75.5
+      parent: 2
+  - uid: 19470
+    components:
+    - type: Transform
+      pos: 25.5,-76.5
+      parent: 2
+  - uid: 19473
+    components:
+    - type: Transform
+      pos: -15.5,-57.5
+      parent: 2
+  - uid: 19482
+    components:
+    - type: Transform
+      pos: 7.5,-58.5
+      parent: 2
+  - uid: 19540
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-25.5
+      parent: 2
+  - uid: 19541
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-26.5
+      parent: 2
+  - uid: 19545
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-27.5
+      parent: 2
+- proto: DisposalPipeBroken
+  entities:
+  - uid: 3337
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-61.5
       parent: 2
 - proto: DisposalTrunk
   entities:
+  - uid: 535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-21.5
+      parent: 2
   - uid: 1459
     components:
     - type: Transform
@@ -50735,10 +52521,10 @@ entities:
     - type: Transform
       pos: 31.5,-37.5
       parent: 2
-  - uid: 5100
+  - uid: 5302
     components:
     - type: Transform
-      pos: -10.5,-15.5
+      pos: 0.5,-52.5
       parent: 2
   - uid: 5801
     components:
@@ -50746,29 +52532,45 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,-29.5
       parent: 2
-  - uid: 6359
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 40.5,-47.5
-      parent: 2
   - uid: 6577
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,-65.5
       parent: 2
-  - uid: 7908
+  - uid: 7204
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-31.5
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-25.5
       parent: 2
-  - uid: 10337
+  - uid: 8960
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-49.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-60.5
+      parent: 2
+  - uid: 8979
+    components:
+    - type: Transform
+      pos: 62.5,-31.5
+      parent: 2
+  - uid: 9040
+    components:
+    - type: Transform
+      pos: 54.5,-41.5
+      parent: 2
+  - uid: 10290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-17.5
+      parent: 2
+  - uid: 11914
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,-30.5
       parent: 2
   - uid: 14678
     components:
@@ -50781,12 +52583,6 @@ entities:
     - type: Transform
       pos: 0.5,-57.5
       parent: 2
-  - uid: 14926
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-52.5
-      parent: 2
   - uid: 15393
     components:
     - type: Transform
@@ -50826,12 +52622,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-32.5
       parent: 2
-  - uid: 15670
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-23.5
-      parent: 2
   - uid: 15671
     components:
     - type: Transform
@@ -50894,6 +52684,11 @@ entities:
     - type: Transform
       pos: -47.5,-35.5
       parent: 2
+  - uid: 16644
+    components:
+    - type: Transform
+      pos: 68.5,-43.5
+      parent: 2
   - uid: 17024
     components:
     - type: Transform
@@ -50927,30 +52722,29 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,-70.5
       parent: 2
-  - uid: 18105
+  - uid: 17987
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-47.5
+      pos: 39.5,-47.5
       parent: 2
-  - uid: 18280
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-25.5
-      parent: 2
-  - uid: 19368
+  - uid: 19367
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -20.5,-49.5
+      pos: -19.5,-49.5
+      parent: 2
+  - uid: 19749
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-44.5
       parent: 2
 - proto: DisposalUnit
   entities:
-  - uid: 1856
+  - uid: 375
     components:
     - type: Transform
-      pos: -10.5,-15.5
+      pos: -14.5,-21.5
       parent: 2
   - uid: 1883
     components:
@@ -50962,11 +52756,6 @@ entities:
     - type: Transform
       pos: 2.5,-70.5
       parent: 2
-  - uid: 2320
-    components:
-    - type: Transform
-      pos: 35.5,-29.5
-      parent: 2
   - uid: 2465
     components:
     - type: Transform
@@ -50982,6 +52771,21 @@ entities:
     - type: Transform
       pos: -38.5,-66.5
       parent: 2
+  - uid: 4189
+    components:
+    - type: Transform
+      pos: 64.5,-52.5
+      parent: 2
+  - uid: 4426
+    components:
+    - type: Transform
+      pos: 36.5,-15.5
+      parent: 2
+  - uid: 4625
+    components:
+    - type: Transform
+      pos: 29.5,-17.5
+      parent: 2
   - uid: 5007
     components:
     - type: Transform
@@ -51042,26 +52846,11 @@ entities:
     - type: Transform
       pos: 7.5,-7.5
       parent: 2
-  - uid: 6266
-    components:
-    - type: Transform
-      pos: 6.5,-58.5
-      parent: 2
   - uid: 6269
     components:
     - type: Transform
       pos: 0.5,-57.5
       parent: 2
-  - uid: 6274
-    components:
-    - type: Transform
-      pos: 19.5,-25.5
-      parent: 2
-  - uid: 7461
-    components:
-    - type: Transform
-      pos: -20.5,-49.5
-      parent: 2
   - uid: 7755
     components:
     - type: Transform
@@ -51077,66 +52866,76 @@ entities:
     - type: Transform
       pos: -5.5,-53.5
       parent: 2
-  - uid: 7799
-    components:
-    - type: Transform
-      pos: 31.5,-23.5
-      parent: 2
   - uid: 7876
     components:
     - type: Transform
       pos: 65.5,-29.5
       parent: 2
+  - uid: 7913
+    components:
+    - type: Transform
+      pos: 68.5,-43.5
+      parent: 2
   - uid: 8040
     components:
     - type: Transform
       pos: 26.5,-32.5
       parent: 2
+  - uid: 9336
+    components:
+    - type: Transform
+      pos: 20.5,-25.5
+      parent: 2
   - uid: 10155
     components:
     - type: Transform
       pos: -31.5,-15.5
       parent: 2
-  - uid: 10562
+  - uid: 10242
     components:
     - type: Transform
-      pos: 65.5,-49.5
+      pos: 62.5,-31.5
+      parent: 2
+  - uid: 10754
+    components:
+    - type: Transform
+      pos: 6.5,-60.5
+      parent: 2
+  - uid: 10801
+    components:
+    - type: Transform
+      pos: 54.5,-41.5
       parent: 2
   - uid: 11411
     components:
     - type: Transform
       pos: 15.5,-65.5
       parent: 2
-  - uid: 13828
+  - uid: 11913
     components:
     - type: Transform
-      pos: 65.5,-47.5
+      pos: 35.5,-30.5
       parent: 2
   - uid: 13996
     components:
     - type: Transform
       pos: 17.5,-65.5
       parent: 2
-  - uid: 14249
-    components:
-    - type: Transform
-      pos: 65.5,-31.5
-      parent: 2
   - uid: 14395
     components:
     - type: Transform
       pos: -14.5,-28.5
       parent: 2
-  - uid: 14596
-    components:
-    - type: Transform
-      pos: 40.5,-47.5
-      parent: 2
   - uid: 15539
     components:
     - type: Transform
       pos: 26.5,-76.5
       parent: 2
+  - uid: 16205
+    components:
+    - type: Transform
+      pos: 39.5,-47.5
+      parent: 2
   - uid: 16389
     components:
     - type: Transform
@@ -51147,24 +52946,45 @@ entities:
     - type: Transform
       pos: 31.5,-37.5
       parent: 2
-- proto: DisposalYJunction
-  entities:
-  - uid: 340
+  - uid: 19593
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-54.5
+      pos: -19.5,-49.5
       parent: 2
+  - uid: 19750
+    components:
+    - type: Transform
+      pos: 44.5,-44.5
+      parent: 2
+- proto: DisposalYJunction
+  entities:
   - uid: 7156
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-35.5
       parent: 2
-  - uid: 8618
+  - uid: 8582
     components:
     - type: Transform
-      pos: 24.5,-23.5
+      pos: 25.5,-58.5
+      parent: 2
+  - uid: 8977
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 9416
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-38.5
+      parent: 2
+  - uid: 9794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-59.5
       parent: 2
   - uid: 15674
     components:
@@ -51180,16 +53000,21 @@ entities:
       parent: 2
 - proto: DogBed
   entities:
-  - uid: 3545
-    components:
-    - type: Transform
-      pos: 57.5,-44.5
-      parent: 2
   - uid: 6188
     components:
     - type: Transform
       pos: 15.5,-59.5
       parent: 2
+  - uid: 7130
+    components:
+    - type: Transform
+      pos: 54.5,-38.5
+      parent: 2
+  - uid: 7194
+    components:
+    - type: Transform
+      pos: 69.5,-53.5
+      parent: 2
   - uid: 11762
     components:
     - type: Transform
@@ -51200,11 +53025,6 @@ entities:
     - type: Transform
       pos: 19.5,-72.5
       parent: 2
-  - uid: 18292
-    components:
-    - type: Transform
-      pos: 69.5,-48.5
-      parent: 2
 - proto: DonkpocketBoxSpawner
   entities:
   - uid: 6806
@@ -51217,16 +53037,16 @@ entities:
     - type: Transform
       pos: 29.5,-101.5
       parent: 2
+  - uid: 14690
+    components:
+    - type: Transform
+      pos: 53.5,-98.5
+      parent: 2
   - uid: 16973
     components:
     - type: Transform
       pos: 22.5,-85.5
       parent: 2
-  - uid: 16974
-    components:
-    - type: Transform
-      pos: 52.5,-98.5
-      parent: 2
   - uid: 18533
     components:
     - type: Transform
@@ -51242,7 +53062,7 @@ entities:
   - uid: 907
     components:
     - type: Transform
-      pos: 28.5,-12.5
+      pos: 29.461311,-12.535852
       parent: 2
   - uid: 18776
     components:
@@ -51251,6 +53071,16 @@ entities:
       parent: 2
 - proto: DoubleEmergencyOxygenTankFilled
   entities:
+  - uid: 4161
+    components:
+    - type: Transform
+      pos: -56.581223,-28.355028
+      parent: 2
+  - uid: 4162
+    components:
+    - type: Transform
+      pos: 80.4613,-23.302551
+      parent: 2
   - uid: 7692
     components:
     - type: Transform
@@ -51277,11 +53107,6 @@ entities:
     - type: Transform
       pos: -46.5,-61.5
       parent: 2
-  - uid: 5878
-    components:
-    - type: Transform
-      pos: -42.5,-61.5
-      parent: 2
   - uid: 5879
     components:
     - type: Transform
@@ -51297,10 +53122,10 @@ entities:
     - type: Transform
       pos: -60.5,-61.5
       parent: 2
-  - uid: 14343
+  - uid: 19479
     components:
     - type: Transform
-      pos: 43.5,-16.5
+      pos: -42.5,-61.5
       parent: 2
 - proto: DresserHeadOfPersonnelFilled
   entities:
@@ -51311,10 +53136,10 @@ entities:
       parent: 2
 - proto: DresserHeadOfSecurityFilled
   entities:
-  - uid: 18028
+  - uid: 7179
     components:
     - type: Transform
-      pos: 71.5,-48.5
+      pos: 71.5,-53.5
       parent: 2
 - proto: DresserQuarterMasterFilled
   entities:
@@ -51332,10 +53157,27 @@ entities:
       parent: 2
 - proto: DresserWardenFilled
   entities:
-  - uid: 3546
+  - uid: 7114
     components:
     - type: Transform
-      pos: 57.5,-42.5
+      pos: 54.5,-39.5
+      parent: 2
+- proto: DrinkBeerCan
+  entities:
+  - uid: 19732
+    components:
+    - type: Transform
+      pos: 52.991863,-98.5449
+      parent: 2
+  - uid: 19733
+    components:
+    - type: Transform
+      pos: 53.472607,-99.264145
+      parent: 2
+  - uid: 19734
+    components:
+    - type: Transform
+      pos: 52.628857,-98.82634
       parent: 2
 - proto: DrinkBottleAlcoClear
   entities:
@@ -51368,7 +53210,25 @@ entities:
   - uid: 14280
     components:
     - type: Transform
-      pos: 21.681454,-19.427164
+      pos: 21.64727,-19.389515
+      parent: 2
+- proto: DrinkEnergyDrinkCan
+  entities:
+  - uid: 19665
+    components:
+    - type: Transform
+      pos: -46.49681,-46.443466
+      parent: 2
+  - uid: 19667
+    components:
+    - type: Transform
+      pos: -46.298893,-46.683216
+      parent: 2
+  - uid: 19668
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -46.486393,-46.93339
       parent: 2
 - proto: DrinkEnergyDrinkJug
   entities:
@@ -51382,7 +53242,7 @@ entities:
   - uid: 5481
     components:
     - type: Transform
-      pos: -38.302177,-55.24425
+      pos: -38.411427,-55.289524
       parent: 2
 - proto: DrinkFlaskBar
   entities:
@@ -51396,17 +53256,17 @@ entities:
   - uid: 3330
     components:
     - type: Transform
-      pos: 70.72181,-69.31151
+      pos: 57.398575,-63.22958
       parent: 2
   - uid: 3335
     components:
     - type: Transform
-      pos: 70.81903,-69.41807
+      pos: 57.57045,-63.30776
       parent: 2
   - uid: 3336
     components:
     - type: Transform
-      pos: 70.59218,-69.22349
+      pos: 57.701633,-63.41804
       parent: 2
   - uid: 5250
     components:
@@ -51442,10 +53302,15 @@ entities:
     - type: Transform
       pos: 12.745599,-98.425545
       parent: 2
-  - uid: 7196
+  - uid: 10271
     components:
     - type: Transform
-      pos: 70.59718,-51.425907
+      pos: 71.42389,-47.31942
+      parent: 2
+  - uid: 10275
+    components:
+    - type: Transform
+      pos: 71.58014,-47.41317
       parent: 2
   - uid: 15265
     components:
@@ -51459,11 +53324,6 @@ entities:
       parent: 14704
     - type: Physics
       canCollide: False
-  - uid: 15339
-    components:
-    - type: Transform
-      pos: 70.40968,-51.300816
-      parent: 2
   - uid: 17441
     components:
     - type: Transform
@@ -51493,12 +53353,26 @@ entities:
   - uid: 921
     components:
     - type: Transform
-      pos: 21.316872,-19.489708
+      pos: 21.412895,-19.78014
       parent: 2
   - uid: 14020
     components:
     - type: Transform
-      pos: 21.108538,-19.239534
+      pos: 21.287895,-19.452015
+      parent: 2
+- proto: DrinkMugBlack
+  entities:
+  - uid: 19662
+    components:
+    - type: Transform
+      pos: -48.28667,-46.57887
+      parent: 2
+- proto: DrinkMugBlue
+  entities:
+  - uid: 19663
+    components:
+    - type: Transform
+      pos: -48.168613,-44.37595
       parent: 2
 - proto: DrinkMugMetal
   entities:
@@ -51522,7 +53396,7 @@ entities:
   - uid: 3394
     components:
     - type: Transform
-      pos: 46.69793,-74.49175
+      pos: 46.66693,-75.508766
       parent: 2
 - proto: DrinkMugRainbow
   entities:
@@ -51531,6 +53405,11 @@ entities:
     - type: Transform
       pos: 32.460705,-83.503525
       parent: 2
+  - uid: 19664
+    components:
+    - type: Transform
+      pos: -47.64084,-45.744957
+      parent: 2
 - proto: DrinkMugRed
   entities:
   - uid: 17563
@@ -51571,10 +53450,15 @@ entities:
   - uid: 19296
     components:
     - type: Transform
-      pos: -5.7709203,-19.359259
+      pos: -3.766451,-19.48293
       parent: 2
 - proto: DrinkWaterBottleFull
   entities:
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 40.217396,-32.324863
+      parent: 2
   - uid: 5597
     components:
     - type: Transform
@@ -51595,10 +53479,15 @@ entities:
     - type: Transform
       pos: -22.248049,-44.28955
       parent: 2
+  - uid: 14928
+    components:
+    - type: Transform
+      pos: 40.35802,-32.52799
+      parent: 2
   - uid: 17710
     components:
     - type: Transform
-      pos: 1.7266251,-62.17161
+      pos: 1.6360426,-62.150143
       parent: 2
 - proto: DrinkWaterCup
   entities:
@@ -51636,16 +53525,10 @@ entities:
   - uid: 11954
     components:
     - type: Transform
-      pos: 67.697716,-46.025784
+      pos: 67.68143,-50.99232
       parent: 2
 - proto: EmergencyLight
   entities:
-  - uid: 1061
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-35.5
-      parent: 2
   - uid: 1230
     components:
     - type: Transform
@@ -51687,51 +53570,64 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,-24.5
       parent: 2
+  - uid: 5462
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-72.5
+      parent: 2
   - uid: 5843
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 21.5,-31.5
       parent: 2
-  - uid: 8196
+  - uid: 5875
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-68.5
+      parent: 2
+  - uid: 6343
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-35.5
+      pos: 53.5,-42.5
+      parent: 2
+  - uid: 9875
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-41.5
+      parent: 2
+  - uid: 10402
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-44.5
       parent: 2
   - uid: 10454
     components:
     - type: Transform
       pos: -0.5,-77.5
       parent: 2
+  - uid: 10749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-37.5
+      parent: 2
+  - uid: 10782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-38.5
+      parent: 2
   - uid: 11395
     components:
     - type: Transform
       pos: -6.5,-77.5
       parent: 2
-  - uid: 11412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-32.5
-      parent: 2
-  - uid: 11844
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,-72.5
-      parent: 2
-  - uid: 11845
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-58.5
-      parent: 2
-  - uid: 13851
-    components:
-    - type: Transform
-      pos: 71.5,-50.5
-      parent: 2
   - uid: 13969
     components:
     - type: Transform
@@ -51808,18 +53704,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-36.5
       parent: 2
-  - uid: 14362
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,-23.5
-      parent: 2
-  - uid: 14363
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-17.5
-      parent: 2
   - uid: 14369
     components:
     - type: Transform
@@ -51896,12 +53780,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-93.5
       parent: 2
-  - uid: 14383
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-68.5
-      parent: 2
   - uid: 14389
     components:
     - type: Transform
@@ -51925,35 +53803,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-21.5
       parent: 2
-  - uid: 14393
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-18.5
-      parent: 2
-  - uid: 14772
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-45.5
-      parent: 2
   - uid: 16419
     components:
     - type: Transform
       pos: 21.5,-48.5
       parent: 2
-  - uid: 17915
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 76.5,-44.5
-      parent: 2
-  - uid: 17924
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-48.5
-      parent: 2
   - uid: 18273
     components:
     - type: Transform
@@ -52027,12 +53881,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 48.5,-53.5
       parent: 2
-  - uid: 18289
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-24.5
-      parent: 2
   - uid: 18291
     components:
     - type: Transform
@@ -52073,18 +53921,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 44.5,-44.5
       parent: 2
-  - uid: 18365
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-58.5
-      parent: 2
-  - uid: 18632
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-48.5
-      parent: 2
   - uid: 18634
     components:
     - type: Transform
@@ -52096,6 +53932,82 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,-17.5
       parent: 2
+  - uid: 19186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-45.5
+      parent: 2
+  - uid: 19191
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-53.5
+      parent: 2
+  - uid: 19248
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-38.5
+      parent: 2
+  - uid: 19257
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-31.5
+      parent: 2
+  - uid: 19313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-31.5
+      parent: 2
+  - uid: 19314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-39.5
+      parent: 2
+  - uid: 19315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-44.5
+      parent: 2
+  - uid: 19317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-31.5
+      parent: 2
+  - uid: 19354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-29.5
+      parent: 2
+  - uid: 19952
+    components:
+    - type: Transform
+      pos: 95.5,-47.5
+      parent: 2
+  - uid: 19953
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 95.5,-43.5
+      parent: 2
+  - uid: 19954
+    components:
+    - type: Transform
+      pos: 87.5,-43.5
+      parent: 2
+  - uid: 19955
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-47.5
+      parent: 2
 - proto: EmergencyNitrogenTankFilled
   entities:
   - uid: 18755
@@ -52169,14 +54081,6 @@ entities:
       parent: 6930
     - type: Physics
       canCollide: False
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 16387
-    components:
-    - type: Transform
-      parent: 5607
-    - type: Physics
-      canCollide: False
 - proto: EncryptionKeyCommon
   entities:
   - uid: 6028
@@ -52209,14 +54113,6 @@ entities:
     - type: Transform
       pos: -14.5,-26.5
       parent: 2
-- proto: ExosuitFabricatorMachineCircuitboard
-  entities:
-  - uid: 17885
-    components:
-    - type: Transform
-      parent: 17884
-    - type: Physics
-      canCollide: False
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 5781
@@ -52237,11 +54133,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-4.5
       parent: 2
-  - uid: 18339
-    components:
-    - type: Transform
-      pos: 11.5,-70.5
-      parent: 2
   - uid: 18340
     components:
     - type: Transform
@@ -52258,6 +54149,12 @@ entities:
     - type: Transform
       pos: -27.5,-62.5
       parent: 2
+  - uid: 19650
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-69.5
+      parent: 2
 - proto: FaxMachineBase
   entities:
   - uid: 1889
@@ -52295,6 +54192,13 @@ entities:
       parent: 2
     - type: FaxMachine
       name: CE's Office
+  - uid: 6093
+    components:
+    - type: Transform
+      pos: 67.5,-50.5
+      parent: 2
+    - type: FaxMachine
+      name: HoS
   - uid: 6966
     components:
     - type: Transform
@@ -52302,10 +54206,17 @@ entities:
       parent: 2
     - type: FaxMachine
       name: QM's Office
-  - uid: 9358
+  - uid: 7176
     components:
     - type: Transform
-      pos: 62.5,-31.5
+      pos: 53.5,-54.5
+      parent: 2
+    - type: FaxMachine
+      name: Lawyer
+  - uid: 8381
+    components:
+    - type: Transform
+      pos: 64.5,-45.5
       parent: 2
     - type: FaxMachine
       name: Security
@@ -52316,20 +54227,6 @@ entities:
       parent: 2
     - type: FaxMachine
       name: RD's Office
-  - uid: 10498
-    components:
-    - type: Transform
-      pos: 49.5,-56.5
-      parent: 2
-    - type: FaxMachine
-      name: Lawyer's Office
-  - uid: 15440
-    components:
-    - type: Transform
-      pos: 69.5,-53.5
-      parent: 2
-    - type: FaxMachine
-      name: Detective's Office
   - uid: 16282
     components:
     - type: Transform
@@ -52358,13 +54255,6 @@ entities:
       parent: 2
     - type: FaxMachine
       name: Cargo
-  - uid: 18215
-    components:
-    - type: Transform
-      pos: 67.5,-45.5
-      parent: 2
-    - type: FaxMachine
-      name: HoS' Office
 - proto: FaxMachineCaptain
   entities:
   - uid: 3831
@@ -52436,24 +54326,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-21.5
       parent: 2
-- proto: FigureSpawner
-  entities:
-  - uid: 8609
-    components:
-    - type: Transform
-      pos: 36.5,-33.5
-      parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 3084
+  - uid: 283
     components:
     - type: Transform
-      pos: 70.5,-53.5
+      pos: 29.5,-15.5
       parent: 2
-  - uid: 4184
+  - uid: 1438
     components:
     - type: Transform
-      pos: 53.5,-54.5
+      pos: 49.5,-36.5
       parent: 2
   - uid: 5274
     components:
@@ -52465,15 +54348,15 @@ entities:
     - type: Transform
       pos: 15.5,-60.5
       parent: 2
-  - uid: 13819
+  - uid: 7168
     components:
     - type: Transform
-      pos: 62.5,-34.5
+      pos: 49.5,-56.5
       parent: 2
-  - uid: 15340
+  - uid: 9293
     components:
     - type: Transform
-      pos: 70.5,-40.5
+      pos: 73.5,-47.5
       parent: 2
   - uid: 17427
     components:
@@ -52515,40 +54398,6 @@ entities:
       - 1595
       - 18775
       - 3279
-  - uid: 3401
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-53.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3399
-      - 3400
-      - 6164
-      - 3396
-      - 3397
-      - 3531
-      - 9363
-      - 7733
-      - 9287
-      - 275
-      - 13816
-      - 17963
-  - uid: 3427
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-28.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3447
-      - 3449
-      - 7119
-      - 7117
-      - 9351
-      - 3551
   - uid: 5295
     components:
     - type: Transform
@@ -52561,20 +54410,6 @@ entities:
       - 530
       - 8870
       - 8873
-  - uid: 7281
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-30.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3441
-      - 4166
-      - 3449
-      - 3447
-      - 7954
-      - 2157
   - uid: 7439
     components:
     - type: Transform
@@ -52583,12 +54418,12 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8541
-      - 8540
-      - 8539
       - 10476
       - 10477
       - 10478
+      - 19831
+      - 19832
+      - 19833
   - uid: 8800
     components:
     - type: Transform
@@ -52602,24 +54437,27 @@ entities:
       - 872
       - 8870
       - 8873
-  - uid: 10296
+  - uid: 9873
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-37.5
+      pos: 62.5,-30.5
       parent: 2
     - type: DeviceList
       devices:
-      - 7954
+      - 16247
+      - 16252
+      - 16259
+      - 16431
+      - 16433
+      - 16240
+      - 16239
+      - 16238
+      - 16448
+      - 16437
       - 2157
-      - 9293
-      - 8403
-      - 4175
-      - 4174
-      - 8404
-      - 7987
-      - 9213
-      - 10298
+      - 7954
+      - 19908
+      - 19907
   - uid: 10791
     components:
     - type: Transform
@@ -52725,6 +54563,32 @@ entities:
       - 17153
       - 17130
       - 17129
+  - uid: 16355
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-30.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 3447
+      - 3449
+      - 7954
+      - 2157
+      - 3441
+      - 4166
+  - uid: 16357
+    components:
+    - type: Transform
+      pos: 67.5,-42.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16240
+      - 16239
+      - 16238
+      - 19903
+      - 19904
   - uid: 18593
     components:
     - type: Transform
@@ -52739,29 +54603,8 @@ entities:
       - 18775
       - 530
       - 8920
-      - 5203
-      - 2388
-  - uid: 18817
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-16.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 11725
-      - 11724
-      - 11723
-      - 11722
-      - 11721
-      - 11720
-      - 11719
-      - 11718
-      - 11717
-      - 11716
-      - 11715
-      - 11712
-      - 4169
+      - 19838
+      - 19837
   - uid: 18881
     components:
     - type: Transform
@@ -52773,6 +54616,47 @@ entities:
       - 16165
       - 14594
       - 14595
+  - uid: 19247
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-17.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 4169
+      - 4171
+      - 13846
+      - 11724
+      - 11725
+      - 11723
+      - 7979
+      - 11721
+      - 11720
+      - 11719
+      - 11718
+      - 11717
+      - 11716
+      - 11715
+      - 11712
+      - 9297
+      - 7800
+      - 8607
+      - 9082
+      - 9066
+  - uid: 19910
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-39.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19900
+      - 19901
+      - 19902
+      - 19908
+      - 19907
 - proto: FireAlarmXeno
   entities:
   - uid: 1691
@@ -52783,31 +54667,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8504
-      - 8503
-      - 8502
       - 8505
       - 8506
-      - 1809
-      - 1807
       - 8507
-  - uid: 1694
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-31.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8545
-      - 8546
-      - 8547
-      - 8551
-      - 8552
-      - 8553
-      - 8703
-      - 18860
-      - 18861
+      - 19888
+      - 19887
+      - 19886
+      - 19892
+      - 19891
   - uid: 2359
     components:
     - type: Transform
@@ -52818,8 +54685,8 @@ entities:
       devices:
       - 8735
       - 8737
-      - 8736
       - 8734
+      - 8479
   - uid: 2409
     components:
     - type: Transform
@@ -52851,6 +54718,10 @@ entities:
       - 5573
       - 5572
       - 5574
+      - 19809
+      - 19810
+      - 19811
+      - 19812
   - uid: 2513
     components:
     - type: Transform
@@ -52877,6 +54748,7 @@ entities:
       - 9541
       - 11336
       - 18786
+      - 8605
   - uid: 3258
     components:
     - type: Transform
@@ -52888,22 +54760,9 @@ entities:
       - 8599
       - 8600
       - 8601
-      - 8538
-      - 8537
-      - 8536
-  - uid: 3329
-    components:
-    - type: Transform
-      pos: 48.5,-50.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 9287
-      - 7733
-      - 9363
-      - 3531
-      - 14283
-      - 12148
+      - 19830
+      - 19829
+      - 19828
   - uid: 5200
     components:
     - type: Transform
@@ -52912,12 +54771,13 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8596
-      - 8597
-      - 8598
-      - 8465
-      - 8464
-      - 8463
+      - 19801
+      - 19800
+      - 19799
+      - 19796
+      - 19797
+      - 19798
+      - 4002
   - uid: 6218
     components:
     - type: Transform
@@ -52929,14 +54789,13 @@ entities:
       - 8498
       - 8497
       - 8496
-      - 14594
-      - 14595
-      - 8450
-      - 8449
-      - 8448
+      - 15243
+      - 9878
       - 14798
       - 14800
       - 14799
+      - 15173
+      - 14797
   - uid: 6344
     components:
     - type: Transform
@@ -52945,14 +54804,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8551
-      - 8552
-      - 8553
-      - 8423
-      - 8422
-      - 8421
       - 8554
       - 8555
+      - 19850
+      - 19849
+      - 19848
+      - 19877
+      - 19878
+      - 19879
   - uid: 6345
     components:
     - type: Transform
@@ -52961,20 +54820,20 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8429
-      - 8428
-      - 8427
-      - 8393
-      - 8394
-      - 8395
-      - 8418
-      - 8419
-      - 8420
-      - 8423
-      - 8422
-      - 8421
       - 8556
       - 8424
+      - 19879
+      - 19878
+      - 19877
+      - 8430
+      - 8431
+      - 8432
+      - 8398
+      - 8397
+      - 8396
+      - 8415
+      - 8416
+      - 8417
   - uid: 6346
     components:
     - type: Transform
@@ -52983,14 +54842,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8499
-      - 8500
-      - 8501
       - 8430
       - 8431
       - 8432
-      - 7930
-      - 7926
+      - 19888
+      - 19885
+      - 19887
+      - 19886
+      - 19889
+      - 19890
       - 8434
       - 8433
   - uid: 6348
@@ -53001,12 +54861,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8389
-      - 12781
-      - 8387
-      - 8384
-      - 8385
-      - 8386
       - 6976
       - 6977
       - 6978
@@ -53016,6 +54870,12 @@ entities:
       - 17153
       - 17130
       - 17129
+      - 19896
+      - 19897
+      - 19898
+      - 19893
+      - 19894
+      - 19895
   - uid: 6349
     components:
     - type: Transform
@@ -53024,14 +54884,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 4276
-      - 8382
-      - 8383
       - 8398
       - 8397
       - 8396
       - 10326
       - 9410
+      - 19896
+      - 19897
+      - 19898
   - uid: 6350
     components:
     - type: Transform
@@ -53044,6 +54904,7 @@ entities:
       - 7015
       - 7016
       - 7017
+      - 19882
   - uid: 6405
     components:
     - type: Transform
@@ -53055,6 +54916,7 @@ entities:
       - 9410
       - 10326
       - 8402
+      - 19920
   - uid: 7880
     components:
     - type: Transform
@@ -53078,25 +54940,24 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8532
-      - 8531
-      - 8530
-      - 8520
-      - 8519
-      - 8518
-      - 8514
-      - 8513
-      - 8512
       - 8524
       - 8525
       - 8526
-      - 8453
-      - 8452
-      - 8451
-      - 8445
-      - 8446
-      - 8447
-      - 7443
+      - 19818
+      - 19817
+      - 19816
+      - 9878
+      - 15243
+      - 15173
+      - 4096
+      - 19820
+      - 19821
+      - 19822
+      - 19823
+      - 19824
+      - 19825
+      - 19826
+      - 19827
   - uid: 9039
     components:
     - type: Transform
@@ -53125,6 +54986,8 @@ entities:
       - 8498
       - 8494
       - 8495
+      - 9715
+      - 2462
   - uid: 9200
     components:
     - type: Transform
@@ -53146,14 +55009,11 @@ entities:
       - 10479
       - 10480
       - 10481
-      - 8533
-      - 8534
-      - 8535
       - 7442
       - 8107
-      - 8831
-      - 8832
-      - 8665
+      - 19830
+      - 19829
+      - 19828
       - 16242
   - uid: 9202
     components:
@@ -53190,6 +55050,7 @@ entities:
       - 14799
       - 14800
       - 14798
+      - 14797
   - uid: 9237
     components:
     - type: Transform
@@ -53197,17 +55058,17 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 14832
-      - 14831
       - 8442
       - 8441
       - 8440
       - 8439
       - 8438
-      - 8390
-      - 8391
-      - 8392
       - 18862
+      - 19889
+      - 19890
+      - 19893
+      - 19894
+      - 19895
   - uid: 9238
     components:
     - type: Transform
@@ -53245,6 +55106,7 @@ entities:
       devices:
       - 8433
       - 8434
+      - 19885
   - uid: 9250
     components:
     - type: Transform
@@ -53253,12 +55115,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8456
-      - 8455
-      - 8454
-      - 8459
-      - 8458
-      - 8457
       - 8493
   - uid: 9255
     components:
@@ -53267,15 +55123,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8466
-      - 8468
-      - 8467
-      - 8460
-      - 8461
-      - 8462
       - 8471
       - 8469
       - 8470
+      - 19802
+      - 19803
+      - 19804
+      - 19799
+      - 19800
+      - 19801
   - uid: 9256
     components:
     - type: Transform
@@ -53290,6 +55146,10 @@ entities:
       - 8472
       - 8473
       - 8474
+      - 19806
+      - 19805
+      - 19807
+      - 19808
   - uid: 9489
     components:
     - type: Transform
@@ -53298,12 +55158,12 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8529
-      - 8528
-      - 8527
       - 10479
       - 10480
       - 10481
+      - 4096
+      - 19820
+      - 19821
   - uid: 9931
     components:
     - type: Transform
@@ -53315,15 +55175,72 @@ entities:
       - 19401
       - 12859
       - 19402
-      - 8550
-      - 8549
+      - 19841
+      - 19840
+      - 19839
+  - uid: 11905
+    components:
+    - type: Transform
+      pos: 46.5,-50.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 12148
+      - 14283
+      - 8547
       - 8548
+      - 8549
   - uid: 15092
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -24.5,-15.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 8602
+      - 8603
+      - 8604
+      - 8601
+      - 8600
+      - 8599
+      - 19798
+      - 19797
+      - 19796
+  - uid: 16341
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-42.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19903
+      - 19904
+      - 16450
+      - 16451
+      - 19902
+      - 19901
+      - 19900
+      - 8549
+      - 8548
+      - 8547
+  - uid: 16366
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18702
+      - 18703
+      - 18704
+      - 914
+      - 913
+      - 19831
+      - 19832
+      - 19833
   - uid: 16800
     components:
     - type: Transform
@@ -53335,21 +55252,10 @@ entities:
       - 8477
       - 8478
       - 18880
-  - uid: 16803
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-21.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8783
-      - 8784
-      - 8789
-      - 8785
-      - 8788
-      - 8787
-      - 8786
+      - 2462
+      - 9715
+      - 19815
+      - 811
   - uid: 16807
     components:
     - type: Transform
@@ -53361,16 +55267,6 @@ entities:
       - 8677
       - 8678
       - 262
-  - uid: 16808
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-56.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 12148
-      - 14283
   - uid: 17681
     components:
     - type: Transform
@@ -53379,46 +55275,36 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8515
-      - 8516
-      - 8517
-      - 1438
-      - 1806
-  - uid: 18600
+      - 19827
+      - 19826
+      - 19825
+      - 19892
+      - 19891
+  - uid: 17872
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 22.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-26.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8764
-      - 14668
-      - 14669
-      - 8542
-      - 8543
-      - 8544
-      - 914
-      - 913
-  - uid: 18883
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 48.5,-26.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 11712
-      - 11715
-      - 11716
-      - 11717
-      - 11718
-      - 11719
-      - 11720
-      - 11721
-      - 8572
-      - 8571
-      - 8785
+      - 19845
+      - 19846
+      - 19847
+      - 19838
+      - 19837
+      - 18702
+      - 18703
+      - 18704
+      - 18705
+      - 18706
+      - 18707
+      - 18708
+      - 8550
+      - 8551
+      - 8552
+      - 19854
+      - 19851
   - uid: 19201
     components:
     - type: Transform
@@ -53442,14 +55328,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8523
-      - 8522
-      - 8521
       - 19401
       - 12859
       - 19402
       - 4972
       - 872
+      - 19822
+      - 19823
+      - 19824
   - uid: 19420
     components:
     - type: Transform
@@ -53461,6 +55347,91 @@ entities:
       - 18786
       - 11336
       - 9541
+  - uid: 19852
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-30.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19841
+      - 19840
+      - 19839
+      - 19848
+      - 19849
+      - 19850
+      - 19845
+      - 19846
+      - 19847
+  - uid: 19855
+    components:
+    - type: Transform
+      pos: 34.5,-16.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18708
+      - 18707
+      - 18706
+      - 18705
+      - 18724
+      - 18723
+      - 18709
+      - 18731
+  - uid: 19857
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8552
+      - 8551
+      - 8550
+      - 9383
+      - 9877
+      - 7979
+      - 11721
+      - 11720
+      - 11719
+      - 11718
+      - 11717
+      - 11716
+      - 11715
+      - 11712
+  - uid: 19881
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,-47.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7009
+      - 7056
+      - 7010
+      - 7011
+      - 7012
+      - 7017
+      - 7016
+      - 7015
+      - 7014
+      - 7013
+      - 19882
+  - uid: 19921
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-65.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8976
+      - 8400
+      - 8399
+      - 19920
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 5385
@@ -53483,6 +55454,17 @@ entities:
       parent: 2
 - proto: Firelock
   entities:
+  - uid: 7979
+    components:
+    - type: Transform
+      pos: 50.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11712
     components:
     - type: Transform
@@ -53490,10 +55472,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11715
     components:
     - type: Transform
@@ -53501,10 +55483,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11716
     components:
     - type: Transform
@@ -53512,10 +55494,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11717
     components:
     - type: Transform
@@ -53523,10 +55505,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11718
     components:
     - type: Transform
@@ -53534,10 +55516,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11719
     components:
     - type: Transform
@@ -53545,10 +55527,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11720
     components:
     - type: Transform
@@ -53556,10 +55538,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11721
     components:
     - type: Transform
@@ -53567,20 +55549,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
-      - 18818
-  - uid: 11722
-    components:
-    - type: Transform
-      pos: 53.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11723
     components:
     - type: Transform
@@ -53588,9 +55560,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 579
+      - 19247
   - uid: 11724
     components:
     - type: Transform
@@ -53598,9 +55570,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 579
+      - 19247
   - uid: 11725
     components:
     - type: Transform
@@ -53608,11 +55580,30 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 579
+      - 19247
+  - uid: 19913
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 77.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
 - proto: FirelockEdge
   entities:
+  - uid: 811
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-69.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16800
+      - 2110
   - uid: 913
     components:
     - type: Transform
@@ -53620,8 +55611,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
+      - 16366
+      - 10761
   - uid: 914
     components:
     - type: Transform
@@ -53629,46 +55620,19 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
-  - uid: 1438
+      - 16366
+      - 10761
+  - uid: 2008
     components:
     - type: Transform
-      pos: 4.5,-44.5
+      pos: 37.5,-87.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 1806
-    components:
-    - type: Transform
-      pos: 5.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 1807
+  - uid: 2009
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-46.5
+      pos: 37.5,-82.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 1809
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-46.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
   - uid: 3441
     components:
     - type: Transform
@@ -53678,8 +55642,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 7281
       - 8816
+      - 16355
   - uid: 4166
     components:
     - type: Transform
@@ -53689,8 +55653,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 7281
       - 8816
+      - 16355
   - uid: 4169
     components:
     - type: Transform
@@ -53699,25 +55663,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
       - 18059
       - 10791
       - 18818
-  - uid: 4276
-    components:
-    - type: Transform
-      pos: 23.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9240
-      - 6349
-  - uid: 5461
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 33.5,-98.5
-      parent: 2
+      - 19247
   - uid: 5575
     components:
     - type: Transform
@@ -53766,17 +55715,6 @@ entities:
       - 2409
       - 9195
       - 2513
-  - uid: 6970
-    components:
-    - type: Transform
-      pos: 37.5,-82.5
-      parent: 2
-  - uid: 6971
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 37.5,-87.5
-      parent: 2
   - uid: 7013
     components:
     - type: Transform
@@ -53787,6 +55725,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7014
     components:
     - type: Transform
@@ -53797,6 +55737,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7015
     components:
     - type: Transform
@@ -53807,6 +55749,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7016
     components:
     - type: Transform
@@ -53817,6 +55761,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7017
     components:
     - type: Transform
@@ -53827,6 +55773,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7135
     components:
     - type: Transform
@@ -53837,146 +55785,16 @@ entities:
       deviceLists:
       - 14591
       - 14590
-  - uid: 7926
-    components:
-    - type: Transform
-      pos: 8.5,-63.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 7930
-    components:
-    - type: Transform
-      pos: 9.5,-63.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8382
-    components:
-    - type: Transform
-      pos: 24.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9240
-      - 6349
-  - uid: 8383
-    components:
-    - type: Transform
-      pos: 25.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9240
-      - 6349
-  - uid: 8384
+  - uid: 7800
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 23.5,-76.5
+      pos: 46.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9239
-      - 6348
-  - uid: 8385
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8386
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8387
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8390
-    components:
-    - type: Transform
-      pos: 13.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 8391
-    components:
-    - type: Transform
-      pos: 14.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 8392
-    components:
-    - type: Transform
-      pos: 15.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 8393
-    components:
-    - type: Transform
-      pos: 23.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8394
-    components:
-    - type: Transform
-      pos: 24.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8395
-    components:
-    - type: Transform
-      pos: 25.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
+      - 19247
+      - 18818
   - uid: 8396
     components:
     - type: Transform
@@ -53987,6 +55805,8 @@ entities:
       deviceLists:
       - 9240
       - 6349
+      - 6345
+      - 9236
   - uid: 8397
     components:
     - type: Transform
@@ -53997,6 +55817,8 @@ entities:
       deviceLists:
       - 9240
       - 6349
+      - 6345
+      - 9236
   - uid: 8398
     components:
     - type: Transform
@@ -54007,6 +55829,8 @@ entities:
       deviceLists:
       - 9240
       - 6349
+      - 6345
+      - 9236
   - uid: 8399
     components:
     - type: Transform
@@ -54016,6 +55840,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7310
+      - 19921
   - uid: 8400
     components:
     - type: Transform
@@ -54025,6 +55850,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7310
+      - 19921
   - uid: 8415
     components:
     - type: Transform
@@ -54035,6 +55861,8 @@ entities:
       deviceLists:
       - 572
       - 9039
+      - 6345
+      - 9236
   - uid: 8416
     components:
     - type: Transform
@@ -54045,6 +55873,8 @@ entities:
       deviceLists:
       - 572
       - 9039
+      - 6345
+      - 9236
   - uid: 8417
     components:
     - type: Transform
@@ -54055,112 +55885,8 @@ entities:
       deviceLists:
       - 572
       - 9039
-  - uid: 8418
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
       - 6345
-  - uid: 8419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
       - 9236
-      - 6345
-  - uid: 8420
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8421
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-      - 6344
-      - 9235
-  - uid: 8422
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-      - 6344
-      - 9235
-  - uid: 8423
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-      - 6344
-      - 9235
-  - uid: 8426
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-14.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
-      - 18869
-  - uid: 8427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8428
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8429
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
   - uid: 8430
     components:
     - type: Transform
@@ -54171,6 +55897,8 @@ entities:
       deviceLists:
       - 9403
       - 6346
+      - 6345
+      - 9236
   - uid: 8431
     components:
     - type: Transform
@@ -54181,6 +55909,8 @@ entities:
       deviceLists:
       - 9403
       - 6346
+      - 6345
+      - 9236
   - uid: 8432
     components:
     - type: Transform
@@ -54191,240 +55921,8 @@ entities:
       deviceLists:
       - 9403
       - 6346
-  - uid: 8445
-    components:
-    - type: Transform
-      pos: -14.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8446
-    components:
-    - type: Transform
-      pos: -13.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8447
-    components:
-    - type: Transform
-      pos: -12.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8448
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6218
-      - 9234
-  - uid: 8449
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6218
-      - 9234
-  - uid: 8450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6218
-      - 9234
-  - uid: 8451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8452
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-38.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8453
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8454
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8455
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-38.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8456
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8458
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8459
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8461
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8462
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8463
-    components:
-    - type: Transform
-      pos: -29.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8464
-    components:
-    - type: Transform
-      pos: -28.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8465
-    components:
-    - type: Transform
-      pos: -27.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8466
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8467
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8468
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
+      - 6345
+      - 9236
   - uid: 8477
     components:
     - type: Transform
@@ -54483,475 +55981,6 @@ entities:
       - 6407
       - 1876
       - 9178
-  - uid: 8499
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8500
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8501
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8502
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 8503
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 8504
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 8512
-    components:
-    - type: Transform
-      pos: 3.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8513
-    components:
-    - type: Transform
-      pos: 4.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8514
-    components:
-    - type: Transform
-      pos: 5.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 8516
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 8517
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 8518
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8519
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8520
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19399
-      - 19400
-  - uid: 8522
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19399
-      - 19400
-  - uid: 8523
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19399
-      - 19400
-  - uid: 8527
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9489
-      - 1212
-  - uid: 8528
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9489
-      - 1212
-  - uid: 8529
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9489
-      - 1212
-  - uid: 8530
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-28.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8531
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-28.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8532
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-28.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8533
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 8534
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 8535
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 8536
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9199
-      - 3258
-  - uid: 8537
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9199
-      - 3258
-  - uid: 8538
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9199
-      - 3258
-  - uid: 8539
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7439
-      - 459
-  - uid: 8540
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7439
-      - 459
-  - uid: 8541
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7439
-      - 459
-  - uid: 8542
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
-  - uid: 8543
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
-  - uid: 8544
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
-  - uid: 8545
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 8546
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 8547
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 8548
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9931
-      - 1751
-  - uid: 8549
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9931
-      - 1751
-  - uid: 8550
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9931
-      - 1751
-  - uid: 8551
-    components:
-    - type: Transform
-      pos: 23.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-      - 6344
-      - 9235
-  - uid: 8552
-    components:
-    - type: Transform
-      pos: 24.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-      - 6344
-      - 9235
-  - uid: 8553
-    components:
-    - type: Transform
-      pos: 25.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-      - 6344
-      - 9235
-  - uid: 8571
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-24.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18874
-      - 18873
-      - 18883
-  - uid: 8572
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-23.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18874
-      - 18873
-      - 18883
   - uid: 8592
     components:
     - type: Transform
@@ -54960,52 +55989,17 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6358
-  - uid: 8593
-    components:
-    - type: Transform
-      pos: -29.5,-18.5
-      parent: 2
-  - uid: 8594
-    components:
-    - type: Transform
-      pos: -28.5,-18.5
-      parent: 2
-  - uid: 8595
-    components:
-    - type: Transform
-      pos: -27.5,-18.5
-      parent: 2
-  - uid: 8596
+      - 19876
+  - uid: 8607
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -29.5,-20.5
+      pos: 45.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6646
-      - 5200
-  - uid: 8597
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-20.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8598
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-20.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
+      - 19247
+      - 18818
   - uid: 8640
     components:
     - type: Transform
@@ -55022,25 +56016,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-21.5
       parent: 2
-  - uid: 8703
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-25.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9040
-      - 1694
-  - uid: 8764
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
+      - 19836
   - uid: 8976
     components:
     - type: Transform
@@ -55049,34 +56027,59 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7310
-  - uid: 12781
+      - 19921
+  - uid: 9066
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.5,-76.5
+      pos: 43.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9239
-      - 6348
-  - uid: 14668
+      - 19247
+      - 18818
+  - uid: 9082
     components:
     - type: Transform
-      pos: 24.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: 44.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
-  - uid: 14669
+      - 19247
+      - 18818
+  - uid: 9297
     components:
     - type: Transform
-      pos: 25.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: 47.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
+      - 19247
+      - 18818
+  - uid: 9383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-24.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+      - 19857
+      - 579
+  - uid: 9877
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+      - 19857
+      - 579
   - uid: 14755
     components:
     - type: Transform
@@ -55133,26 +56136,6 @@ entities:
       - 5526
       - 9234
       - 6218
-  - uid: 14831
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-65.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 14832
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-65.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
   - uid: 17129
     components:
     - type: Transform
@@ -55195,17 +56178,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -59.5,-27.5
       parent: 2
-  - uid: 17872
-    components:
-    - type: Transform
-      pos: -59.5,-63.5
-      parent: 2
-  - uid: 18269
+  - uid: 18735
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 33.5,-99.5
+      pos: 34.5,-15.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+      - 18736
   - uid: 18857
     components:
     - type: Transform
@@ -55217,26 +56199,6 @@ entities:
       - 14590
       - 14592
       - 14591
-  - uid: 18860
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-25.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 18861
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-25.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
   - uid: 18865
     components:
     - type: Transform
@@ -55263,6 +56225,49 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-32.5
       parent: 2
+  - uid: 19815
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-69.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16800
+      - 2110
+  - uid: 19877
+    components:
+    - type: Transform
+      pos: 25.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9235
+      - 6344
+      - 6345
+      - 9236
+  - uid: 19878
+    components:
+    - type: Transform
+      pos: 24.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9235
+      - 6344
+      - 6345
+      - 9236
+  - uid: 19879
+    components:
+    - type: Transform
+      pos: 23.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9235
+      - 6344
+      - 6345
+      - 9236
 - proto: FirelockGlass
   entities:
   - uid: 44
@@ -55286,16 +56291,6 @@ entities:
       - 18864
       - 16807
       - 2197
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 59.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
-      - 3401
-      - 7131
   - uid: 530
     components:
     - type: Transform
@@ -55318,11 +56313,6 @@ entities:
       - 8800
       - 8767
       - 19400
-  - uid: 885
-    components:
-    - type: Transform
-      pos: 75.5,-45.5
-      parent: 2
   - uid: 1112
     components:
     - type: Transform
@@ -55371,9 +56361,9 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 7953
-      - 10296
+      - 9873
+      - 16354
+      - 16355
   - uid: 2381
     components:
     - type: Transform
@@ -55385,15 +56375,6 @@ entities:
       - 14642
       - 18593
       - 364
-  - uid: 2388
-    components:
-    - type: Transform
-      pos: 22.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18593
-      - 364
   - uid: 2462
     components:
     - type: Transform
@@ -55403,6 +56384,8 @@ entities:
       deviceLists:
       - 2110
       - 1876
+      - 9178
+      - 16800
   - uid: 3279
     components:
     - type: Transform
@@ -55414,47 +56397,6 @@ entities:
       - 14642
       - 18593
       - 364
-  - uid: 3390
-    components:
-    - type: Transform
-      pos: 65.5,-61.5
-      parent: 2
-  - uid: 3396
-    components:
-    - type: Transform
-      pos: 59.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-  - uid: 3397
-    components:
-    - type: Transform
-      pos: 58.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-  - uid: 3399
-    components:
-    - type: Transform
-      pos: 62.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-  - uid: 3400
-    components:
-    - type: Transform
-      pos: 63.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
   - uid: 3447
     components:
     - type: Transform
@@ -55463,9 +56405,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 3446
-      - 3427
+      - 19909
+      - 16355
   - uid: 3448
     components:
     - type: Transform
@@ -55475,6 +56416,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
+      - 6358
   - uid: 3449
     components:
     - type: Transform
@@ -55483,19 +56425,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 3427
-  - uid: 3531
-    components:
-    - type: Transform
-      pos: 54.5,-49.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
+      - 19909
+      - 16355
   - uid: 3659
     components:
     - type: Transform
@@ -55515,6 +56446,19 @@ entities:
       deviceLists:
       - 16120
       - 9202
+      - 5200
+      - 6646
+  - uid: 4096
+    components:
+    - type: Transform
+      pos: -1.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 9489
+      - 1212
   - uid: 4171
     components:
     - type: Transform
@@ -55524,26 +56468,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
-  - uid: 4174
-    components:
-    - type: Transform
-      pos: 61.5,-38.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
-      - 7953
-      - 10296
-  - uid: 4175
-    components:
-    - type: Transform
-      pos: 61.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
-      - 7953
-      - 10296
+      - 19247
+      - 18818
   - uid: 4972
     components:
     - type: Transform
@@ -55553,20 +56479,15 @@ entities:
       deviceLists:
       - 19399
       - 19400
+      - 8767
   - uid: 4984
     components:
     - type: Transform
       pos: 7.5,-32.5
       parent: 2
-  - uid: 5203
-    components:
-    - type: Transform
-      pos: 22.5,-23.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18593
-      - 364
+      - 8767
   - uid: 5569
     components:
     - type: Transform
@@ -55721,15 +56642,6 @@ entities:
       - 14459
       - 3897
       - 9200
-  - uid: 6164
-    components:
-    - type: Transform
-      pos: 60.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
   - uid: 6631
     components:
     - type: Transform
@@ -55794,6 +56706,9 @@ entities:
     - type: Transform
       pos: 7.5,-30.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8767
   - uid: 6976
     components:
     - type: Transform
@@ -55836,6 +56751,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7010
     components:
     - type: Transform
@@ -55845,6 +56762,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7011
     components:
     - type: Transform
@@ -55854,6 +56773,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7012
     components:
     - type: Transform
@@ -55863,6 +56784,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7056
     components:
     - type: Transform
@@ -55872,6 +56795,8 @@ entities:
       deviceLists:
       - 7880
       - 9243
+      - 19881
+      - 19880
   - uid: 7109
     components:
     - type: Transform
@@ -55881,27 +56806,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 18874
-  - uid: 7117
-    components:
-    - type: Transform
-      pos: 58.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3446
-      - 3427
-      - 7104
-  - uid: 7119
-    components:
-    - type: Transform
-      pos: 59.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3446
-      - 3427
-      - 7104
+      - 579
   - uid: 7440
     components:
     - type: Transform
@@ -55929,9 +56834,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 469
       - 9242
-      - 9038
       - 1075
   - uid: 7459
     components:
@@ -55943,33 +56846,6 @@ entities:
       - 14460
       - 14458
       - 14459
-  - uid: 7498
-    components:
-    - type: Transform
-      pos: 81.5,-46.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 7654
-    components:
-    - type: Transform
-      pos: 81.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 7733
-    components:
-    - type: Transform
-      pos: 54.5,-51.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
   - uid: 7954
     components:
     - type: Transform
@@ -55978,18 +56854,9 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 7953
-      - 10296
-  - uid: 7987
-    components:
-    - type: Transform
-      pos: 62.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
+      - 9873
+      - 16354
+      - 16355
   - uid: 8107
     components:
     - type: Transform
@@ -56000,11 +56867,7 @@ entities:
       - 19201
       - 19200
       - 9200
-  - uid: 8381
-    components:
-    - type: Transform
-      pos: 61.5,-43.5
-      parent: 2
+      - 3897
   - uid: 8402
     components:
     - type: Transform
@@ -56014,44 +56877,6 @@ entities:
       deviceLists:
       - 9248
       - 6405
-  - uid: 8403
-    components:
-    - type: Transform
-      pos: 66.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 8404
-    components:
-    - type: Transform
-      pos: 61.5,-41.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 8405
-    components:
-    - type: Transform
-      pos: 66.5,-67.5
-      parent: 2
-  - uid: 8406
-    components:
-    - type: Transform
-      pos: 67.5,-67.5
-      parent: 2
-  - uid: 8407
-    components:
-    - type: Transform
-      pos: 70.5,-71.5
-      parent: 2
-  - uid: 8408
-    components:
-    - type: Transform
-      pos: 78.5,-60.5
-      parent: 2
   - uid: 8409
     components:
     - type: Transform
@@ -56067,6 +56892,7 @@ entities:
       - 6345
       - 9243
       - 7880
+      - 9236
   - uid: 8425
     components:
     - type: Transform
@@ -56230,11 +57056,10 @@ entities:
     - type: Transform
       pos: -52.5,-61.5
       parent: 2
-  - uid: 8480
-    components:
-    - type: Transform
-      pos: -52.5,-62.5
-      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2359
+      - 9262
   - uid: 8481
     components:
     - type: Transform
@@ -56368,7 +57193,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8800
-      - 8767
       - 469
       - 9038
   - uid: 8525
@@ -56379,7 +57203,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8800
-      - 8767
       - 469
       - 9038
   - uid: 8526
@@ -56390,9 +57213,74 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8800
-      - 8767
       - 469
       - 9038
+  - uid: 8547
+    components:
+    - type: Transform
+      pos: 50.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 11905
+      - 3424
+      - 16341
+      - 16312
+  - uid: 8548
+    components:
+    - type: Transform
+      pos: 51.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 11905
+      - 3424
+      - 16341
+      - 16312
+  - uid: 8549
+    components:
+    - type: Transform
+      pos: 52.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 11905
+      - 3424
+      - 16341
+      - 16312
+  - uid: 8550
+    components:
+    - type: Transform
+      pos: 33.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19857
+      - 19856
+  - uid: 8551
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19857
+      - 19856
+  - uid: 8552
+    components:
+    - type: Transform
+      pos: 33.5,-24.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19857
+      - 19856
   - uid: 8554
     components:
     - type: Transform
@@ -56425,54 +57313,7 @@ entities:
       - 6345
       - 9243
       - 7880
-  - uid: 8586
-    components:
-    - type: Transform
-      pos: 88.5,-48.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8587
-    components:
-    - type: Transform
-      pos: 88.5,-49.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8588
-    components:
-    - type: Transform
-      pos: 88.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8589
-    components:
-    - type: Transform
-      pos: 88.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8590
-    components:
-    - type: Transform
-      pos: 88.5,-41.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8591
-    components:
-    - type: Transform
-      pos: 88.5,-40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
+      - 9236
   - uid: 8599
     components:
     - type: Transform
@@ -56482,6 +57323,8 @@ entities:
       deviceLists:
       - 9199
       - 3258
+      - 15092
+      - 15885
   - uid: 8600
     components:
     - type: Transform
@@ -56491,6 +57334,8 @@ entities:
       deviceLists:
       - 9199
       - 3258
+      - 15092
+      - 15885
   - uid: 8601
     components:
     - type: Transform
@@ -56500,6 +57345,8 @@ entities:
       deviceLists:
       - 9199
       - 3258
+      - 15092
+      - 15885
   - uid: 8602
     components:
     - type: Transform
@@ -56509,6 +57356,8 @@ entities:
       deviceLists:
       - 9198
       - 3256
+      - 15092
+      - 15885
   - uid: 8603
     components:
     - type: Transform
@@ -56518,6 +57367,8 @@ entities:
       deviceLists:
       - 9198
       - 3256
+      - 15092
+      - 15885
   - uid: 8604
     components:
     - type: Transform
@@ -56527,11 +57378,17 @@ entities:
       deviceLists:
       - 9198
       - 3256
+      - 15092
+      - 15885
   - uid: 8605
     components:
     - type: Transform
       pos: -41.5,-11.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3256
+      - 9198
   - uid: 8664
     components:
     - type: Transform
@@ -56550,8 +57407,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14636
-      - 3897
-      - 9200
+      - 19835
   - uid: 8676
     components:
     - type: Transform
@@ -56592,8 +57448,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9262
       - 2359
+      - 9262
   - uid: 8735
     components:
     - type: Transform
@@ -56603,15 +57459,6 @@ entities:
       deviceLists:
       - 9262
       - 2359
-  - uid: 8736
-    components:
-    - type: Transform
-      pos: -52.5,-61.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9262
-      - 2359
   - uid: 8737
     components:
     - type: Transform
@@ -56630,75 +57477,7 @@ entities:
       deviceLists:
       - 349
       - 14642
-  - uid: 8783
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-      - 16803
-  - uid: 8784
-    components:
-    - type: Transform
-      pos: 26.5,-23.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-      - 16803
-  - uid: 8785
-    components:
-    - type: Transform
-      pos: 32.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-      - 18873
-      - 16803
-      - 18883
-  - uid: 8786
-    components:
-    - type: Transform
-      pos: 28.5,-17.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 16803
-      - 19354
-      - 6354
-  - uid: 8787
-    components:
-    - type: Transform
-      pos: 29.5,-17.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
-      - 16803
-      - 6354
-  - uid: 8788
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 16803
-      - 19354
-      - 6354
-  - uid: 8789
-    components:
-    - type: Transform
-      pos: 28.5,-24.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6353
-      - 6354
-      - 16803
+      - 19836
   - uid: 8870
     components:
     - type: Transform
@@ -56732,46 +57511,6 @@ entities:
       - 364
       - 5295
       - 17282
-  - uid: 9213
-    components:
-    - type: Transform
-      pos: 63.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 9287
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
-  - uid: 9293
-    components:
-    - type: Transform
-      pos: 66.5,-32.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 9363
-    components:
-    - type: Transform
-      pos: 54.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
   - uid: 9410
     components:
     - type: Transform
@@ -56804,21 +57543,20 @@ entities:
       deviceLists:
       - 2110
       - 1876
-  - uid: 10297
+      - 9178
+      - 16800
+  - uid: 9878
     components:
     - type: Transform
-      pos: 61.5,-42.5
-      parent: 2
-  - uid: 10298
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-43.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7953
-      - 10296
-      - 10295
+      - 6218
+      - 9234
+      - 9038
+      - 469
   - uid: 10326
     components:
     - type: Transform
@@ -56896,14 +57634,24 @@ entities:
       - 9200
       - 9489
       - 1212
-  - uid: 10754
+  - uid: 10788
     components:
     - type: Transform
-      pos: 58.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-49.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7104
+      - 10839
+  - uid: 10811
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
   - uid: 11336
     components:
     - type: Transform
@@ -56923,17 +57671,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6418
-      - 16808
       - 572
       - 9039
-      - 3329
       - 3424
-  - uid: 12855
-    components:
-    - type: Transform
-      pos: 66.5,-61.5
-      parent: 2
+      - 11905
   - uid: 12859
     components:
     - type: Transform
@@ -56950,6 +57691,9 @@ entities:
     - type: Transform
       pos: 7.5,-31.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8767
   - uid: 13567
     components:
     - type: Transform
@@ -56960,16 +57704,6 @@ entities:
       - 18493
       - 18013
       - 15095
-  - uid: 13816
-    components:
-    - type: Transform
-      pos: 60.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
-      - 3401
-      - 7131
   - uid: 13846
     components:
     - type: Transform
@@ -56979,6 +57713,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
+      - 19247
+      - 18818
   - uid: 14283
     components:
     - type: Transform
@@ -56986,12 +57722,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6418
-      - 16808
       - 572
       - 9039
-      - 3329
       - 3424
+      - 11905
   - uid: 14594
     components:
     - type: Transform
@@ -57000,7 +57734,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14593
-      - 6218
       - 18881
   - uid: 14595
     components:
@@ -57010,7 +57743,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14593
-      - 6218
       - 18881
   - uid: 14728
     components:
@@ -57021,7 +57753,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 18874
+      - 579
   - uid: 14730
     components:
     - type: Transform
@@ -57031,6 +57763,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
+      - 6358
   - uid: 14753
     components:
     - type: Transform
@@ -57056,15 +57789,76 @@ entities:
     - type: Transform
       pos: -11.5,-48.5
       parent: 2
-  - uid: 15269
+    - type: DeviceNetwork
+      deviceLists:
+      - 6218
+      - 9234
+      - 9233
+      - 5526
+  - uid: 15173
     components:
     - type: Transform
-      pos: -36.5,-75.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,-43.5
       parent: 2
-  - uid: 15270
+    - type: DeviceNetwork
+      deviceLists:
+      - 6218
+      - 9234
+      - 9038
+      - 469
+  - uid: 15191
     components:
     - type: Transform
-      pos: -35.5,-75.5
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-50.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15243
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6218
+      - 9234
+      - 9038
+      - 469
+  - uid: 15409
+    components:
+    - type: Transform
+      pos: -36.5,-74.5
       parent: 2
   - uid: 16165
     components:
@@ -57077,6 +57871,39 @@ entities:
       - 14593
       - 14591
       - 18881
+  - uid: 16238
+    components:
+    - type: Transform
+      pos: 66.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+      - 16357
+      - 16356
+  - uid: 16239
+    components:
+    - type: Transform
+      pos: 65.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+      - 16357
+      - 16356
+  - uid: 16240
+    components:
+    - type: Transform
+      pos: 64.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+      - 16357
+      - 16356
   - uid: 16242
     components:
     - type: Transform
@@ -57088,16 +57915,119 @@ entities:
       - 19201
       - 3897
       - 9200
-  - uid: 17963
+  - uid: 16247
     components:
     - type: Transform
-      pos: 66.5,-51.5
+      pos: 54.5,-32.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7950
-      - 3401
-      - 7131
+      - 19911
+      - 9873
+      - 16354
+  - uid: 16252
+    components:
+    - type: Transform
+      pos: 54.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+      - 9873
+      - 16354
+  - uid: 16259
+    components:
+    - type: Transform
+      pos: 54.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+      - 9873
+      - 16354
+  - uid: 16431
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-29.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16433
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-29.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16437
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16448
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16450
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+  - uid: 16451
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+  - uid: 16452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 16453
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 17101
+    components:
+    - type: Transform
+      pos: -35.5,-74.5
+      parent: 2
   - uid: 18091
     components:
     - type: Transform
@@ -57108,6 +58038,133 @@ entities:
       - 14752
       - 18013
       - 15095
+  - uid: 18702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 16366
+      - 10761
+  - uid: 18703
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 16366
+      - 10761
+  - uid: 18704
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 16366
+      - 10761
+  - uid: 18705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18706
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18708
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+      - 19855
+      - 16363
+  - uid: 18723
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+      - 19855
+      - 16363
+  - uid: 18724
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+      - 19855
+      - 16363
+  - uid: 18731
+    components:
+    - type: Transform
+      pos: 35.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18736
+      - 19855
+      - 16362
   - uid: 18761
     components:
     - type: Transform
@@ -57191,6 +58248,24 @@ entities:
       - 2110
       - 14590
       - 14591
+  - uid: 19065
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-35.5
+      parent: 2
+  - uid: 19067
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-33.5
+      parent: 2
+  - uid: 19078
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-42.5
+      parent: 2
   - uid: 19203
     components:
     - type: Transform
@@ -57227,11 +58302,6 @@ entities:
       deviceLists:
       - 14460
       - 14461
-  - uid: 19315
-    components:
-    - type: Transform
-      pos: 56.5,-69.5
-      parent: 2
   - uid: 19401
     components:
     - type: Transform
@@ -57254,6 +58324,850 @@ entities:
       - 19400
       - 1751
       - 9931
+  - uid: 19796
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15092
+      - 15885
+      - 5200
+      - 6646
+  - uid: 19797
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15092
+      - 15885
+      - 5200
+      - 6646
+  - uid: 19798
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15092
+      - 15885
+      - 5200
+      - 6646
+  - uid: 19799
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5200
+      - 6646
+      - 9255
+      - 6411
+  - uid: 19800
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5200
+      - 6646
+      - 9255
+      - 6411
+  - uid: 19801
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5200
+      - 6646
+      - 9255
+      - 6411
+  - uid: 19802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9255
+      - 6411
+  - uid: 19803
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9255
+      - 6411
+  - uid: 19804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9255
+      - 6411
+  - uid: 19805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19807
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19809
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19810
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19816
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+  - uid: 19817
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+  - uid: 19818
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+  - uid: 19820
+    components:
+    - type: Transform
+      pos: -0.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 9489
+      - 1212
+  - uid: 19821
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 9489
+      - 1212
+  - uid: 19822
+    components:
+    - type: Transform
+      pos: 6.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 19399
+      - 19400
+  - uid: 19823
+    components:
+    - type: Transform
+      pos: 6.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 19399
+      - 19400
+  - uid: 19824
+    components:
+    - type: Transform
+      pos: 6.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 19399
+      - 19400
+  - uid: 19825
+    components:
+    - type: Transform
+      pos: 5.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 17681
+      - 17680
+  - uid: 19826
+    components:
+    - type: Transform
+      pos: 4.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 17681
+      - 17680
+  - uid: 19827
+    components:
+    - type: Transform
+      pos: 3.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 17681
+      - 17680
+  - uid: 19828
+    components:
+    - type: Transform
+      pos: -9.5,-13.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3258
+      - 9199
+      - 9200
+      - 3897
+  - uid: 19829
+    components:
+    - type: Transform
+      pos: -9.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3258
+      - 9199
+      - 9200
+      - 3897
+  - uid: 19830
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3258
+      - 9199
+      - 9200
+      - 3897
+  - uid: 19831
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7439
+      - 459
+      - 16366
+      - 10761
+  - uid: 19832
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7439
+      - 459
+      - 16366
+      - 10761
+  - uid: 19833
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7439
+      - 459
+      - 16366
+      - 10761
+  - uid: 19834
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19835
+  - uid: 19837
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18593
+      - 364
+      - 17872
+      - 16367
+  - uid: 19838
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18593
+      - 364
+      - 17872
+      - 16367
+  - uid: 19839
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9931
+      - 1751
+      - 19852
+      - 19853
+  - uid: 19840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9931
+      - 1751
+      - 19852
+      - 19853
+  - uid: 19841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9931
+      - 1751
+      - 19852
+      - 19853
+  - uid: 19845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 17872
+      - 16367
+  - uid: 19846
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 17872
+      - 16367
+  - uid: 19847
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 17872
+      - 16367
+  - uid: 19848
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 6344
+      - 9235
+  - uid: 19849
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 6344
+      - 9235
+  - uid: 19850
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 6344
+      - 9235
+  - uid: 19851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-25.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 7582
+  - uid: 19854
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-25.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 7582
+  - uid: 19875
+    components:
+    - type: Transform
+      pos: 72.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6358
+      - 19876
+  - uid: 19882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6350
+      - 9241
+      - 19880
+      - 19881
+  - uid: 19885
+    components:
+    - type: Transform
+      pos: 14.5,-55.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 9249
+      - 6406
+  - uid: 19886
+    components:
+    - type: Transform
+      pos: 6.5,-52.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 1691
+      - 9216
+  - uid: 19887
+    components:
+    - type: Transform
+      pos: 6.5,-53.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 1691
+      - 9216
+  - uid: 19888
+    components:
+    - type: Transform
+      pos: 6.5,-54.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 1691
+      - 9216
+  - uid: 19889
+    components:
+    - type: Transform
+      pos: 8.5,-64.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 9237
+      - 569
+  - uid: 19890
+    components:
+    - type: Transform
+      pos: 9.5,-64.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 9237
+      - 569
+  - uid: 19891
+    components:
+    - type: Transform
+      pos: 5.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17681
+      - 17680
+      - 1691
+      - 9216
+  - uid: 19892
+    components:
+    - type: Transform
+      pos: 4.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17681
+      - 17680
+      - 1691
+      - 9216
+  - uid: 19893
+    components:
+    - type: Transform
+      pos: 13.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9237
+      - 569
+      - 6348
+      - 9239
+  - uid: 19894
+    components:
+    - type: Transform
+      pos: 14.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9237
+      - 569
+      - 6348
+      - 9239
+  - uid: 19895
+    components:
+    - type: Transform
+      pos: 15.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9237
+      - 569
+      - 6348
+      - 9239
+  - uid: 19896
+    components:
+    - type: Transform
+      pos: 23.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6348
+      - 9239
+      - 6349
+      - 9240
+  - uid: 19897
+    components:
+    - type: Transform
+      pos: 24.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6348
+      - 9239
+      - 6349
+      - 9240
+  - uid: 19898
+    components:
+    - type: Transform
+      pos: 25.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6348
+      - 9239
+      - 6349
+      - 9240
+  - uid: 19900
+    components:
+    - type: Transform
+      pos: 57.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 19910
+      - 16346
+  - uid: 19901
+    components:
+    - type: Transform
+      pos: 58.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 19910
+      - 16346
+  - uid: 19902
+    components:
+    - type: Transform
+      pos: 59.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 19910
+      - 16346
+  - uid: 19903
+    components:
+    - type: Transform
+      pos: 63.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 16357
+      - 16356
+  - uid: 19904
+    components:
+    - type: Transform
+      pos: 63.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 16357
+      - 16356
+  - uid: 19906
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19909
+  - uid: 19907
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19910
+      - 16346
+      - 9873
+      - 16354
+  - uid: 19908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19910
+      - 16346
+      - 9873
+      - 16354
+  - uid: 19912
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19909
+  - uid: 19914
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-46.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
+      - 10839
+  - uid: 19915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-44.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
+      - 10839
+  - uid: 19918
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-71.5
+      parent: 2
+  - uid: 19919
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-61.5
+      parent: 2
+  - uid: 19920
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-70.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7310
+      - 19921
+      - 6405
+      - 9248
 - proto: Flare
   entities:
   - uid: 10803
@@ -57310,21 +59224,16 @@ entities:
     - type: Transform
       pos: 29.42569,-76.37392
       parent: 2
-  - uid: 15463
-    components:
-    - type: Transform
-      pos: 49.38892,-25.404797
-      parent: 2
-  - uid: 15465
-    components:
-    - type: Transform
-      pos: 49.60767,-25.529884
-      parent: 2
   - uid: 15887
     components:
     - type: Transform
       pos: 8.378325,-77.38192
       parent: 2
+  - uid: 16034
+    components:
+    - type: Transform
+      pos: 58.37897,-56.323803
+      parent: 2
   - uid: 16301
     components:
     - type: Transform
@@ -57360,6 +59269,11 @@ entities:
     - type: Transform
       pos: -33.738388,-29.310532
       parent: 2
+  - uid: 19185
+    components:
+    - type: Transform
+      pos: 40.650253,-25.478815
+      parent: 2
 - proto: FlashlightSeclite
   entities:
   - uid: 5588
@@ -57367,11 +59281,6 @@ entities:
     - type: Transform
       pos: -52.491226,-38.6449
       parent: 2
-  - uid: 7742
-    components:
-    - type: Transform
-      pos: 55.5,-46.5
-      parent: 2
 - proto: FlippoLighter
   entities:
   - uid: 6024
@@ -57388,6 +59297,51 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: FloorCarpetItemBlack
+  entities:
+  - uid: 7382
+    components:
+    - type: Transform
+      pos: 55.366177,-66.28229
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemOrange
+  entities:
+  - uid: 5314
+    components:
+    - type: Transform
+      pos: 55.392075,-66.48532
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemPurple
+  entities:
+  - uid: 10699
+    components:
+    - type: Transform
+      pos: 55.65664,-66.53657
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemSkyBlue
+  entities:
+  - uid: 7201
+    components:
+    - type: Transform
+      pos: 55.609764,-66.3333
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemWhite
+  entities:
+  - uid: 7381
+    components:
+    - type: Transform
+      pos: 55.65664,-66.23949
+      parent: 2
+    - type: Stack
+      count: 10
 - proto: FloorDrain
   entities:
   - uid: 1834
@@ -57419,10 +59373,24 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 7038
+  - uid: 6409
     components:
     - type: Transform
-      pos: 47.5,-41.5
+      pos: 44.5,-43.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 7030
+    components:
+    - type: Transform
+      pos: 44.5,-42.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 7142
+    components:
+    - type: Transform
+      pos: 42.5,-37.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -57433,13 +59401,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 17878
-    components:
-    - type: Transform
-      pos: 36.5,-18.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 19016
     components:
     - type: Transform
@@ -57475,11 +59436,6 @@ entities:
     - type: Transform
       pos: -49.5,-68.5
       parent: 2
-  - uid: 16175
-    components:
-    - type: Transform
-      pos: 72.5,-32.5
-      parent: 2
   - uid: 17097
     components:
     - type: Transform
@@ -57495,11 +59451,6 @@ entities:
     - type: Transform
       pos: -25.5,-51.5
       parent: 2
-  - uid: 17101
-    components:
-    - type: Transform
-      pos: -40.5,-80.5
-      parent: 2
   - uid: 17103
     components:
     - type: Transform
@@ -57510,31 +59461,11 @@ entities:
     - type: Transform
       pos: 5.5,-71.5
       parent: 2
-  - uid: 17107
-    components:
-    - type: Transform
-      pos: 66.5,-58.5
-      parent: 2
   - uid: 17108
     components:
     - type: Transform
       pos: 77.5,-51.5
       parent: 2
-  - uid: 17109
-    components:
-    - type: Transform
-      pos: 33.5,-31.5
-      parent: 2
-  - uid: 17110
-    components:
-    - type: Transform
-      pos: 50.5,-34.5
-      parent: 2
-  - uid: 17111
-    components:
-    - type: Transform
-      pos: 54.5,-40.5
-      parent: 2
   - uid: 17113
     components:
     - type: Transform
@@ -57555,10 +59486,11 @@ entities:
     - type: Transform
       pos: -37.5,-36.5
       parent: 2
-  - uid: 17117
+  - uid: 17119
     components:
     - type: Transform
-      pos: -36.5,-77.5
+      rot: 1.5707963267948966 rad
+      pos: -38.523506,-80.51952
       parent: 2
   - uid: 17308
     components:
@@ -57595,36 +59527,25 @@ entities:
     - type: Transform
       pos: -39.5,-70.5
       parent: 2
-  - uid: 18100
-    components:
-    - type: Transform
-      pos: 56.5,-67.5
-      parent: 2
   - uid: 18266
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 37.5,-21.5
       parent: 2
-  - uid: 18270
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-48.5
-      parent: 2
 - proto: FoamCrossbow
   entities:
   - uid: 7960
     components:
     - type: Transform
-      pos: 64.66352,-70.57762
+      pos: 69.6651,-59.63053
       parent: 2
 - proto: FoamCutlass
   entities:
   - uid: 18301
     components:
     - type: Transform
-      pos: 64.45814,-70.017105
+      pos: 69.39864,-60.424595
       parent: 2
   - uid: 18854
     components:
@@ -57634,7 +59555,7 @@ entities:
   - uid: 18933
     components:
     - type: Transform
-      pos: 64.58314,-70.288124
+      pos: 69.55489,-60.50272
       parent: 2
 - proto: FolderSpawner
   entities:
@@ -57667,7 +59588,7 @@ entities:
   - uid: 5021
     components:
     - type: Transform
-      pos: 48.518234,-40.351086
+      pos: 40.572193,-36.354713
       parent: 2
 - proto: FoodBanana
   entities:
@@ -57676,13 +59597,6 @@ entities:
     - type: Transform
       pos: -64.68415,-61.398476
       parent: 2
-- proto: FoodBowlBigTrash
-  entities:
-  - uid: 7329
-    components:
-    - type: Transform
-      pos: 80.43792,-29.298622
-      parent: 2
 - proto: FoodBoxDonkpocketStonk
   entities:
   - uid: 6834
@@ -57891,6 +59805,12 @@ entities:
     - type: Transform
       pos: 31.513302,-94.31904
       parent: 2
+  - uid: 19666
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.392643,-44.84861
+      parent: 2
 - proto: FoodDonkpocketPizza
   entities:
   - uid: 6972
@@ -57942,10 +59862,10 @@ entities:
       parent: 2
 - proto: FoodDonutJellySlugcat
   entities:
-  - uid: 7256
+  - uid: 2917
     components:
     - type: Transform
-      pos: 59.48766,-79.48507
+      pos: 72.49038,-74.3934
       parent: 2
     - type: CollisionWake
       enabled: False
@@ -58050,60 +59970,13 @@ entities:
     - type: Transform
       pos: -38.619698,-62.26088
       parent: 2
-- proto: FoodMeatXeno
-  entities:
-  - uid: 7044
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7045
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7046
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7047
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7048
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7049
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: FoodMeatXenoCutlet
   entities:
-  - uid: 14737
+  - uid: 3722
     components:
     - type: Transform
-      pos: 43.38109,-25.742085
+      pos: 42.54103,-26.571922
       parent: 2
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
 - proto: FoodOrange
   entities:
   - uid: 17558
@@ -58128,7 +60001,7 @@ entities:
   - uid: 5482
     components:
     - type: Transform
-      pos: -38.651333,-55.430145
+      pos: -42.49177,-52.28213
       parent: 2
 - proto: FoodPieXenoSlice
   entities:
@@ -58230,14 +60103,14 @@ entities:
   - uid: 7328
     components:
     - type: Transform
-      pos: 80.31292,-26.405987
+      pos: 79.62434,-25.69585
       parent: 2
 - proto: FoodTinMRETrash
   entities:
   - uid: 7327
     components:
     - type: Transform
-      pos: 80.69421,-26.558718
+      pos: 79.27017,-25.581188
       parent: 2
 - proto: ForkPlastic
   entities:
@@ -58258,7 +60131,7 @@ entities:
   - uid: 18622
     components:
     - type: Transform
-      pos: 77.75246,-47.4808
+      pos: 78.98819,-47.30669
       parent: 2
 - proto: GasAnalyzer
   entities:
@@ -58272,11 +60145,26 @@ entities:
     - type: Transform
       pos: 27.654818,-72.288635
       parent: 2
-  - uid: 18283
+  - uid: 10307
     components:
     - type: Transform
-      pos: 45.667137,-48.489754
+      pos: 33.576553,-78.39452
       parent: 2
+  - uid: 20022
+    components:
+    - type: Transform
+      pos: 57.381683,-59.359867
+      parent: 2
+- proto: GasFilter
+  entities:
+  - uid: 19476
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasFilterFlipped
   entities:
   - uid: 7895
@@ -58327,14 +60215,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 7819
@@ -58367,14 +60247,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,-60.5
       parent: 2
-- proto: GasMixer
-  entities:
-  - uid: 13545
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-64.5
-      parent: 2
 - proto: GasMixerFlipped
   entities:
   - uid: 7922
@@ -58385,30 +60257,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 12146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,-64.5
-      parent: 2
-  - uid: 12785
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-64.5
-      parent: 2
-  - uid: 12786
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-64.5
-      parent: 2
-  - uid: 12797
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-64.5
-      parent: 2
 - proto: GasOutletInjector
   entities:
   - uid: 7827
@@ -58452,6 +60300,8 @@ entities:
     - type: Transform
       pos: 51.5,-63.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
 - proto: GasPassiveVent
@@ -58461,8 +60311,10 @@ entities:
     - type: Transform
       pos: 53.5,-63.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Secondary
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
+      color: '#FF1212FF'
   - uid: 2889
     components:
     - type: Transform
@@ -58476,6 +60328,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 6353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-37.5
+      parent: 2
   - uid: 7242
     components:
     - type: Transform
@@ -58525,18 +60383,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14763
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-101.5
-      parent: 2
-  - uid: 19314
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-45.5
-      parent: 2
 - proto: GasPipeBend
   entities:
   - uid: 2287
@@ -58562,22 +60408,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 2933
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 67.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 2943
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 65.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3845
     components:
     - type: Transform
@@ -58594,14 +60424,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4096
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4108
     components:
     - type: Transform
@@ -58634,13 +60456,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5788
-    components:
-    - type: Transform
-      pos: 27.5,-97.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5840
     components:
     - type: Transform
@@ -58684,6 +60499,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 7132
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7137
+    components:
+    - type: Transform
+      pos: 42.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7162
     components:
     - type: Transform
@@ -58708,6 +60538,85 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 7302
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 85.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7329
+    components:
+    - type: Transform
+      pos: 91.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 91.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7369
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7376
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 78.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7839
     components:
     - type: Transform
@@ -58752,12 +60661,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7914
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 44.5,-65.5
-      parent: 2
   - uid: 7915
     components:
     - type: Transform
@@ -58782,12 +60685,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7928
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-66.5
-      parent: 2
   - uid: 7932
     components:
     - type: Transform
@@ -58820,22 +60717,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8688
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8763
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-14.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8810
     components:
     - type: Transform
@@ -58852,30 +60733,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8837
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 41.5,-72.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
-  - uid: 8861
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8867
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8874
     components:
     - type: Transform
@@ -58911,10 +60768,10 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 41.5,-69.5
+      pos: 51.5,-61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#03FCD3FF'
+      color: '#FFAD4FFF'
   - uid: 8973
     components:
     - type: Transform
@@ -58955,14 +60812,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9080
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-94.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9083
     components:
     - type: Transform
@@ -59094,6 +60943,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9210
+    components:
+    - type: Transform
+      pos: 53.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
   - uid: 9222
     components:
     - type: Transform
@@ -59109,22 +60965,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9279
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-72.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 9280
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 38.5,-72.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
   - uid: 9370
     components:
     - type: Transform
@@ -59133,14 +60973,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9371
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9374
     components:
     - type: Transform
@@ -59194,6 +61026,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9460
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,-65.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9492
     components:
     - type: Transform
@@ -59247,13 +61087,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9540
-    components:
-    - type: Transform
-      pos: 25.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9587
     components:
     - type: Transform
@@ -59362,14 +61195,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9764
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -48.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9797
     components:
     - type: Transform
@@ -59394,37 +61219,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9870
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-29.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9871
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9872
+  - uid: 9880
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 24.5,-25.5
+      pos: 40.5,-52.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9873
-    components:
-    - type: Transform
-      pos: 25.5,-30.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 9914
     components:
     - type: Transform
@@ -59546,11 +61348,11 @@ entities:
   - uid: 10174
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -48.5,-49.5
+      rot: 1.5707963267948966 rad
+      pos: -51.5,-41.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 10175
     components:
     - type: Transform
@@ -59582,6 +61384,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 10282
+    components:
+    - type: Transform
+      pos: 42.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10323
     components:
     - type: Transform
@@ -59621,22 +61430,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10401
+  - uid: 10405
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-45.5
+      pos: 85.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10402
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#FF1212FF'
   - uid: 10416
     components:
     - type: Transform
@@ -59645,45 +61445,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10419
-    components:
-    - type: Transform
-      pos: 84.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10420
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 84.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10425
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 84.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10435
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10453
     components:
     - type: Transform
@@ -59699,14 +61460,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10468
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -41.5,-65.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10469
     components:
     - type: Transform
@@ -59715,36 +61468,46 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10513
+  - uid: 10596
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 63.5,-52.5
+      pos: 5.5,-17.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10757
+  - uid: 10656
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 37.5,-71.5
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-65.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 10763
+      color: '#FFAD4FFF'
+  - uid: 10662
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 42.5,-72.5
+      pos: 53.5,-66.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#03FCD3FF'
+      color: '#FFAD4FFF'
+  - uid: 10753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -52.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10770
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 51.5,-65.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 10799
@@ -59786,29 +61549,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 11740
-    components:
-    - type: Transform
-      pos: 61.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 11742
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11851
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 12153
     components:
     - type: Transform
@@ -59841,14 +61581,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12580
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -41.5,-64.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 12730
     components:
     - type: Transform
@@ -59904,6 +61636,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 14447
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 14448
     components:
     - type: Transform
@@ -60092,14 +61832,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15418
+  - uid: 15509
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-38.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-16.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 16234
     components:
     - type: Transform
@@ -60116,22 +61856,70 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16885
+  - uid: 16770
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 89.5,-43.5
+      pos: 51.5,-65.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 16896
+      color: '#FFAD4FFF'
+  - uid: 16873
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 41.5,-43.5
+      pos: 50.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16874
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16876
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16877
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16878
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16879
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16885
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16898
     components:
     - type: Transform
@@ -60148,38 +61936,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16907
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 16908
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-30.5
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-56.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16915
+  - uid: 16909
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 27.5,-20.5
+      pos: 52.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 16916
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 16931
     components:
     - type: Transform
@@ -60202,6 +61974,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17261
+    components:
+    - type: Transform
+      pos: 61.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17275
     components:
     - type: Transform
@@ -60225,14 +62012,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17474
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 17597
     components:
     - type: Transform
@@ -60241,18 +62020,105 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17685
+  - uid: 17605
     components:
     - type: Transform
-      pos: 89.5,-47.5
+      pos: 69.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 17999
+      color: '#0335FCFF'
+  - uid: 17644
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-41.5
+      pos: 64.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17685
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17717
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17718
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17719
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17720
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17897
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17898
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17910
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17924
+    components:
+    - type: Transform
+      pos: 65.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17954
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -60288,6 +62154,108 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18061
+    components:
+    - type: Transform
+      pos: 75.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18289
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18292
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18341
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18506
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18508
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18571
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 75.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18598
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18600
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18604
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18605
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18631
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18798
     components:
     - type: Transform
@@ -60301,13 +62269,112 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 53.5,-66.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Secondary
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 18853
+      color: '#FF1212FF'
+  - uid: 18825
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 54.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18826
+    components:
+    - type: Transform
+      pos: 55.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18827
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18829
+    components:
+    - type: Transform
+      pos: 56.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18833
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18837
+    components:
+    - type: Transform
+      pos: 54.5,-51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18878
+    components:
+    - type: Transform
+      pos: 58.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18879
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-55.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18882
+    components:
+    - type: Transform
+      pos: 59.5,-55.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18883
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19057
+    components:
+    - type: Transform
+      pos: 70.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19059
+    components:
+    - type: Transform
+      pos: 71.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19060
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-64.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -60326,6 +62393,184 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 19480
+    components:
+    - type: Transform
+      pos: -40.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19491
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+  - uid: 19581
+    components:
+    - type: Transform
+      pos: 29.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19582
+    components:
+    - type: Transform
+      pos: 30.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19594
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19595
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19790
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19791
+    components:
+    - type: Transform
+      pos: 67.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19793
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19794
+    components:
+    - type: Transform
+      pos: 65.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19795
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19995
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19996
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19997
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19998
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19999
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20000
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -44.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20001
+    components:
+    - type: Transform
+      pos: -44.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20002
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20003
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20011
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20012
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20046
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeFourway
   entities:
   - uid: 3132
@@ -60349,13 +62594,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 5196
-    components:
-    - type: Transform
-      pos: 18.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9486
     components:
     - type: Transform
@@ -60377,11 +62615,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14138
+  - uid: 12146
     components:
     - type: Transform
-      pos: 15.5,-23.5
+      pos: 18.5,-23.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 14490
     components:
     - type: Transform
@@ -60417,6 +62657,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16361
+    components:
+    - type: Transform
+      pos: 63.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16368
+    components:
+    - type: Transform
+      pos: 64.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 16854
     components:
     - type: Transform
@@ -60424,6 +62678,78 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17311
+    components:
+    - type: Transform
+      pos: 66.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17792
+    components:
+    - type: Transform
+      pos: 64.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeManifold
+  entities:
+  - uid: 10223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-65.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#947507FF'
+  - uid: 14251
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeSensorDistribution
+  entities:
+  - uid: 10763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-67.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPipeSensorTEGCold
+  entities:
+  - uid: 17902
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-68.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+- proto: GasPipeSensorTEGHot
+  entities:
+  - uid: 17901
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-70.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+- proto: GasPipeSensorWaste
+  entities:
+  - uid: 10760
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeStraight
   entities:
   - uid: 303
@@ -60486,14 +62812,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 1226
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 1697
     components:
     - type: Transform
@@ -60605,48 +62923,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 53.5,-64.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 2678
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-53.5
-      parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Secondary
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 2725
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 2931
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3051
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-64.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
-  - uid: 3059
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 47.5,-64.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
   - uid: 3060
     components:
     - type: Transform
@@ -60663,14 +62943,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 3062
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 47.5,-63.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
   - uid: 3276
     components:
     - type: Transform
@@ -60691,16 +62963,10 @@ entities:
     - type: Transform
       pos: 51.5,-64.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 3515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3516
     components:
     - type: Transform
@@ -60709,66 +62975,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3518
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3519
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 3557
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3558
-    components:
-    - type: Transform
-      pos: 63.5,-40.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3559
-    components:
-    - type: Transform
-      pos: 63.5,-39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3560
-    components:
-    - type: Transform
-      pos: 64.5,-39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 3562
     components:
     - type: Transform
@@ -60817,30 +63023,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 3668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3763
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 3811
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 3946
     components:
     - type: Transform
@@ -60849,22 +63031,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 3947
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 47.5,-65.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
-  - uid: 3948
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-65.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
   - uid: 4101
     components:
     - type: Transform
@@ -60895,30 +63061,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4187
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 4189
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 4191
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4192
     components:
     - type: Transform
@@ -60927,14 +63069,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4193
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4201
     components:
     - type: Transform
@@ -60951,14 +63085,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4294
     components:
     - type: Transform
@@ -60967,6 +63093,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 4346
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 4516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 4709
     components:
     - type: Transform
@@ -61043,22 +63185,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,-51.5
       parent: 2
-  - uid: 5405
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5407
     components:
     - type: Transform
@@ -61075,14 +63201,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5409
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 5567
     components:
     - type: Transform
@@ -61120,13 +63238,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 6424
-    components:
-    - type: Transform
-      pos: 28.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 6466
     components:
     - type: Transform
@@ -61187,52 +63298,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 47.5,-78.5
       parent: 2
-  - uid: 6935
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 47.5,-76.5
-      parent: 2
-  - uid: 7152
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7154
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7155
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7160
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7164
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 7167
     components:
     - type: Transform
@@ -61240,27 +63305,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7176
+  - uid: 7189
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7177
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7178
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-33.5
+      pos: 43.5,-38.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -61272,35 +63320,99 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7270
+  - uid: 7306
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 61.5,-51.5
+      pos: 77.5,-45.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7282
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7737
+  - uid: 7319
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 53.5,-51.5
+      pos: 84.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7739
+      color: '#FF1212FF'
+  - uid: 7321
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 50.5,-51.5
+      pos: 84.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7330
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7348
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7364
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7375
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7378
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -61458,60 +63570,17 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7879
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-65.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#947507FF'
   - uid: 7885
     components:
     - type: Transform
       pos: 35.5,-65.5
       parent: 2
-  - uid: 7886
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 35.5,-64.5
-      parent: 2
   - uid: 7887
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 35.5,-64.5
       parent: 2
-  - uid: 7888
-    components:
-    - type: Transform
-      pos: 33.5,-65.5
-      parent: 2
-  - uid: 7890
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-64.5
-      parent: 2
-  - uid: 7891
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-64.5
-      parent: 2
-  - uid: 7892
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-64.5
-      parent: 2
-  - uid: 7894
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,-64.5
-      parent: 2
   - uid: 7901
     components:
     - type: Transform
@@ -61558,14 +63627,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,-66.5
       parent: 2
-  - uid: 7951
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8097
     components:
     - type: Transform
@@ -61574,11 +63635,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8140
+  - uid: 8161
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 67.5,-32.5
+      pos: 89.5,-43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -61642,14 +63703,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-75.5
       parent: 2
-  - uid: 8630
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8636
     components:
     - type: Transform
@@ -61710,14 +63763,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8813
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8820
     components:
     - type: Transform
@@ -61726,14 +63771,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8845
+  - uid: 8838
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-16.5
+      pos: 17.5,-24.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 8876
     components:
     - type: Transform
@@ -61753,11 +63797,10 @@ entities:
   - uid: 8880
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-66.5
+      pos: 53.5,-65.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#FFAD4FFF'
   - uid: 8883
     components:
     - type: Transform
@@ -61782,14 +63825,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8887
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-67.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8888
     components:
     - type: Transform
@@ -62676,6 +64711,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 49.5,-65.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 9085
@@ -63312,14 +65349,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9205
     components:
     - type: Transform
@@ -63360,6 +65389,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9227
     components:
     - type: Transform
@@ -63384,21 +65421,19 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9251
+  - uid: 9279
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-48.5
+      pos: 51.5,-63.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9259
+      color: '#FFAD4FFF'
+  - uid: 9280
     components:
     - type: Transform
-      pos: 65.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-65.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9286
     components:
     - type: Transform
@@ -63423,14 +65458,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9360
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9368
     components:
     - type: Transform
@@ -63439,14 +65466,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9375
     components:
     - type: Transform
@@ -63502,14 +65521,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9383
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 71.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9387
     components:
     - type: Transform
@@ -63609,55 +65620,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9406
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9407
-    components:
-    - type: Transform
-      pos: 23.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9408
-    components:
-    - type: Transform
-      pos: 23.5,-18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9409
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9411
-    components:
-    - type: Transform
-      pos: 23.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9412
-    components:
-    - type: Transform
-      pos: 23.5,-14.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9413
-    components:
-    - type: Transform
-      pos: 23.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9414
     components:
     - type: Transform
@@ -63679,14 +65641,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9420
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-29.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9422
     components:
     - type: Transform
@@ -63822,14 +65776,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9454
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9456
     components:
     - type: Transform
@@ -64192,8 +66138,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 53.5,-65.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Secondary
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
+      color: '#FF1212FF'
   - uid: 9535
     components:
     - type: Transform
@@ -64617,13 +66565,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9615
-    components:
-    - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9616
     components:
     - type: Transform
@@ -64742,27 +66683,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9635
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9636
-    components:
-    - type: Transform
-      pos: 64.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9638
-    components:
-    - type: Transform
-      pos: 63.5,-35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9639
     components:
     - type: Transform
@@ -64818,7 +66738,7 @@ entities:
       pos: 83.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 9652
     components:
     - type: Transform
@@ -65012,6 +66932,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9700
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,-65.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9703
     components:
     - type: Transform
@@ -65040,26 +66968,10 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -42.5,-63.5
+      pos: 15.5,-26.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9707
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.5,-64.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9708
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.5,-65.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 9709
     components:
     - type: Transform
@@ -65118,13 +67030,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9722
-    components:
-    - type: Transform
-      pos: 27.5,-27.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9724
     components:
     - type: Transform
@@ -65552,20 +67457,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9793
-    components:
-    - type: Transform
-      pos: 27.5,-28.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9794
-    components:
-    - type: Transform
-      pos: 28.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9799
     components:
     - type: Transform
@@ -65958,83 +67849,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9876
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9877
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-21.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9878
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9879
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9880
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9881
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 25.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9882
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9883
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9884
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-14.5
+      pos: 27.5,-18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -66046,86 +67865,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9889
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9890
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9892
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9893
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-21.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9894
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9895
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9896
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9897
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9898
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9899
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9900
     components:
     - type: Transform
@@ -66148,20 +67887,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9905
-    components:
-    - type: Transform
-      pos: 17.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9907
-    components:
-    - type: Transform
-      pos: 17.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9908
     components:
     - type: Transform
@@ -66184,14 +67909,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9918
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-28.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9919
     components:
     - type: Transform
@@ -66827,13 +68544,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10036
-    components:
-    - type: Transform
-      pos: 30.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10037
     components:
     - type: Transform
@@ -66894,14 +68604,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10049
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10051
     components:
     - type: Transform
@@ -68017,13 +69719,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10266
-    components:
-    - type: Transform
-      pos: 64.5,-35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10269
     components:
     - type: Transform
@@ -68032,21 +69727,98 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10293
+  - uid: 10281
     components:
     - type: Transform
-      pos: 63.5,-36.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10286
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10287
+    components:
+    - type: Transform
+      pos: 25.5,-30.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10289
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10294
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-50.5
+      pos: 25.5,-29.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
+  - uid: 10298
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10299
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10311
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10312
+    components:
+    - type: Transform
+      pos: 25.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10315
+    components:
+    - type: Transform
+      pos: 53.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
   - uid: 10318
     components:
     - type: Transform
@@ -68074,10 +69846,32 @@ entities:
   - uid: 10328
     components:
     - type: Transform
-      pos: 63.5,-33.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-52.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10337
+    components:
+    - type: Transform
+      pos: 25.5,-28.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10338
+    components:
+    - type: Transform
+      pos: 25.5,-27.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10340
+    components:
+    - type: Transform
+      pos: 25.5,-26.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10343
     components:
     - type: Transform
@@ -68366,6 +70160,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10392
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10395
     components:
     - type: Transform
@@ -68373,7 +70175,7 @@ entities:
       pos: 76.5,-45.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10397
     components:
     - type: Transform
@@ -68382,14 +70184,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10399
     components:
     - type: Transform
@@ -68397,7 +70191,7 @@ entities:
       pos: 76.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10400
     components:
     - type: Transform
@@ -68405,7 +70199,7 @@ entities:
       pos: 77.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10403
     components:
     - type: Transform
@@ -68413,7 +70207,7 @@ entities:
       pos: 78.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10404
     components:
     - type: Transform
@@ -68421,7 +70215,7 @@ entities:
       pos: 80.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10406
     components:
     - type: Transform
@@ -68429,7 +70223,7 @@ entities:
       pos: 81.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10407
     components:
     - type: Transform
@@ -68437,7 +70231,7 @@ entities:
       pos: 82.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10412
     components:
     - type: Transform
@@ -68445,7 +70239,7 @@ entities:
       pos: 79.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10413
     components:
     - type: Transform
@@ -68453,15 +70247,15 @@ entities:
       pos: 80.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10414
+      color: '#0335FCFF'
+  - uid: 10415
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 81.5,-44.5
+      pos: 40.5,-42.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10417
     components:
     - type: Transform
@@ -68469,7 +70263,7 @@ entities:
       pos: 82.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10418
     components:
     - type: Transform
@@ -68477,7 +70271,15 @@ entities:
       pos: 83.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
+  - uid: 10419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10422
     components:
     - type: Transform
@@ -68485,7 +70287,7 @@ entities:
       pos: 88.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10423
     components:
     - type: Transform
@@ -68493,15 +70295,7 @@ entities:
       pos: 88.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10426
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 85.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10427
     components:
     - type: Transform
@@ -68509,7 +70303,7 @@ entities:
       pos: 86.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10428
     components:
     - type: Transform
@@ -68517,7 +70311,15 @@ entities:
       pos: 87.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
+  - uid: 10432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10434
     components:
     - type: Transform
@@ -68525,6 +70327,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10437
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10438
     components:
     - type: Transform
@@ -68729,14 +70539,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10511
+  - uid: 10513
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-52.5
+      rot: 3.141592653589793 rad
+      pos: 41.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 10514
     components:
     - type: Transform
@@ -68749,7 +70559,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 63.5,-47.5
+      pos: 27.5,-17.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -68757,24 +70567,26 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 62.5,-44.5
+      pos: 42.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10662
+  - uid: 10597
     components:
     - type: Transform
-      pos: 42.5,-71.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
-  - uid: 10666
-    components:
-    - type: Transform
-      pos: 64.5,-34.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-53.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 10660
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
   - uid: 10667
     components:
     - type: Transform
@@ -68783,30 +70595,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10668
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10669
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10671
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10735
     components:
     - type: Transform
@@ -68839,6 +70627,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10757
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-65.5
+      parent: 2
   - uid: 10758
     components:
     - type: Transform
@@ -68847,14 +70641,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10762
+  - uid: 10768
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-50.5
+      rot: 3.141592653589793 rad
+      pos: 15.5,-27.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 10771
     components:
     - type: Transform
@@ -68863,38 +70657,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10776
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10786
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10800
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-48.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10812
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10813
     components:
     - type: Transform
@@ -68903,14 +70665,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10816
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10886
     components:
     - type: Transform
@@ -68934,94 +70688,30 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 11732
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11733
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11734
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-53.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11735
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11738
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11739
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11750
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11753
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 11828
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 50.5,-65.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 11850
+  - uid: 11946
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-32.5
+      pos: -41.5,-63.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 11957
+  - uid: 11948
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-32.5
+      pos: 17.5,-23.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 12151
     components:
     - type: Transform
@@ -69205,34 +70895,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12799
+  - uid: 12785
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 36.5,-65.5
-      parent: 2
-  - uid: 12828
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
+      pos: 53.5,-64.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12829
+      color: '#FFAD4FFF'
+  - uid: 12796
     components:
     - type: Transform
-      pos: 64.5,-41.5
+      pos: 47.5,-64.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12830
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#03FCD3FF'
   - uid: 12831
     components:
     - type: Transform
@@ -69247,6 +70923,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-76.5
       parent: 2
+  - uid: 12910
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12923
+    components:
+    - type: Transform
+      pos: 18.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 12925
     components:
     - type: Transform
@@ -69259,22 +70950,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 47.5,-79.5
       parent: 2
-  - uid: 12931
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-53.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12932
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 12968
     components:
     - type: Transform
@@ -69298,36 +70973,18 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13155
+  - uid: 13138
     components:
     - type: Transform
-      pos: 23.5,-22.5
+      pos: 17.5,-25.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13156
+      color: '#FF1212FF'
+  - uid: 13207
     components:
     - type: Transform
-      pos: 23.5,-21.5
+      pos: 33.5,-64.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13157
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 24.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13161
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 13235
     components:
     - type: Transform
@@ -69351,20 +71008,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13519
+  - uid: 13521
     components:
     - type: Transform
-      pos: 27.5,-26.5
+      pos: 51.5,-64.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13520
-    components:
-    - type: Transform
-      pos: 27.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FFAD4FFF'
   - uid: 13522
     components:
     - type: Transform
@@ -69437,186 +71087,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13831
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13832
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 13866
     components:
     - type: Transform
-      pos: 38.5,-71.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 13869
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-43.5
+      pos: -41.5,-65.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13870
-    components:
-    - type: Transform
-      pos: 65.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13882
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13895
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13896
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13897
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13898
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13915
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13920
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13921
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13923
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13924
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13925
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13926
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13927
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13928
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13929
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13930
-    components:
-    - type: Transform
-      pos: 67.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13931
-    components:
-    - type: Transform
-      pos: 67.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 14290
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 14443
     components:
     - type: Transform
@@ -69640,14 +71117,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14447
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -41.5,-66.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14457
     components:
     - type: Transform
@@ -70212,14 +71681,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14588
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14589
     components:
     - type: Transform
@@ -70584,14 +72045,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14679
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14681
     components:
     - type: Transform
@@ -70624,13 +72077,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14694
-    components:
-    - type: Transform
-      pos: 27.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14707
     components:
     - type: Transform
@@ -70654,28 +72100,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14732
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 14735
-    components:
-    - type: Transform
-      pos: 65.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 14736
-    components:
-    - type: Transform
-      pos: 65.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14743
     components:
     - type: Transform
@@ -70747,14 +72171,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14804
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 15036
     components:
     - type: Transform
@@ -70787,53 +72203,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15137
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 15139
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 15401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 15402
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 15417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 15428
+  - uid: 15142
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 49.5,-63.5
+      pos: 15.5,-25.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#03FCD3FF'
+      color: '#FF1212FF'
+  - uid: 15416
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -42.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 15428
+    components:
+    - type: Transform
+      pos: -41.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 15620
     components:
     - type: Transform
@@ -70842,6 +72234,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16220
+    components:
+    - type: Transform
+      pos: -40.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16421
     components:
     - type: Transform
@@ -70924,13 +72323,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16878
-    components:
-    - type: Transform
-      pos: 40.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 16884
     components:
     - type: Transform
@@ -70938,13 +72330,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16886
-    components:
-    - type: Transform
-      pos: 43.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 16887
     components:
     - type: Transform
@@ -70959,38 +72344,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16889
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 16890
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 16891
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 43.5,-43.5
+      pos: 51.5,-52.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 16892
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-43.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-55.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 16893
     components:
     - type: Transform
@@ -71007,6 +72376,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16896
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16900
     components:
     - type: Transform
@@ -71017,104 +72394,101 @@ entities:
   - uid: 16902
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16903
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-48.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16904
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-47.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16905
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 50.5,-49.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 16906
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 50.5,-48.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 16909
+      color: '#0335FCFF'
+  - uid: 16907
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 24.5,-29.5
+      pos: 50.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 16910
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-28.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 16911
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-27.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 16912
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-26.5
+      pos: 52.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16913
+  - uid: 16914
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-22.5
+      pos: 50.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16915
+    components:
+    - type: Transform
+      pos: 53.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16916
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16917
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16918
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-42.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16919
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-42.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -71339,6 +72713,267 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16980
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16989
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17084
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17092
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17094
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17105
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17106
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17107
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17110
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17111
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17141
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17152
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17166
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17170
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17211
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17224
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17239
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17241
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17245
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17246
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17264
+    components:
+    - type: Transform
+      pos: 59.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17269
+    components:
+    - type: Transform
+      pos: 62.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17270
+    components:
+    - type: Transform
+      pos: 62.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17276
     components:
     - type: Transform
@@ -71354,6 +72989,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17285
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17289
     components:
     - type: Transform
@@ -71362,43 +73013,147 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17344
+  - uid: 17327
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-52.5
+      pos: 66.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17333
+    components:
+    - type: Transform
+      pos: 66.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17334
+    components:
+    - type: Transform
+      pos: 64.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17340
+    components:
+    - type: Transform
+      pos: 64.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17346
+    components:
+    - type: Transform
+      pos: 64.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17353
+    components:
+    - type: Transform
+      pos: 64.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17375
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 17388
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-53.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 17413
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,-24.5
+      pos: 66.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17414
+  - uid: 17406
+    components:
+    - type: Transform
+      pos: 66.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17410
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17471
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 16.5,-23.5
-      parent: 2
-  - uid: 17475
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
+      pos: 65.5,-46.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17473
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17474
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17475
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17479
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17505
+    components:
+    - type: Transform
+      pos: 66.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17515
+    components:
+    - type: Transform
+      pos: 66.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17538
     components:
     - type: Transform
@@ -71407,6 +73162,83 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17608
+    components:
+    - type: Transform
+      pos: 66.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17641
+    components:
+    - type: Transform
+      pos: 64.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17643
+    components:
+    - type: Transform
+      pos: 64.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17646
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17659
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17661
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17679
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17683
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17684
     components:
     - type: Transform
@@ -71421,16 +73253,100 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,-65.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 17700
+  - uid: 17702
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 48.5,-65.5
+      pos: 68.5,-39.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#0335FCFF'
+  - uid: 17721
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17722
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17731
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17733
+    components:
+    - type: Transform
+      pos: 64.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17734
+    components:
+    - type: Transform
+      pos: 64.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17766
+    components:
+    - type: Transform
+      pos: 64.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17767
+    components:
+    - type: Transform
+      pos: 64.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17770
+    components:
+    - type: Transform
+      pos: 63.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17781
+    components:
+    - type: Transform
+      pos: 63.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17818
     components:
     - type: Transform
@@ -71439,30 +73355,278 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17943
+  - uid: 17821
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 42.5,-49.5
+      pos: 61.5,-33.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17997
+  - uid: 17851
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 68.5,-46.5
+      pos: 60.5,-33.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18010
+  - uid: 17853
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 66.5,-47.5
+      pos: 62.5,-32.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17855
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17866
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17870
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17871
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17877
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17879
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17880
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17884
+    components:
+    - type: Transform
+      pos: 51.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17885
+    components:
+    - type: Transform
+      pos: 51.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17886
+    components:
+    - type: Transform
+      pos: 51.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17887
+    components:
+    - type: Transform
+      pos: 52.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17893
+    components:
+    - type: Transform
+      pos: 52.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17894
+    components:
+    - type: Transform
+      pos: 52.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17896
+    components:
+    - type: Transform
+      pos: 52.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17925
+    components:
+    - type: Transform
+      pos: 66.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17944
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17946
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17947
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17950
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17951
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17952
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17953
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17958
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17961
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17962
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17963
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17964
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18026
     components:
     - type: Transform
@@ -71502,6 +73666,333 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18154
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18166
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18215
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18218
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18220
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18221
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18261
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18265
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-26.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18270
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-27.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18271
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-28.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18272
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-29.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18283
+    components:
+    - type: Transform
+      pos: 29.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18364
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18365
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18366
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18474
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18487
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 75.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18497
+    components:
+    - type: Transform
+      pos: 31.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18503
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18505
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18516
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18517
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18519
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18520
+    components:
+    - type: Transform
+      pos: 32.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18521
+    components:
+    - type: Transform
+      pos: 32.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18522
+    components:
+    - type: Transform
+      pos: 32.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18542
     components:
     - type: Transform
@@ -71518,6 +74009,142 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18629
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18633
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18668
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18669
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18670
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18671
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18672
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18682
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18701
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18740
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18757
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18785
     components:
     - type: Transform
@@ -71526,6 +74153,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 18788
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18791
     components:
     - type: Transform
@@ -71553,27 +74196,83 @@ entities:
   - uid: 18807
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18808
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-54.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18829
+  - uid: 18809
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 85.5,-43.5
+      pos: 61.5,-56.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
+  - uid: 18810
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18816
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18817
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18819
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18820
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18821
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18822
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18830
     components:
     - type: Transform
@@ -71581,7 +74280,7 @@ entities:
       pos: 86.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 18831
     components:
     - type: Transform
@@ -71589,7 +74288,73 @@ entities:
       pos: 87.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
+  - uid: 18835
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18935
+    components:
+    - type: Transform
+      pos: 71.5,-58.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19022
+    components:
+    - type: Transform
+      pos: 71.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19037
+    components:
+    - type: Transform
+      pos: 71.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19038
+    components:
+    - type: Transform
+      pos: 71.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19039
+    components:
+    - type: Transform
+      pos: 71.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19044
+    components:
+    - type: Transform
+      pos: 71.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19045
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19046
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 19263
     components:
     - type: Transform
@@ -71628,18 +74393,941 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,-66.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Secondary
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
-- proto: GasPipeTJunction
-  entities:
-  - uid: 1072
+      color: '#FF1212FF'
+  - uid: 19607
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-51.5
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19642
+    components:
+    - type: Transform
+      pos: 29.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19643
+    components:
+    - type: Transform
+      pos: 30.5,-97.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 19645
+    components:
+    - type: Transform
+      pos: 30.5,-96.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19648
+    components:
+    - type: Transform
+      pos: 30.5,-95.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19649
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19681
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19682
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19684
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19685
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19686
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19687
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19688
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19689
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19690
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19691
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19692
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19693
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19695
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19696
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19701
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19703
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19704
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19706
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19708
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19710
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19711
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19712
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19713
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19715
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19716
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19718
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19719
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19720
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19781
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19784
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19785
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19786
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19792
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19859
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19860
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19863
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19864
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19865
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19866
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19867
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19868
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19869
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19973
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19974
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -51.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19975
+    components:
+    - type: Transform
+      pos: -50.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19976
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19977
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -48.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19978
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -46.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19979
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -45.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19980
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -42.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19982
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19983
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -40.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19984
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19985
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -38.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19986
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19987
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19988
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19989
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19990
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19991
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19993
+    components:
+    - type: Transform
+      pos: -34.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19994
+    components:
+    - type: Transform
+      pos: -33.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20004
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -47.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20013
+    components:
+    - type: Transform
+      pos: 60.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20014
+    components:
+    - type: Transform
+      pos: 60.5,-58.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20025
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20026
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20027
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20028
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20029
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20030
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20031
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20032
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20033
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20034
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20035
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -51.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20036
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20037
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -49.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20038
+    components:
+    - type: Transform
+      pos: -52.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20039
+    components:
+    - type: Transform
+      pos: -52.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20040
+    components:
+    - type: Transform
+      pos: -52.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20041
+    components:
+    - type: Transform
+      pos: -52.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20042
+    components:
+    - type: Transform
+      pos: -52.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20043
+    components:
+    - type: Transform
+      pos: -52.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20044
+    components:
+    - type: Transform
+      pos: -52.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20045
+    components:
+    - type: Transform
+      pos: -52.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeStraightAlt1
+  entities:
+  - uid: 15414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 15415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19497
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeTJunction
+  entities:
   - uid: 1463
     components:
     - type: Transform
@@ -71678,14 +75366,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 2724
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 2811
     components:
     - type: Transform
@@ -71700,26 +75380,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,-77.5
       parent: 2
-  - uid: 3768
+  - uid: 4200
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3778
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 3812
-    components:
-    - type: Transform
-      pos: 51.5,-52.5
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-50.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -71731,29 +75396,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5197
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5404
-    components:
-    - type: Transform
-      pos: 52.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5886
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 6356
     components:
     - type: Transform
@@ -71777,6 +75419,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 6905
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 6906
+    components:
+    - type: Transform
+      pos: 27.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 7265
     components:
     - type: Transform
@@ -71785,6 +75442,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 7341
+    components:
+    - type: Transform
+      pos: 81.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7447
     components:
     - type: Transform
@@ -71801,20 +75465,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7743
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7884
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-64.5
-      parent: 2
   - uid: 7889
     components:
     - type: Transform
@@ -71829,11 +75479,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7913
-    components:
-    - type: Transform
-      pos: 44.5,-64.5
-      parent: 2
   - uid: 7931
     components:
     - type: Transform
@@ -71842,22 +75487,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8195
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8435
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8436
     components:
     - type: Transform
@@ -71888,14 +75517,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8795
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-69.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
   - uid: 8803
     components:
     - type: Transform
@@ -71912,14 +75533,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8838
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-71.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
   - uid: 8840
     components:
     - type: Transform
@@ -72154,14 +75767,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9217
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9223
     components:
     - type: Transform
@@ -72178,14 +75783,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9226
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9308
     components:
     - type: Transform
@@ -72359,14 +75956,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9637
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9644
     components:
     - type: Transform
@@ -72398,14 +75987,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9677
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.5,-66.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9698
     components:
     - type: Transform
@@ -72414,6 +75995,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9707
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
   - uid: 9720
     components:
     - type: Transform
@@ -72492,14 +76081,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9807
     components:
     - type: Transform
@@ -72578,19 +76159,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9887
+  - uid: 9879
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9888
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: 27.5,-24.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -72647,14 +76220,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10042
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-14.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10048
     components:
     - type: Transform
@@ -72793,14 +76358,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10223
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -40.5,-64.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10241
     components:
     - type: Transform
@@ -72809,11 +76366,65 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 10285
+    components:
+    - type: Transform
+      pos: 29.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10292
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-32.5
+      rot: 3.141592653589793 rad
+      pos: 50.5,-51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10304
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10314
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10324
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10327
+    components:
+    - type: Transform
+      pos: 51.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -72833,21 +76444,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10396
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10405
-    components:
-    - type: Transform
-      pos: 78.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10408
     components:
     - type: Transform
@@ -72855,20 +76451,12 @@ entities:
       pos: 79.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10432
+      color: '#FF1212FF'
+  - uid: 10420
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10437
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 41.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -72879,26 +76467,24 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10760
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-71.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 10783
+  - uid: 10468
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 63.5,-34.5
+      pos: 33.5,-65.5
+      parent: 2
+  - uid: 10562
+    components:
+    - type: Transform
+      pos: 28.5,-22.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10785
+  - uid: 10669
     components:
     - type: Transform
-      pos: 59.5,-51.5
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -72910,13 +76496,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10817
-    components:
-    - type: Transform
-      pos: 60.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 12154
     components:
     - type: Transform
@@ -72949,6 +76528,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 12580
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-28.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 12780
     components:
     - type: Transform
@@ -72957,36 +76544,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 12822
+  - uid: 12795
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 64.5,-40.5
+      pos: 49.5,-64.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12930
+      color: '#03FCD3FF'
+  - uid: 12797
     components:
     - type: Transform
-      pos: 65.5,-41.5
+      rot: 3.141592653589793 rad
+      pos: -41.5,-66.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13154
+  - uid: 12880
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-23.5
+      pos: 16.5,-23.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13162
-    components:
-    - type: Transform
-      pos: 28.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#03FCD3FF'
   - uid: 13234
     components:
     - type: Transform
@@ -73003,22 +76583,38 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13521
+  - uid: 13914
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -40.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 14138
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 14298
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 17.5,-24.5
+      pos: -33.5,-14.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13922
+      color: '#0335FCFF'
+  - uid: 14318
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-23.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#03FCD3FF'
   - uid: 14468
     components:
     - type: Transform
@@ -73121,22 +76717,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14602
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 14641
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14660
     components:
     - type: Transform
@@ -73177,30 +76757,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15138
+  - uid: 15344
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-42.5
+      pos: 60.5,-56.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-69.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
-  - uid: 15416
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-69.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF9D00FF'
   - uid: 16096
     components:
     - type: Transform
@@ -73209,6 +76772,38 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16360
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16424
     components:
     - type: Transform
@@ -73264,11 +76859,43 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16914
+  - uid: 16886
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16889
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16890
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 27.5,-21.5
+      pos: 50.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16913
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-46.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -73287,32 +76914,44 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17409
+  - uid: 17093
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-23.5
-      parent: 2
-  - uid: 17410
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-24.5
-      parent: 2
-  - uid: 17473
-    components:
-    - type: Transform
-      pos: 63.5,-43.5
+      pos: 60.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17504
+  - uid: 17109
     components:
     - type: Transform
-      pos: 67.5,-43.5
+      pos: 59.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 17682
     components:
     - type: Transform
@@ -73321,6 +76960,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17778
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 17819
     components:
     - type: Transform
@@ -73329,6 +76984,50 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17859
+    components:
+    - type: Transform
+      pos: 58.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17860
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17861
+    components:
+    - type: Transform
+      pos: 56.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17862
+    components:
+    - type: Transform
+      pos: 57.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17878
+    components:
+    - type: Transform
+      pos: 53.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18060
     components:
     - type: Transform
@@ -73336,6 +77035,98 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18167
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18315
+    components:
+    - type: Transform
+      pos: 25.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18405
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18419
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18509
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18615
+    components:
+    - type: Transform
+      pos: 32.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18630
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19478
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 20016
+    components:
+    - type: Transform
+      pos: 58.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20023
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -48.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20024
+    components:
+    - type: Transform
+      pos: -48.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPort
   entities:
   - uid: 5032
@@ -73354,17 +77145,25 @@ entities:
     - type: Transform
       pos: -18.5,-24.5
       parent: 2
-  - uid: 7181
-    components:
-    - type: Transform
-      pos: 47.5,-74.5
-      parent: 2
   - uid: 7699
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 45.5,-77.5
       parent: 2
+  - uid: 12870
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 47.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 12871
+    components:
+    - type: Transform
+      pos: 47.5,-75.5
+      parent: 2
   - uid: 13329
     components:
     - type: Transform
@@ -73376,12 +77175,30 @@ entities:
     - type: Transform
       pos: 49.5,-74.5
       parent: 2
-  - uid: 14762
+  - uid: 19971
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 49.5,-101.5
+      pos: -54.5,-25.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20017
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20018
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPressurePump
   entities:
   - uid: 5046
@@ -73441,23 +77258,33 @@ entities:
     - type: Transform
       pos: 33.5,-63.5
       parent: 2
-  - uid: 10768
+  - uid: 10655
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-71.5
+      rot: 3.141592653589793 rad
+      pos: 49.5,-77.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#03FCD3FF'
-  - uid: 11946
+  - uid: 13135
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 38.5,-71.5
+      pos: 48.5,-65.5
       parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Tertiary
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
-  - uid: 17415
+      color: '#947507FF'
+  - uid: 15787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-66.5
+      parent: 2
+    - type: AtmosPipeLayers
+      pipeLayer: Secondary
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17412
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -73465,16 +77292,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 19309
+  - uid: 19972
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.5,-66.5
+      rot: 1.5707963267948966 rad
+      pos: -53.5,-25.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
+      color: '#0335FCFF'
+  - uid: 20015
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasThermoMachineFreezer
   entities:
+  - uid: 5297
+    components:
+    - type: Transform
+      pos: 44.5,-36.5
+      parent: 2
   - uid: 13437
     components:
     - type: Transform
@@ -73493,12 +77333,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,-25.5
       parent: 2
-  - uid: 19313
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-45.5
-      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
 - proto: GasThermoMachineHeater
   entities:
   - uid: 14305
@@ -73536,16 +77372,12 @@ entities:
       color: '#FF1212FF'
     - type: GasValve
       open: False
-  - uid: 12880
+  - uid: 12794
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-65.5
+      rot: 3.141592653589793 rad
+      pos: 47.5,-76.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#947507FF'
-    - type: GasValve
-      open: False
   - uid: 12884
     components:
     - type: Transform
@@ -73554,13 +77386,6 @@ entities:
       parent: 2
     - type: GasValve
       open: False
-  - uid: 12885
-    components:
-    - type: Transform
-      pos: 47.5,-75.5
-      parent: 2
-    - type: GasValve
-      open: False
 - proto: GasVentPump
   entities:
   - uid: 518
@@ -73595,6 +77420,28 @@ entities:
       - 469
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 582
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19883
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 591
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 813
     components:
     - type: Transform
@@ -73638,26 +77485,6 @@ entities:
       - 17282
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3398
-    components:
-    - type: Transform
-      pos: 58.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7131
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3403
-    components:
-    - type: Transform
-      pos: 51.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3424
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3444
     components:
     - type: Transform
@@ -73669,52 +77496,15 @@ entities:
       - 8816
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3552
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3553
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-41.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7952
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4170
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 64.5,-18.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5414
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-47.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 10295
+      - 18059
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5789
@@ -73735,17 +77525,6 @@ entities:
       - 7245
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7114
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 7448
     components:
     - type: Transform
@@ -73773,6 +77552,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,-61.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19220
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8453
+    components:
+    - type: Transform
+      pos: 41.5,-37.5
+      parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8616
@@ -74010,6 +77799,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,-34.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6411
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8753
@@ -74045,28 +77837,6 @@ entities:
       - 6410
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8777
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-21.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8781
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6353
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8818
     components:
     - type: Transform
@@ -74075,7 +77845,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6358
+      - 19876
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8831
@@ -74086,8 +77856,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3897
-      - 9200
+      - 19835
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8841
@@ -74128,9 +77897,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-23.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8859
@@ -74188,6 +77954,16 @@ entities:
       - 6406
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9311
+    components:
+    - type: Transform
+      pos: 91.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9351
     components:
     - type: Transform
@@ -74196,16 +77972,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3446
-      - 3427
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-32.5
-      parent: 2
+      - 19909
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9463
@@ -74265,13 +78032,9 @@ entities:
     - type: Transform
       pos: -46.5,-62.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9700
-    components:
-    - type: Transform
-      pos: -42.5,-62.5
-      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19961
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9701
@@ -74279,6 +78042,9 @@ entities:
     - type: Transform
       pos: -38.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19964
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9702
@@ -74287,6 +78053,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -46.5,-67.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19963
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9819
@@ -74318,7 +78087,6 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9216
       - 10429
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -74330,7 +78098,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9040
+      - 19853
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9874
@@ -74377,15 +78145,15 @@ entities:
       - 469
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10059
+  - uid: 10279
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-50.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-55.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9241
+      - 16342
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10341
@@ -74405,19 +78173,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9403
+      - 19884
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10421
-    components:
-    - type: Transform
-      pos: 89.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10473
     components:
     - type: Transform
@@ -74427,25 +78185,28 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5107
+      - 12980
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10751
+  - uid: 10832
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10796
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-57.5
+      pos: -41.5,-62.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8124
+      - 19962
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12242
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-98.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14759
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12421
@@ -74467,28 +78228,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12821
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-16.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14636
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13894
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7950
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14539
     components:
     - type: Transform
@@ -74562,22 +78301,15 @@ entities:
       - 14460
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14601
-    components:
-    - type: Transform
-      pos: 23.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18598
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14634
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19836
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14654
@@ -74606,17 +78338,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-12.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 14697
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-43.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 164
+      - 15885
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14713
@@ -74652,6 +78376,17 @@ entities:
       - 7310
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15401
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14636
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 15635
     components:
     - type: Transform
@@ -74674,15 +78409,26 @@ entities:
       - 2110
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16879
+  - uid: 16872
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 31.5,-14.5
+      pos: 51.5,-50.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 19354
+      - 3424
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16910
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-46.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16312
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16964
@@ -74696,14 +78442,113 @@ entities:
       - 9198
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17679
+  - uid: 17265
     components:
     - type: Transform
-      pos: 30.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: 59.5,-49.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18869
+      - 19905
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-47.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16343
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16356
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16345
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17907
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16354
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16353
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17913
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16344
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17957
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16346
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17992
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17993
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18056
@@ -74727,6 +78572,39 @@ entities:
       - 18493
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7582
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10761
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16367
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18545
     components:
     - type: Transform
@@ -74738,6 +78616,61 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 364
+  - uid: 18554
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18665
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-13.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18736
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18681
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18725
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-15.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18789
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19880
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18796
     components:
     - type: Transform
@@ -74748,22 +78681,17 @@ entities:
       - 1876
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18809
+  - uid: 19064
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-64.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19917
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18833
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 78.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 19353
     components:
     - type: Transform
@@ -74771,8 +78699,51 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 19871
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 19874
+    components:
+    - type: Transform
+      pos: 70.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 6358
+  - uid: 20047
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-50.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9195
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasVentScrubber
   entities:
+  - uid: 1104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16367
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 1796
     components:
     - type: Transform
@@ -74790,6 +78761,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 66.5,-20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18059
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2406
@@ -74820,6 +78794,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 75.5,-22.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19876
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3185
@@ -74862,18 +78839,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3446
-      - 3427
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 4200
-    components:
-    - type: Transform
-      pos: 58.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
+      - 19909
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5168
@@ -74885,19 +78851,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5159
-  - uid: 5413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5830
     components:
     - type: Transform
       pos: -37.5,-61.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19964
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6133
@@ -74922,26 +78883,22 @@ entities:
       - 572
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 6670
+  - uid: 7074
+    components:
+    - type: Transform
+      pos: 43.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7594
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 28.5,-25.5
+      pos: 91.5,-48.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6353
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7105
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
+      - 10839
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7700
@@ -74955,25 +78912,6 @@ entities:
       - 2110
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7751
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-46.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 10295
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7752
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8437
     components:
     - type: Transform
@@ -74985,14 +78923,17 @@ entities:
       - 7310
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8562
+  - uid: 8480
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 59.5,-43.5
+      pos: 58.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
   - uid: 8612
     components:
     - type: Transform
@@ -75056,7 +78997,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9040
+      - 19853
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8655
@@ -75177,17 +79118,6 @@ entities:
       - 5107
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8709
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 89.5,-48.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8713
     components:
     - type: Transform
@@ -75305,17 +79235,6 @@ entities:
       - 9199
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8774
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-23.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8780
     components:
     - type: Transform
@@ -75337,16 +79256,6 @@ entities:
       - 9241
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8793
-    components:
-    - type: Transform
-      pos: 48.5,-43.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 164
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8832
     components:
     - type: Transform
@@ -75354,10 +79263,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3897
-      - 9200
+      - 19835
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 8839
     components:
     - type: Transform
@@ -75396,9 +79304,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-24.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8860
@@ -75453,6 +79358,17 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9080
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-99.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14759
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9081
     components:
     - type: Transform
@@ -75460,15 +79376,15 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9357
+  - uid: 9247
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-50.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7952
+      - 19883
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9428
@@ -75493,16 +79409,6 @@ entities:
       - 5526
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9496
-    components:
-    - type: Transform
-      pos: 24.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18598
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9546
     components:
     - type: Transform
@@ -75529,6 +79435,9 @@ entities:
     - type: Transform
       pos: -44.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19961
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9796
@@ -75575,24 +79484,6 @@ entities:
       - 469
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10199
-    components:
-    - type: Transform
-      pos: -40.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10267
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-57.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10342
     components:
     - type: Transform
@@ -75610,7 +79501,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9403
+      - 19884
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 10474
@@ -75622,6 +79513,29 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5107
+      - 12980
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10595
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-56.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16342
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10646
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19880
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 11935
@@ -75635,6 +79549,17 @@ entities:
       - 19419
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 11944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,-61.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19962
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 12422
     components:
     - type: Transform
@@ -75646,38 +79571,6 @@ entities:
       - 18013
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13106
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-15.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13910
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-51.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7950
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13917
-    components:
-    - type: Transform
-      pos: 61.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7131
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 14538
     components:
     - type: Transform
@@ -75758,6 +79651,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -45.5,-68.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19963
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 14635
@@ -75766,6 +79662,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-21.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19836
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 14655
@@ -75800,14 +79699,6 @@ entities:
       - 6342
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15129
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 16173
     components:
     - type: Transform
@@ -75851,6 +79742,16 @@ entities:
       - 9234
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16911
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16312
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16959
     components:
     - type: Transform
@@ -75873,6 +79774,39 @@ entities:
       - 1876
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17267
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19905
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17516
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-47.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16356
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17517
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-47.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16343
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17678
     components:
     - type: Transform
@@ -75884,6 +79818,82 @@ entities:
       - 17680
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17695
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16345
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17906
+    components:
+    - type: Transform
+      pos: 59.5,-32.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16354
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16353
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17926
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16344
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17956
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16346
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17990
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17993
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18055
     components:
     - type: Transform
@@ -75895,6 +79905,39 @@ entities:
       - 18818
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 18293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7582
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18398
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-14.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10761
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18525
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18544
     components:
     - type: Transform
@@ -75906,6 +79949,38 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 364
+  - uid: 18666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-15.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18736
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18673
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-24.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18726
+    components:
+    - type: Transform
+      pos: 33.5,-14.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18782
     components:
     - type: Transform
@@ -75922,6 +79997,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,-13.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15885
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18797
@@ -75935,27 +80013,25 @@ entities:
       - 1075
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18810
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18832
     components:
     - type: Transform
       pos: 79.5,-45.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 19267
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,-60.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19220
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19352
@@ -75975,40 +80051,94 @@ entities:
       - 6406
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 19873
+    components:
+    - type: Transform
+      pos: 71.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 6358
+  - uid: 20048
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -51.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9195
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasVolumePump
   entities:
-  - uid: 516
+  - uid: 3342
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-77.5
-      parent: 2
-  - uid: 8958
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 42.5,-70.5
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-64.5
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 11948
+  - uid: 5852
     components:
     - type: Transform
-      pos: 38.5,-70.5
+      rot: 1.5707963267948966 rad
+      pos: 47.5,-68.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF9D00FF'
+      color: '#03FCD3FF'
+  - uid: 12872
+    components:
+    - type: Transform
+      pos: 50.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+  - uid: 12873
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 12874
+    components:
+    - type: Transform
+      pos: 47.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 12885
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-67.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+  - uid: 17418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-70.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
 - proto: Gauze
   entities:
   - uid: 5244
     components:
     - type: Transform
-      pos: 18.370327,-17.477331
+      pos: 18.566528,-17.330505
       parent: 2
   - uid: 14367
     components:
     - type: Transform
-      pos: 18.120327,-17.279278
+      pos: 18.363403,-17.43988
       parent: 2
 - proto: GeigerCounter
   entities:
@@ -76022,71 +80152,118 @@ entities:
     - type: Transform
       pos: -42.492443,-82.46442
       parent: 2
+  - uid: 19670
+    components:
+    - type: Transform
+      pos: -52.550312,-52.240044
+      parent: 2
 - proto: Girder
   entities:
-  - uid: 4080
+  - uid: 3143
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-39.5
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-67.5
       parent: 2
-  - uid: 5810
+  - uid: 3165
     components:
     - type: Transform
-      pos: 69.5,-65.5
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-68.5
       parent: 2
-  - uid: 5814
+  - uid: 3166
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-64.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-70.5
       parent: 2
-  - uid: 5827
+  - uid: 3187
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-63.5
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-66.5
       parent: 2
-  - uid: 5828
+  - uid: 5305
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-62.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-71.5
       parent: 2
-  - uid: 5831
+  - uid: 5310
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-61.5
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-66.5
       parent: 2
-  - uid: 5835
+  - uid: 5320
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-60.5
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-67.5
       parent: 2
-  - uid: 5857
+  - uid: 5734
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-60.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-69.5
       parent: 2
-  - uid: 6294
+  - uid: 5809
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-28.5
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-66.5
+      parent: 2
+  - uid: 6272
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-73.5
       parent: 2
   - uid: 6551
     components:
     - type: Transform
       pos: 78.5,-53.5
       parent: 2
-  - uid: 7116
+  - uid: 7569
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-36.5
+      pos: 79.5,-30.5
+      parent: 2
+  - uid: 13912
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-67.5
+      parent: 2
+  - uid: 14348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-71.5
+      parent: 2
+  - uid: 14351
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-68.5
+      parent: 2
+  - uid: 14568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-72.5
+      parent: 2
+  - uid: 14697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-69.5
+      parent: 2
+  - uid: 14723
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-70.5
       parent: 2
   - uid: 15846
     components:
@@ -76094,6 +80271,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-32.5
       parent: 2
+  - uid: 17370
+    components:
+    - type: Transform
+      pos: -41.5,-76.5
+      parent: 2
 - proto: GlassBoxLaserFilled
   entities:
   - uid: 16844
@@ -76116,7 +80298,7 @@ entities:
       desc: The prophecy tells of a day in the distant future, in which the Truest Janitor will pick up this plunger and eradicate clogging from this world forever more...
       name: lubed cursed golden plunger
     - type: Transform
-      pos: -41.50827,-76.386536
+      pos: -40.50827,-77.386536
       parent: 2
     - type: WarpPoint
       location: cursed golden plunger
@@ -76441,36 +80623,6 @@ entities:
     - type: Transform
       pos: 16.5,-47.5
       parent: 2
-  - uid: 373
-    components:
-    - type: Transform
-      pos: 14.5,-43.5
-      parent: 2
-  - uid: 374
-    components:
-    - type: Transform
-      pos: 15.5,-45.5
-      parent: 2
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 18.5,-45.5
-      parent: 2
-  - uid: 377
-    components:
-    - type: Transform
-      pos: 16.5,-45.5
-      parent: 2
-  - uid: 378
-    components:
-    - type: Transform
-      pos: 17.5,-45.5
-      parent: 2
-  - uid: 379
-    components:
-    - type: Transform
-      pos: 15.5,-40.5
-      parent: 2
   - uid: 422
     components:
     - type: Transform
@@ -76511,32 +80663,12 @@ entities:
     - type: Transform
       pos: -3.5,-23.5
       parent: 2
-  - uid: 528
-    components:
-    - type: Transform
-      pos: 14.5,-40.5
-      parent: 2
-  - uid: 529
-    components:
-    - type: Transform
-      pos: 14.5,-41.5
-      parent: 2
-  - uid: 533
-    components:
-    - type: Transform
-      pos: 15.5,-41.5
-      parent: 2
-  - uid: 535
-    components:
-    - type: Transform
-      pos: 19.5,-44.5
-      parent: 2
-  - uid: 536
-    components:
-    - type: Transform
-      pos: 18.5,-40.5
-      parent: 2
   - uid: 537
+    components:
+    - type: Transform
+      pos: 20.5,-43.5
+      parent: 2
+  - uid: 538
     components:
     - type: Transform
       pos: 20.5,-41.5
@@ -76544,57 +80676,77 @@ entities:
   - uid: 539
     components:
     - type: Transform
-      pos: 16.5,-39.5
+      pos: 19.5,-43.5
       parent: 2
   - uid: 540
     components:
     - type: Transform
-      pos: 17.5,-40.5
+      pos: 20.5,-40.5
       parent: 2
   - uid: 541
     components:
     - type: Transform
-      pos: 19.5,-39.5
+      pos: 19.5,-44.5
       parent: 2
   - uid: 542
     components:
     - type: Transform
-      pos: 20.5,-40.5
+      pos: 14.5,-41.5
       parent: 2
   - uid: 555
     components:
     - type: Transform
-      pos: 18.5,-39.5
+      pos: 15.5,-41.5
       parent: 2
   - uid: 557
     components:
     - type: Transform
-      pos: 17.5,-39.5
+      pos: 15.5,-40.5
       parent: 2
   - uid: 558
     components:
     - type: Transform
-      pos: 19.5,-40.5
+      pos: 14.5,-40.5
       parent: 2
   - uid: 559
     components:
     - type: Transform
-      pos: 20.5,-43.5
+      pos: 14.5,-44.5
       parent: 2
   - uid: 560
     components:
     - type: Transform
-      pos: 20.5,-44.5
+      pos: 18.5,-39.5
+      parent: 2
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 15.5,-39.5
+      parent: 2
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 14.5,-43.5
       parent: 2
   - uid: 565
     components:
     - type: Transform
-      pos: 16.5,-40.5
+      pos: 18.5,-40.5
       parent: 2
   - uid: 566
     components:
     - type: Transform
-      pos: 15.5,-39.5
+      pos: 17.5,-39.5
+      parent: 2
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 17.5,-40.5
+      parent: 2
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 16.5,-40.5
       parent: 2
   - uid: 614
     components:
@@ -76716,11 +80868,6 @@ entities:
     - type: Transform
       pos: -54.5,-39.5
       parent: 2
-  - uid: 714
-    components:
-    - type: Transform
-      pos: -13.5,-75.5
-      parent: 2
   - uid: 716
     components:
     - type: Transform
@@ -76846,25 +80993,10 @@ entities:
     - type: Transform
       pos: -3.5,-15.5
       parent: 2
-  - uid: 860
+  - uid: 893
     components:
     - type: Transform
-      pos: 26.5,-15.5
-      parent: 2
-  - uid: 861
-    components:
-    - type: Transform
-      pos: 26.5,-16.5
-      parent: 2
-  - uid: 862
-    components:
-    - type: Transform
-      pos: 26.5,-19.5
-      parent: 2
-  - uid: 863
-    components:
-    - type: Transform
-      pos: 26.5,-20.5
+      pos: 60.5,-39.5
       parent: 2
   - uid: 940
     components:
@@ -77169,17 +81301,22 @@ entities:
   - uid: 1558
     components:
     - type: Transform
-      pos: 18.5,-44.5
+      pos: 15.5,-45.5
       parent: 2
   - uid: 1559
     components:
     - type: Transform
-      pos: 17.5,-44.5
+      pos: 19.5,-40.5
       parent: 2
   - uid: 1560
     components:
     - type: Transform
-      pos: 19.5,-45.5
+      pos: 19.5,-41.5
+      parent: 2
+  - uid: 1561
+    components:
+    - type: Transform
+      pos: 59.5,-35.5
       parent: 2
   - uid: 1564
     components:
@@ -77199,12 +81336,12 @@ entities:
   - uid: 1596
     components:
     - type: Transform
-      pos: 14.5,-44.5
+      pos: 15.5,-43.5
       parent: 2
   - uid: 1597
     components:
     - type: Transform
-      pos: 15.5,-44.5
+      pos: 16.5,-39.5
       parent: 2
   - uid: 1634
     components:
@@ -77244,12 +81381,32 @@ entities:
   - uid: 1642
     components:
     - type: Transform
-      pos: 15.5,-43.5
+      pos: 17.5,-44.5
       parent: 2
   - uid: 1644
     components:
     - type: Transform
-      pos: 16.5,-44.5
+      pos: 18.5,-45.5
+      parent: 2
+  - uid: 1645
+    components:
+    - type: Transform
+      pos: 19.5,-42.5
+      parent: 2
+  - uid: 1646
+    components:
+    - type: Transform
+      pos: 20.5,-42.5
+      parent: 2
+  - uid: 1647
+    components:
+    - type: Transform
+      pos: 19.5,-45.5
+      parent: 2
+  - uid: 1648
+    components:
+    - type: Transform
+      pos: 20.5,-44.5
       parent: 2
   - uid: 1659
     components:
@@ -77281,6 +81438,16 @@ entities:
     - type: Transform
       pos: -30.5,-46.5
       parent: 2
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: 18.5,-44.5
+      parent: 2
+  - uid: 1668
+    components:
+    - type: Transform
+      pos: 16.5,-44.5
+      parent: 2
   - uid: 1671
     components:
     - type: Transform
@@ -77331,6 +81498,11 @@ entities:
     - type: Transform
       pos: -37.5,-46.5
       parent: 2
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
   - uid: 1682
     components:
     - type: Transform
@@ -77356,11 +81528,26 @@ entities:
     - type: Transform
       pos: -40.5,-43.5
       parent: 2
+  - uid: 1688
+    components:
+    - type: Transform
+      pos: 19.5,-39.5
+      parent: 2
+  - uid: 1692
+    components:
+    - type: Transform
+      pos: 16.5,-45.5
+      parent: 2
   - uid: 1693
     components:
     - type: Transform
       pos: 26.5,-40.5
       parent: 2
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: 15.5,-44.5
+      parent: 2
   - uid: 1703
     components:
     - type: Transform
@@ -77406,6 +81593,12 @@ entities:
     - type: Transform
       pos: -55.5,-45.5
       parent: 2
+  - uid: 1823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-12.5
+      parent: 2
   - uid: 1824
     components:
     - type: Transform
@@ -77571,6 +81764,12 @@ entities:
     - type: Transform
       pos: 56.5,-63.5
       parent: 2
+  - uid: 2228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-46.5
+      parent: 2
   - uid: 2231
     components:
     - type: Transform
@@ -78091,21 +82290,6 @@ entities:
     - type: Transform
       pos: 0.5,-39.5
       parent: 2
-  - uid: 3117
-    components:
-    - type: Transform
-      pos: 76.5,-63.5
-      parent: 2
-  - uid: 3118
-    components:
-    - type: Transform
-      pos: 76.5,-64.5
-      parent: 2
-  - uid: 3119
-    components:
-    - type: Transform
-      pos: 76.5,-65.5
-      parent: 2
   - uid: 3120
     components:
     - type: Transform
@@ -78131,15 +82315,15 @@ entities:
     - type: Transform
       pos: 75.5,-73.5
       parent: 2
-  - uid: 3128
+  - uid: 3151
     components:
     - type: Transform
-      pos: 73.5,-72.5
+      pos: 105.5,-35.5
       parent: 2
-  - uid: 3129
+  - uid: 3152
     components:
     - type: Transform
-      pos: 73.5,-73.5
+      pos: 104.5,-33.5
       parent: 2
   - uid: 3205
     components:
@@ -78166,30 +82350,20 @@ entities:
     - type: Transform
       pos: -2.5,-25.5
       parent: 2
-  - uid: 3473
-    components:
-    - type: Transform
-      pos: 78.5,-63.5
-      parent: 2
   - uid: 3483
     components:
     - type: Transform
       pos: 80.5,-22.5
       parent: 2
-  - uid: 3492
+  - uid: 3523
     components:
     - type: Transform
-      pos: 80.5,-47.5
+      pos: 57.5,-25.5
       parent: 2
-  - uid: 3495
+  - uid: 3550
     components:
     - type: Transform
-      pos: 80.5,-42.5
-      parent: 2
-  - uid: 3502
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
+      pos: 61.5,-46.5
       parent: 2
   - uid: 3595
     components:
@@ -78201,26 +82375,42 @@ entities:
     - type: Transform
       pos: 51.5,-53.5
       parent: 2
-  - uid: 3620
-    components:
-    - type: Transform
-      pos: 53.5,-53.5
-      parent: 2
   - uid: 3639
     components:
     - type: Transform
       pos: -29.5,-65.5
       parent: 2
+  - uid: 3734
+    components:
+    - type: Transform
+      pos: 104.5,-57.5
+      parent: 2
+  - uid: 3775
+    components:
+    - type: Transform
+      pos: 105.5,-56.5
+      parent: 2
+  - uid: 3799
+    components:
+    - type: Transform
+      pos: 105.5,-36.5
+      parent: 2
+  - uid: 3855
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 101.5,-61.5
+      parent: 2
+  - uid: 3922
+    components:
+    - type: Transform
+      pos: 105.5,-34.5
+      parent: 2
   - uid: 3926
     components:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
-  - uid: 3927
-    components:
-    - type: Transform
-      pos: 37.5,-16.5
-      parent: 2
   - uid: 3929
     components:
     - type: Transform
@@ -78231,11 +82421,6 @@ entities:
     - type: Transform
       pos: 81.5,-33.5
       parent: 2
-  - uid: 3936
-    components:
-    - type: Transform
-      pos: 37.5,-17.5
-      parent: 2
   - uid: 3937
     components:
     - type: Transform
@@ -78296,11 +82481,6 @@ entities:
     - type: Transform
       pos: 2.5,-40.5
       parent: 2
-  - uid: 4253
-    components:
-    - type: Transform
-      pos: 31.5,-13.5
-      parent: 2
   - uid: 4256
     components:
     - type: Transform
@@ -78311,11 +82491,6 @@ entities:
     - type: Transform
       pos: -1.5,-40.5
       parent: 2
-  - uid: 4258
-    components:
-    - type: Transform
-      pos: -12.5,-75.5
-      parent: 2
   - uid: 4301
     components:
     - type: Transform
@@ -78461,11 +82636,6 @@ entities:
     - type: Transform
       pos: 40.5,-57.5
       parent: 2
-  - uid: 4465
-    components:
-    - type: Transform
-      pos: 78.5,-65.5
-      parent: 2
   - uid: 4520
     components:
     - type: Transform
@@ -78531,11 +82701,6 @@ entities:
     - type: Transform
       pos: 45.5,-55.5
       parent: 2
-  - uid: 4634
-    components:
-    - type: Transform
-      pos: 78.5,-64.5
-      parent: 2
   - uid: 4655
     components:
     - type: Transform
@@ -78591,6 +82756,11 @@ entities:
     - type: Transform
       pos: 80.5,-59.5
       parent: 2
+  - uid: 5228
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 2
   - uid: 5229
     components:
     - type: Transform
@@ -78601,6 +82771,11 @@ entities:
     - type: Transform
       pos: 7.5,-13.5
       parent: 2
+  - uid: 5415
+    components:
+    - type: Transform
+      pos: 59.5,-25.5
+      parent: 2
   - uid: 5668
     components:
     - type: Transform
@@ -78621,32 +82796,25 @@ entities:
     - type: Transform
       pos: 80.5,-31.5
       parent: 2
+  - uid: 6023
+    components:
+    - type: Transform
+      pos: 83.5,-45.5
+      parent: 2
   - uid: 6094
     components:
     - type: Transform
       pos: 43.5,-12.5
       parent: 2
-  - uid: 6098
-    components:
-    - type: Transform
-      pos: 74.5,-53.5
-      parent: 2
   - uid: 6237
     components:
     - type: Transform
       pos: 39.5,-9.5
       parent: 2
-  - uid: 6244
+  - uid: 6280
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-43.5
-      parent: 2
-  - uid: 6248
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-42.5
+      pos: 56.5,-40.5
       parent: 2
   - uid: 6302
     components:
@@ -78873,185 +83041,20 @@ entities:
     - type: Transform
       pos: 98.5,-31.5
       parent: 2
-  - uid: 6368
-    components:
-    - type: Transform
-      pos: 102.5,-32.5
-      parent: 2
-  - uid: 6369
-    components:
-    - type: Transform
-      pos: 102.5,-33.5
-      parent: 2
-  - uid: 6370
-    components:
-    - type: Transform
-      pos: 103.5,-34.5
-      parent: 2
-  - uid: 6371
-    components:
-    - type: Transform
-      pos: 103.5,-35.5
-      parent: 2
-  - uid: 6372
-    components:
-    - type: Transform
-      pos: 103.5,-36.5
-      parent: 2
   - uid: 6373
-    components:
-    - type: Transform
-      pos: 103.5,-37.5
-      parent: 2
-  - uid: 6374
-    components:
-    - type: Transform
-      pos: 104.5,-39.5
-      parent: 2
-  - uid: 6375
     components:
     - type: Transform
       pos: 104.5,-40.5
       parent: 2
-  - uid: 6376
-    components:
-    - type: Transform
-      pos: 104.5,-41.5
-      parent: 2
-  - uid: 6377
-    components:
-    - type: Transform
-      pos: 104.5,-43.5
-      parent: 2
-  - uid: 6378
-    components:
-    - type: Transform
-      pos: 104.5,-44.5
-      parent: 2
-  - uid: 6379
-    components:
-    - type: Transform
-      pos: 104.5,-45.5
-      parent: 2
-  - uid: 6380
-    components:
-    - type: Transform
-      pos: 104.5,-48.5
-      parent: 2
-  - uid: 6381
-    components:
-    - type: Transform
-      pos: 104.5,-49.5
-      parent: 2
-  - uid: 6382
-    components:
-    - type: Transform
-      pos: 104.5,-51.5
-      parent: 2
-  - uid: 6383
-    components:
-    - type: Transform
-      pos: 103.5,-52.5
-      parent: 2
-  - uid: 6384
-    components:
-    - type: Transform
-      pos: 103.5,-55.5
-      parent: 2
-  - uid: 6385
-    components:
-    - type: Transform
-      pos: 103.5,-56.5
-      parent: 2
-  - uid: 6386
-    components:
-    - type: Transform
-      pos: 102.5,-57.5
-      parent: 2
-  - uid: 6387
-    components:
-    - type: Transform
-      pos: 102.5,-58.5
-      parent: 2
-  - uid: 6388
-    components:
-    - type: Transform
-      pos: 100.5,-58.5
-      parent: 2
-  - uid: 6389
-    components:
-    - type: Transform
-      pos: 100.5,-57.5
-      parent: 2
-  - uid: 6390
-    components:
-    - type: Transform
-      pos: 101.5,-55.5
-      parent: 2
-  - uid: 6391
-    components:
-    - type: Transform
-      pos: 101.5,-54.5
-      parent: 2
-  - uid: 6392
-    components:
-    - type: Transform
-      pos: 101.5,-53.5
-      parent: 2
-  - uid: 6393
-    components:
-    - type: Transform
-      pos: 102.5,-50.5
-      parent: 2
-  - uid: 6394
-    components:
-    - type: Transform
-      pos: 102.5,-49.5
-      parent: 2
-  - uid: 6395
-    components:
-    - type: Transform
-      pos: 102.5,-46.5
-      parent: 2
-  - uid: 6396
-    components:
-    - type: Transform
-      pos: 102.5,-45.5
-      parent: 2
-  - uid: 6397
-    components:
-    - type: Transform
-      pos: 102.5,-44.5
-      parent: 2
   - uid: 6398
     components:
     - type: Transform
-      pos: 102.5,-41.5
+      pos: 58.5,-46.5
       parent: 2
-  - uid: 6399
+  - uid: 6418
     components:
     - type: Transform
-      pos: 102.5,-40.5
-      parent: 2
-  - uid: 6400
-    components:
-    - type: Transform
-      pos: 101.5,-37.5
-      parent: 2
-  - uid: 6401
-    components:
-    - type: Transform
-      pos: 101.5,-36.5
-      parent: 2
-  - uid: 6402
-    components:
-    - type: Transform
-      pos: 100.5,-34.5
-      parent: 2
-  - uid: 6403
-    components:
-    - type: Transform
-      pos: 100.5,-33.5
+      pos: 64.5,-49.5
       parent: 2
   - uid: 6427
     components:
@@ -79588,21 +83591,6 @@ entities:
     - type: Transform
       pos: 52.5,-95.5
       parent: 2
-  - uid: 6893
-    components:
-    - type: Transform
-      pos: 56.5,-99.5
-      parent: 2
-  - uid: 6894
-    components:
-    - type: Transform
-      pos: 56.5,-100.5
-      parent: 2
-  - uid: 6905
-    components:
-    - type: Transform
-      pos: 56.5,-98.5
-      parent: 2
   - uid: 6936
     components:
     - type: Transform
@@ -79613,11 +83601,6 @@ entities:
     - type: Transform
       pos: -6.5,-23.5
       parent: 2
-  - uid: 7000
-    components:
-    - type: Transform
-      pos: 80.5,-48.5
-      parent: 2
   - uid: 7107
     components:
     - type: Transform
@@ -79628,40 +83611,126 @@ entities:
     - type: Transform
       pos: -26.5,-68.5
       parent: 2
+  - uid: 7155
+    components:
+    - type: Transform
+      pos: 67.5,-38.5
+      parent: 2
+  - uid: 7195
+    components:
+    - type: Transform
+      pos: 51.5,-35.5
+      parent: 2
+  - uid: 7209
+    components:
+    - type: Transform
+      pos: 60.5,-38.5
+      parent: 2
+  - uid: 7211
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
+  - uid: 7273
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
+      parent: 2
   - uid: 7287
     components:
     - type: Transform
       pos: 4.5,-14.5
       parent: 2
-  - uid: 7340
+  - uid: 7438
     components:
     - type: Transform
-      pos: 81.5,-45.5
+      pos: 103.5,-36.5
       parent: 2
-  - uid: 7419
+  - uid: 7444
+    components:
+    - type: Transform
+      pos: 103.5,-37.5
+      parent: 2
+  - uid: 7445
+    components:
+    - type: Transform
+      pos: 102.5,-57.5
+      parent: 2
+  - uid: 7449
+    components:
+    - type: Transform
+      pos: 102.5,-33.5
+      parent: 2
+  - uid: 7450
+    components:
+    - type: Transform
+      pos: 103.5,-53.5
+      parent: 2
+  - uid: 7477
+    components:
+    - type: Transform
+      pos: 103.5,-55.5
+      parent: 2
+  - uid: 7478
+    components:
+    - type: Transform
+      pos: 104.5,-49.5
+      parent: 2
+  - uid: 7486
+    components:
+    - type: Transform
+      pos: 104.5,-50.5
+      parent: 2
+  - uid: 7497
+    components:
+    - type: Transform
+      pos: 104.5,-46.5
+      parent: 2
+  - uid: 7498
+    components:
+    - type: Transform
+      pos: 104.5,-44.5
+      parent: 2
+  - uid: 7500
+    components:
+    - type: Transform
+      pos: 104.5,-41.5
+      parent: 2
+  - uid: 7528
     components:
     - type: Transform
       pos: 81.5,-48.5
       parent: 2
-  - uid: 7430
+  - uid: 7530
     components:
     - type: Transform
-      pos: 90.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-44.5
       parent: 2
-  - uid: 7431
+  - uid: 7541
     components:
     - type: Transform
-      pos: 89.5,-44.5
+      pos: 80.5,-49.5
       parent: 2
-  - uid: 7435
+  - uid: 7557
     components:
     - type: Transform
-      pos: 89.5,-46.5
+      pos: 104.5,-45.5
       parent: 2
-  - uid: 7436
+  - uid: 7558
     components:
     - type: Transform
-      pos: 90.5,-46.5
+      pos: 103.5,-54.5
+      parent: 2
+  - uid: 7559
+    components:
+    - type: Transform
+      pos: 102.5,-58.5
+      parent: 2
+  - uid: 7562
+    components:
+    - type: Transform
+      pos: 102.5,-34.5
       parent: 2
   - uid: 7667
     components:
@@ -79688,11 +83757,28 @@ entities:
     - type: Transform
       pos: 25.5,-88.5
       parent: 2
+  - uid: 7971
+    components:
+    - type: Transform
+      pos: 58.5,-25.5
+      parent: 2
   - uid: 8039
     components:
     - type: Transform
       pos: 51.5,-58.5
       parent: 2
+  - uid: 8092
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-46.5
+      parent: 2
+  - uid: 8093
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-44.5
+      parent: 2
   - uid: 8232
     components:
     - type: Transform
@@ -79703,6 +83789,11 @@ entities:
     - type: Transform
       pos: 44.5,-54.5
       parent: 2
+  - uid: 8455
+    components:
+    - type: Transform
+      pos: 69.5,-57.5
+      parent: 2
   - uid: 8508
     components:
     - type: Transform
@@ -79718,25 +83809,31 @@ entities:
     - type: Transform
       pos: 22.5,-71.5
       parent: 2
-  - uid: 8802
+  - uid: 8777
     components:
     - type: Transform
-      pos: 71.5,-56.5
+      pos: 67.5,-46.5
+      parent: 2
+  - uid: 8779
+    components:
+    - type: Transform
+      pos: 63.5,-44.5
+      parent: 2
+  - uid: 8793
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 101.5,-29.5
       parent: 2
   - uid: 9282
     components:
     - type: Transform
       pos: 59.5,-22.5
       parent: 2
-  - uid: 9303
+  - uid: 9302
     components:
     - type: Transform
-      pos: 58.5,-54.5
-      parent: 2
-  - uid: 9304
-    components:
-    - type: Transform
-      pos: 61.5,-54.5
+      pos: 28.5,-15.5
       parent: 2
   - uid: 9312
     components:
@@ -79746,7 +83843,17 @@ entities:
   - uid: 9319
     components:
     - type: Transform
-      pos: 67.5,-58.5
+      pos: 104.5,-58.5
+      parent: 2
+  - uid: 9322
+    components:
+    - type: Transform
+      pos: 82.5,-47.5
+      parent: 2
+  - uid: 9412
+    components:
+    - type: Transform
+      pos: 65.5,-59.5
       parent: 2
   - uid: 9448
     components:
@@ -79758,11 +83865,37 @@ entities:
     - type: Transform
       pos: -8.5,-41.5
       parent: 2
+  - uid: 9496
+    components:
+    - type: Transform
+      pos: 66.5,-59.5
+      parent: 2
   - uid: 9583
     components:
     - type: Transform
       pos: 3.5,-47.5
       parent: 2
+  - uid: 9586
+    components:
+    - type: Transform
+      pos: 32.5,-13.5
+      parent: 2
+  - uid: 9602
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-13.5
+      parent: 2
+  - uid: 9721
+    components:
+    - type: Transform
+      pos: 106.5,-39.5
+      parent: 2
+  - uid: 9793
+    components:
+    - type: Transform
+      pos: 105.5,-55.5
+      parent: 2
   - uid: 10240
     components:
     - type: Transform
@@ -79783,20 +83916,65 @@ entities:
     - type: Transform
       pos: 26.5,-86.5
       parent: 2
-  - uid: 10659
+  - uid: 10702
     components:
     - type: Transform
-      pos: 69.5,-41.5
+      pos: 106.5,-48.5
+      parent: 2
+  - uid: 10708
+    components:
+    - type: Transform
+      pos: 106.5,-43.5
+      parent: 2
+  - uid: 10710
+    components:
+    - type: Transform
+      pos: 106.5,-40.5
+      parent: 2
+  - uid: 10713
+    components:
+    - type: Transform
+      pos: 106.5,-41.5
+      parent: 2
+  - uid: 10756
+    components:
+    - type: Transform
+      pos: 82.5,-42.5
       parent: 2
   - uid: 10819
     components:
     - type: Transform
       pos: 27.5,-68.5
       parent: 2
-  - uid: 10842
+  - uid: 10849
     components:
     - type: Transform
-      pos: 79.5,-42.5
+      pos: 82.5,-49.5
+      parent: 2
+  - uid: 10850
+    components:
+    - type: Transform
+      pos: 81.5,-50.5
+      parent: 2
+  - uid: 10856
+    components:
+    - type: Transform
+      pos: 105.5,-52.5
+      parent: 2
+  - uid: 10860
+    components:
+    - type: Transform
+      pos: 106.5,-49.5
+      parent: 2
+  - uid: 11261
+    components:
+    - type: Transform
+      pos: 106.5,-51.5
+      parent: 2
+  - uid: 11396
+    components:
+    - type: Transform
+      pos: 106.5,-44.5
       parent: 2
   - uid: 11672
     components:
@@ -79823,11 +84001,36 @@ entities:
     - type: Transform
       pos: 47.5,-12.5
       parent: 2
+  - uid: 11830
+    components:
+    - type: Transform
+      pos: 106.5,-45.5
+      parent: 2
+  - uid: 11838
+    components:
+    - type: Transform
+      pos: 81.5,-49.5
+      parent: 2
+  - uid: 11839
+    components:
+    - type: Transform
+      pos: 82.5,-48.5
+      parent: 2
+  - uid: 11840
+    components:
+    - type: Transform
+      pos: 82.5,-43.5
+      parent: 2
   - uid: 11870
     components:
     - type: Transform
       pos: 64.5,-19.5
       parent: 2
+  - uid: 11884
+    components:
+    - type: Transform
+      pos: 73.5,-73.5
+      parent: 2
   - uid: 12846
     components:
     - type: Transform
@@ -79898,10 +84101,10 @@ entities:
     - type: Transform
       pos: -14.5,-9.5
       parent: 2
-  - uid: 13825
+  - uid: 13843
     components:
     - type: Transform
-      pos: 61.5,-46.5
+      pos: 62.5,-21.5
       parent: 2
   - uid: 13979
     components:
@@ -79913,6 +84116,11 @@ entities:
     - type: Transform
       pos: 58.5,-18.5
       parent: 2
+  - uid: 14028
+    components:
+    - type: Transform
+      pos: 57.5,-100.5
+      parent: 2
   - uid: 14081
     components:
     - type: Transform
@@ -79979,15 +84187,50 @@ entities:
     - type: Transform
       pos: -19.5,-73.5
       parent: 2
+  - uid: 14862
+    components:
+    - type: Transform
+      pos: 105.5,-37.5
+      parent: 2
   - uid: 14873
     components:
     - type: Transform
       pos: 9.5,-13.5
       parent: 2
-  - uid: 15147
+  - uid: 15151
     components:
     - type: Transform
-      pos: 63.5,-63.5
+      pos: 83.5,-48.5
+      parent: 2
+  - uid: 15152
+    components:
+    - type: Transform
+      pos: 73.5,-72.5
+      parent: 2
+  - uid: 15153
+    components:
+    - type: Transform
+      pos: 82.5,-41.5
+      parent: 2
+  - uid: 15154
+    components:
+    - type: Transform
+      pos: 83.5,-42.5
+      parent: 2
+  - uid: 15155
+    components:
+    - type: Transform
+      pos: 81.5,-40.5
+      parent: 2
+  - uid: 15162
+    components:
+    - type: Transform
+      pos: 81.5,-41.5
+      parent: 2
+  - uid: 15170
+    components:
+    - type: Transform
+      pos: 104.5,-32.5
       parent: 2
   - uid: 15220
     components:
@@ -80019,68 +84262,31 @@ entities:
     - type: Transform
       pos: 59.5,-18.5
       parent: 2
-  - uid: 15471
+  - uid: 15791
     components:
     - type: Transform
-      pos: 67.5,-44.5
-      parent: 2
-  - uid: 15475
-    components:
-    - type: Transform
-      pos: 66.5,-50.5
+      pos: -64.5,-48.5
       parent: 2
   - uid: 15878
     components:
     - type: Transform
       pos: -5.5,-18.5
       parent: 2
-  - uid: 16097
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-42.5
-      parent: 2
   - uid: 16131
     components:
     - type: Transform
       pos: 22.5,-87.5
       parent: 2
-  - uid: 16164
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
-  - uid: 16170
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-41.5
-      parent: 2
   - uid: 16183
     components:
     - type: Transform
       pos: 0.5,-38.5
       parent: 2
-  - uid: 16312
-    components:
-    - type: Transform
-      pos: 56.5,-29.5
-      parent: 2
-  - uid: 16372
-    components:
-    - type: Transform
-      pos: 58.5,-25.5
-      parent: 2
   - uid: 16384
     components:
     - type: Transform
       pos: 22.5,-88.5
       parent: 2
-  - uid: 16450
-    components:
-    - type: Transform
-      pos: 58.5,-78.5
-      parent: 2
   - uid: 16621
     components:
     - type: Transform
@@ -80191,10 +84397,10 @@ entities:
     - type: Transform
       pos: -18.5,-88.5
       parent: 2
-  - uid: 16865
+  - uid: 16818
     components:
     - type: Transform
-      pos: 69.5,-43.5
+      pos: 17.5,-45.5
       parent: 2
   - uid: 16985
     components:
@@ -80206,31 +84412,11 @@ entities:
     - type: Transform
       pos: -4.5,-18.5
       parent: 2
-  - uid: 17212
-    components:
-    - type: Transform
-      pos: 57.5,-47.5
-      parent: 2
-  - uid: 17213
-    components:
-    - type: Transform
-      pos: 59.5,-40.5
-      parent: 2
-  - uid: 17241
-    components:
-    - type: Transform
-      pos: 61.5,-36.5
-      parent: 2
   - uid: 17272
     components:
     - type: Transform
       pos: 61.5,-28.5
       parent: 2
-  - uid: 17285
-    components:
-    - type: Transform
-      pos: 61.5,-45.5
-      parent: 2
   - uid: 17342
     components:
     - type: Transform
@@ -80256,10 +84442,10 @@ entities:
     - type: Transform
       pos: 60.5,-18.5
       parent: 2
-  - uid: 17651
+  - uid: 17697
     components:
     - type: Transform
-      pos: 79.5,-48.5
+      pos: -40.5,-63.5
       parent: 2
   - uid: 17701
     components:
@@ -80276,16 +84462,6 @@ entities:
     - type: Transform
       pos: 80.5,-41.5
       parent: 2
-  - uid: 18001
-    components:
-    - type: Transform
-      pos: 80.5,-43.5
-      parent: 2
-  - uid: 18002
-    components:
-    - type: Transform
-      pos: 80.5,-49.5
-      parent: 2
   - uid: 18003
     components:
     - type: Transform
@@ -80296,11 +84472,6 @@ entities:
     - type: Transform
       pos: 52.5,-53.5
       parent: 2
-  - uid: 18366
-    components:
-    - type: Transform
-      pos: 58.5,-77.5
-      parent: 2
   - uid: 18403
     components:
     - type: Transform
@@ -80416,11 +84587,6 @@ entities:
     - type: Transform
       pos: 50.5,-63.5
       parent: 2
-  - uid: 18497
-    components:
-    - type: Transform
-      pos: 56.5,-41.5
-      parent: 2
   - uid: 18526
     components:
     - type: Transform
@@ -80431,11 +84597,6 @@ entities:
     - type: Transform
       pos: 52.5,-60.5
       parent: 2
-  - uid: 18631
-    components:
-    - type: Transform
-      pos: 59.5,-25.5
-      parent: 2
   - uid: 18876
     components:
     - type: Transform
@@ -80591,12 +84752,117 @@ entities:
     - type: Transform
       pos: -17.5,-73.5
       parent: 2
+  - uid: 19384
+    components:
+    - type: Transform
+      pos: -64.5,-46.5
+      parent: 2
+  - uid: 19385
+    components:
+    - type: Transform
+      pos: -64.5,-45.5
+      parent: 2
+  - uid: 19386
+    components:
+    - type: Transform
+      pos: -64.5,-44.5
+      parent: 2
+  - uid: 19387
+    components:
+    - type: Transform
+      pos: -64.5,-43.5
+      parent: 2
   - uid: 19395
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-14.5
       parent: 2
+  - uid: 19415
+    components:
+    - type: Transform
+      pos: -64.5,-42.5
+      parent: 2
+  - uid: 19424
+    components:
+    - type: Transform
+      pos: -63.5,-39.5
+      parent: 2
+  - uid: 19426
+    components:
+    - type: Transform
+      pos: -63.5,-37.5
+      parent: 2
+  - uid: 19427
+    components:
+    - type: Transform
+      pos: -63.5,-51.5
+      parent: 2
+  - uid: 19428
+    components:
+    - type: Transform
+      pos: -63.5,-52.5
+      parent: 2
+  - uid: 19429
+    components:
+    - type: Transform
+      pos: -63.5,-53.5
+      parent: 2
+  - uid: 19430
+    components:
+    - type: Transform
+      pos: -62.5,-55.5
+      parent: 2
+  - uid: 19431
+    components:
+    - type: Transform
+      pos: -62.5,-35.5
+      parent: 2
+  - uid: 19432
+    components:
+    - type: Transform
+      pos: -61.5,-33.5
+      parent: 2
+  - uid: 19435
+    components:
+    - type: Transform
+      pos: -62.5,-36.5
+      parent: 2
+  - uid: 19436
+    components:
+    - type: Transform
+      pos: -64.5,-50.5
+      parent: 2
+  - uid: 19437
+    components:
+    - type: Transform
+      pos: -64.5,-40.5
+      parent: 2
+  - uid: 19439
+    components:
+    - type: Transform
+      pos: -61.5,-56.5
+      parent: 2
+  - uid: 19440
+    components:
+    - type: Transform
+      pos: -60.5,-58.5
+      parent: 2
+  - uid: 19441
+    components:
+    - type: Transform
+      pos: -60.5,-32.5
+      parent: 2
+  - uid: 19721
+    components:
+    - type: Transform
+      pos: 57.5,-99.5
+      parent: 2
+  - uid: 19722
+    components:
+    - type: Transform
+      pos: 57.5,-98.5
+      parent: 2
 - proto: GrilleBroken
   entities:
   - uid: 2496
@@ -80617,20 +84883,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-81.5
       parent: 2
-  - uid: 11936
+  - uid: 14252
     components:
     - type: Transform
-      pos: 75.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-59.5
       parent: 2
-  - uid: 16341
+  - uid: 15472
     components:
     - type: Transform
-      pos: 77.5,-53.5
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-59.5
       parent: 2
-  - uid: 16414
+  - uid: 15489
     components:
     - type: Transform
-      pos: 76.5,-53.5
+      pos: 69.5,-56.5
       parent: 2
   - uid: 16987
     components:
@@ -80734,8 +85002,36 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,15.5
       parent: 2
+  - uid: 19425
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,-38.5
+      parent: 2
+  - uid: 19434
+    components:
+    - type: Transform
+      pos: -62.5,-54.5
+      parent: 2
 - proto: GrilleDiagonal
   entities:
+  - uid: 1797
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-45.5
+      parent: 2
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: 14.5,-39.5
+      parent: 2
+  - uid: 1799
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-45.5
+      parent: 2
   - uid: 4656
     components:
     - type: Transform
@@ -80805,40 +85101,38 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-51.5
       parent: 2
-  - uid: 19070
+  - uid: 14429
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-39.5
       parent: 2
-  - uid: 19088
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-45.5
-      parent: 2
-  - uid: 19089
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-45.5
-      parent: 2
-  - uid: 19090
-    components:
-    - type: Transform
-      pos: 14.5,-39.5
-      parent: 2
 - proto: GrilleSpawner
   entities:
-  - uid: 6412
+  - uid: 3138
     components:
     - type: Transform
-      pos: 102.5,-43.5
+      pos: 105.5,-38.5
       parent: 2
-  - uid: 6423
+  - uid: 3214
     components:
     - type: Transform
-      pos: 100.5,-56.5
+      pos: 104.5,-43.5
+      parent: 2
+  - uid: 3774
+    components:
+    - type: Transform
+      pos: 106.5,-50.5
+      parent: 2
+  - uid: 5810
+    components:
+    - type: Transform
+      pos: 105.5,-53.5
+      parent: 2
+  - uid: 5812
+    components:
+    - type: Transform
+      pos: 105.5,-54.5
       parent: 2
   - uid: 6498
     components:
@@ -80860,11 +85154,89 @@ entities:
     - type: Transform
       pos: -70.5,-65.5
       parent: 2
+  - uid: 7423
+    components:
+    - type: Transform
+      pos: 102.5,-56.5
+      parent: 2
+  - uid: 7425
+    components:
+    - type: Transform
+      pos: 103.5,-52.5
+      parent: 2
+  - uid: 7426
+    components:
+    - type: Transform
+      pos: 103.5,-51.5
+      parent: 2
+  - uid: 7431
+    components:
+    - type: Transform
+      pos: 104.5,-48.5
+      parent: 2
+  - uid: 7435
+    components:
+    - type: Transform
+      pos: 103.5,-38.5
+      parent: 2
+  - uid: 7436
+    components:
+    - type: Transform
+      pos: 103.5,-39.5
+      parent: 2
+  - uid: 7550
+    components:
+    - type: Transform
+      pos: 104.5,-47.5
+      parent: 2
+  - uid: 7551
+    components:
+    - type: Transform
+      pos: 103.5,-35.5
+      parent: 2
+  - uid: 7556
+    components:
+    - type: Transform
+      pos: 104.5,-42.5
+      parent: 2
+  - uid: 7947
+    components:
+    - type: Transform
+      pos: 106.5,-47.5
+      parent: 2
+  - uid: 8746
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 100.5,-31.5
+      parent: 2
+  - uid: 8789
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 100.5,-59.5
+      parent: 2
+  - uid: 8802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 100.5,-61.5
+      parent: 2
   - uid: 10433
     components:
     - type: Transform
       pos: -26.5,-92.5
       parent: 2
+  - uid: 13836
+    components:
+    - type: Transform
+      pos: 106.5,-42.5
+      parent: 2
+  - uid: 14404
+    components:
+    - type: Transform
+      pos: 106.5,-46.5
+      parent: 2
   - uid: 14715
     components:
     - type: Transform
@@ -80965,11 +85337,6 @@ entities:
     - type: Transform
       pos: 61.5,-7.5
       parent: 2
-  - uid: 14809
-    components:
-    - type: Transform
-      pos: 101.5,-39.5
-      parent: 2
   - uid: 14810
     components:
     - type: Transform
@@ -80980,76 +85347,6 @@ entities:
     - type: Transform
       pos: 96.5,-29.5
       parent: 2
-  - uid: 14835
-    components:
-    - type: Transform
-      pos: 101.5,-38.5
-      parent: 2
-  - uid: 14836
-    components:
-    - type: Transform
-      pos: 103.5,-38.5
-      parent: 2
-  - uid: 14837
-    components:
-    - type: Transform
-      pos: 104.5,-42.5
-      parent: 2
-  - uid: 14861
-    components:
-    - type: Transform
-      pos: 101.5,-35.5
-      parent: 2
-  - uid: 14862
-    components:
-    - type: Transform
-      pos: 102.5,-42.5
-      parent: 2
-  - uid: 14863
-    components:
-    - type: Transform
-      pos: 101.5,-51.5
-      parent: 2
-  - uid: 14864
-    components:
-    - type: Transform
-      pos: 101.5,-52.5
-      parent: 2
-  - uid: 14917
-    components:
-    - type: Transform
-      pos: 103.5,-53.5
-      parent: 2
-  - uid: 14918
-    components:
-    - type: Transform
-      pos: 103.5,-54.5
-      parent: 2
-  - uid: 14919
-    components:
-    - type: Transform
-      pos: 104.5,-50.5
-      parent: 2
-  - uid: 15595
-    components:
-    - type: Transform
-      pos: 104.5,-47.5
-      parent: 2
-  - uid: 15596
-    components:
-    - type: Transform
-      pos: 102.5,-48.5
-      parent: 2
-  - uid: 15597
-    components:
-    - type: Transform
-      pos: 102.5,-47.5
-      parent: 2
-  - uid: 15598
-    components:
-    - type: Transform
-      pos: 104.5,-46.5
-      parent: 2
   - uid: 15599
     components:
     - type: Transform
@@ -81270,11 +85567,21 @@ entities:
     - type: Transform
       pos: -21.5,-7.5
       parent: 2
+  - uid: 16019
+    components:
+    - type: Transform
+      pos: -64.5,-47.5
+      parent: 2
   - uid: 16713
     components:
     - type: Transform
       pos: -41.5,-86.5
       parent: 2
+  - uid: 17991
+    components:
+    - type: Transform
+      pos: -64.5,-49.5
+      parent: 2
   - uid: 18449
     components:
     - type: Transform
@@ -81305,6 +85612,23 @@ entities:
     - type: Transform
       pos: -21.5,-92.5
       parent: 2
+  - uid: 19416
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -64.5,-41.5
+      parent: 2
+  - uid: 19433
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -61.5,-57.5
+      parent: 2
+  - uid: 19438
+    components:
+    - type: Transform
+      pos: -61.5,-34.5
+      parent: 2
 - proto: GunSafe
   entities:
   - uid: 6757
@@ -81334,31 +85658,31 @@ entities:
     - Lock
 - proto: GunSafeLaserCarbine
   entities:
-  - uid: 15461
+  - uid: 3915
     components:
     - type: Transform
-      pos: 58.5,-58.5
+      pos: 58.5,-50.5
       parent: 2
 - proto: GunSafeRifleLecter
   entities:
-  - uid: 7262
+  - uid: 2645
     components:
     - type: Transform
-      pos: 62.5,-58.5
+      pos: 62.5,-50.5
       parent: 2
 - proto: GunSafeShotgunKammerer
   entities:
-  - uid: 15460
+  - uid: 3084
     components:
     - type: Transform
-      pos: 58.5,-57.5
+      pos: 58.5,-49.5
       parent: 2
 - proto: GunSafeSubMachineGunDrozd
   entities:
-  - uid: 18162
+  - uid: 4178
     components:
     - type: Transform
-      pos: 62.5,-57.5
+      pos: 62.5,-49.5
       parent: 2
 - proto: Handcuffs
   entities:
@@ -81370,24 +85694,19 @@ entities:
   - uid: 13879
     components:
     - type: Transform
-      pos: 62.5,-40.5
+      pos: 57.514305,-35.453518
       parent: 2
   - uid: 19346
     components:
     - type: Transform
-      pos: 58.506886,-20.440216
+      pos: 58.428192,-20.46732
       parent: 2
 - proto: HandheldGPSBasic
   entities:
   - uid: 6984
     components:
     - type: Transform
-      pos: 52.477993,-99.26284
-      parent: 2
-  - uid: 18035
-    components:
-    - type: Transform
-      pos: -45.538082,-76.493256
+      pos: 53.64448,-99.06088
       parent: 2
 - proto: HandheldHealthAnalyzerUnpowered
   entities:
@@ -81427,7 +85746,7 @@ entities:
   - uid: 7218
     components:
     - type: Transform
-      pos: 72.516365,-25.447449
+      pos: 78.45767,-25.4561
       parent: 2
 - proto: HappyHonkMime
   entities:
@@ -81470,11 +85789,40 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 15427
+  - uid: 5196
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-81.5
+      pos: 51.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+  - uid: 8887
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+  - uid: 8958
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FFAD4FFF'
+  - uid: 10661
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-81.5
+      parent: 2
+  - uid: 10668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-81.5
       parent: 2
   - uid: 18101
     components:
@@ -81486,6 +85834,12 @@ entities:
     - type: Transform
       pos: 47.5,-80.5
       parent: 2
+  - uid: 19145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-82.5
+      parent: 2
 - proto: HeatExchangerBend
   entities:
   - uid: 4136
@@ -81503,29 +85857,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 14386
+  - uid: 19147
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 47.5,-81.5
+      pos: 47.5,-82.5
       parent: 2
-  - uid: 15426
+  - uid: 19151
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 49.5,-81.5
+      pos: 49.5,-82.5
       parent: 2
 - proto: HighSecArmoryLocked
   entities:
-  - uid: 4379
+  - uid: 3561
     components:
     - type: Transform
-      pos: 59.5,-54.5
+      pos: 60.5,-46.5
       parent: 2
-  - uid: 9302
+  - uid: 3778
     components:
     - type: Transform
-      pos: 60.5,-54.5
+      pos: 59.5,-46.5
       parent: 2
 - proto: HighSecCommandLocked
   entities:
@@ -81549,21 +85903,28 @@ entities:
   - uid: 3340
     components:
     - type: Transform
-      pos: 47.5,-71.5
+      pos: 45.641735,-73.600204
       parent: 2
-- proto: HolopadAiCore
-  entities:
-  - uid: 10306
+  - uid: 20006
     components:
     - type: Transform
-      pos: 92.5,-45.5
+      parent: 20005
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: HolopadAiCore
+  entities:
+  - uid: 9320
+    components:
+    - type: Transform
+      pos: 94.5,-45.5
       parent: 2
 - proto: HolopadAiUpload
   entities:
-  - uid: 14323
+  - uid: 14861
     components:
     - type: Transform
-      pos: 77.5,-45.5
+      pos: 80.5,-45.5
       parent: 2
 - proto: HolopadCargoBay
   entities:
@@ -81637,10 +85998,10 @@ entities:
       parent: 2
 - proto: HolopadCommandHos
   entities:
-  - uid: 7157
+  - uid: 18027
     components:
     - type: Transform
-      pos: 68.5,-47.5
+      pos: 67.5,-52.5
       parent: 2
 - proto: HolopadCommandQm
   entities:
@@ -81679,10 +86040,10 @@ entities:
       parent: 2
 - proto: HolopadEngineeringAtmosMain
   entities:
-  - uid: 13914
+  - uid: 12924
     components:
     - type: Transform
-      pos: 48.5,-63.5
+      pos: 36.5,-71.5
       parent: 2
 - proto: HolopadEngineeringFront
   entities:
@@ -81754,6 +86115,13 @@ entities:
     - type: Transform
       pos: 35.5,-27.5
       parent: 2
+- proto: HolopadMedicalParamed
+  entities:
+  - uid: 17508
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 2
 - proto: HolopadMedicalSurgery
   entities:
   - uid: 19149
@@ -81763,10 +86131,10 @@ entities:
       parent: 2
 - proto: HolopadMedicalVirology
   entities:
-  - uid: 19145
+  - uid: 18511
     components:
     - type: Transform
-      pos: 29.5,-20.5
+      pos: 32.5,-18.5
       parent: 2
 - proto: HolopadScienceArtifact
   entities:
@@ -81784,10 +86152,10 @@ entities:
       parent: 2
 - proto: HolopadSecurityArmory
   entities:
-  - uid: 5666
+  - uid: 18005
     components:
     - type: Transform
-      pos: 60.5,-58.5
+      pos: 60.5,-48.5
       parent: 2
 - proto: HolopadSecurityArrivalsCheckpoint
   entities:
@@ -81796,19 +86164,47 @@ entities:
     - type: Transform
       pos: -3.5,-14.5
       parent: 2
-- proto: HolopadSecurityFront
+- proto: HolopadSecurityBrigMed
   entities:
-  - uid: 10781
+  - uid: 18058
     components:
     - type: Transform
-      pos: 65.5,-39.5
+      pos: 51.5,-31.5
+      parent: 2
+- proto: HolopadSecurityDetective
+  entities:
+  - uid: 18010
+    components:
+    - type: Transform
+      pos: 70.5,-48.5
+      parent: 2
+- proto: HolopadSecurityFront
+  entities:
+  - uid: 18006
+    components:
+    - type: Transform
+      pos: 63.5,-34.5
+      parent: 2
+- proto: HolopadSecurityInterrogation
+  entities:
+  - uid: 18002
+    components:
+    - type: Transform
+      pos: 52.5,-37.5
+      parent: 2
+- proto: HolopadSecurityLawyer
+  entities:
+  - uid: 18028
+    components:
+    - type: Transform
+      pos: 50.5,-56.5
       parent: 2
 - proto: HolopadSecurityLockerRoom
   entities:
-  - uid: 7158
+  - uid: 18007
     components:
     - type: Transform
-      pos: 59.5,-37.5
+      pos: 70.5,-41.5
       parent: 2
 - proto: HolopadSecurityPerma
   entities:
@@ -81819,17 +86215,17 @@ entities:
       parent: 2
 - proto: HolopadSecurityWarden
   entities:
-  - uid: 7097
+  - uid: 17999
     components:
     - type: Transform
-      pos: 58.5,-43.5
+      pos: 57.5,-37.5
       parent: 2
 - proto: HolopadServiceBar
   entities:
-  - uid: 19171
+  - uid: 19477
     components:
     - type: Transform
-      pos: 27.5,-39.5
+      pos: 28.5,-41.5
       parent: 2
 - proto: HolopadServiceBotany
   entities:
@@ -81861,10 +86257,10 @@ entities:
       parent: 2
 - proto: HolopadServiceKitchen
   entities:
-  - uid: 19170
+  - uid: 19751
     components:
     - type: Transform
-      pos: 43.5,-44.5
+      pos: 40.5,-41.5
       parent: 2
 - proto: HolopadServiceLibrary
   entities:
@@ -81885,12 +86281,12 @@ entities:
   - uid: 3322
     components:
     - type: Transform
-      pos: 60.67577,-57.63842
+      pos: 60.61238,-49.522396
       parent: 2
   - uid: 3323
     components:
     - type: Transform
-      pos: 60.83202,-57.409096
+      pos: 60.726963,-49.366035
       parent: 2
 - proto: HospitalCurtains
   entities:
@@ -81909,6 +86305,11 @@ entities:
     - type: Transform
       pos: 40.5,-18.5
       parent: 2
+  - uid: 18823
+    components:
+    - type: Transform
+      pos: 49.5,-16.5
+      parent: 2
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 2866
@@ -81928,6 +86329,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,1.5
       parent: 2
+  - uid: 9872
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-16.5
+      parent: 2
   - uid: 14267
     components:
     - type: Transform
@@ -81952,11 +86359,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,-14.5
       parent: 2
-  - uid: 18757
-    components:
-    - type: Transform
-      pos: 42.5,-16.5
-      parent: 2
   - uid: 18758
     components:
     - type: Transform
@@ -82074,29 +86476,24 @@ entities:
   - uid: 5182
     components:
     - type: Transform
-      pos: -3.353551,-47.34583
+      pos: -3.371653,-47.471542
       parent: 2
 - proto: IceCrust
   entities:
-  - uid: 8581
+  - uid: 15136
     components:
     - type: Transform
-      pos: 42.5,-72.5
+      pos: 47.5,-68.5
       parent: 2
-  - uid: 8585
+  - uid: 15632
     components:
     - type: Transform
-      pos: 41.5,-71.5
+      pos: 45.5,-68.5
       parent: 2
-  - uid: 12923
+  - uid: 16099
     components:
     - type: Transform
-      pos: 41.5,-70.5
-      parent: 2
-  - uid: 15142
-    components:
-    - type: Transform
-      pos: 41.5,-69.5
+      pos: 46.5,-68.5
       parent: 2
 - proto: IDComputerCircuitboard
   entities:
@@ -82142,18 +86539,6 @@ entities:
     - type: Transform
       pos: -10.265891,-21.478815
       parent: 2
-  - uid: 17893
-    components:
-    - type: Transform
-      parent: 17884
-    - type: Physics
-      canCollide: False
-  - uid: 17907
-    components:
-    - type: Transform
-      parent: 17884
-    - type: Physics
-      canCollide: False
 - proto: IngotSilver
   entities:
   - uid: 3829
@@ -82203,12 +86588,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-64.5
       parent: 2
-  - uid: 17767
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-35.5
-      parent: 2
   - uid: 17772
     components:
     - type: Transform
@@ -82249,12 +86628,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-58.5
       parent: 2
-  - uid: 6680
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-67.5
-      parent: 2
   - uid: 6681
     components:
     - type: Transform
@@ -82277,17 +86650,6 @@ entities:
     - type: Transform
       pos: 11.5,-18.5
       parent: 2
-  - uid: 17766
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
-      parent: 2
-  - uid: 17770
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-28.5
-      parent: 2
 - proto: IntercomScience
   entities:
   - uid: 11363
@@ -82298,10 +86660,17 @@ entities:
       parent: 2
 - proto: IntercomSecurity
   entities:
-  - uid: 9335
+  - uid: 6087
     components:
     - type: Transform
-      pos: 64.5,-48.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-41.5
+      parent: 2
+  - uid: 19381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-26.5
       parent: 2
 - proto: IntercomService
   entities:
@@ -82373,7 +86742,7 @@ entities:
   - uid: 734
     components:
     - type: Transform
-      pos: 19.601612,-24.408659
+      pos: 20.640932,-24.39975
       parent: 2
   - uid: 17919
     components:
@@ -82409,7 +86778,7 @@ entities:
   - uid: 7042
     components:
     - type: Transform
-      pos: 48.430027,-40.48026
+      pos: 40.52011,-36.396408
       parent: 2
 - proto: KitchenMicrowave
   entities:
@@ -82423,11 +86792,6 @@ entities:
     - type: Transform
       pos: 8.5,-90.5
       parent: 2
-  - uid: 7031
-    components:
-    - type: Transform
-      pos: 44.5,-41.5
-      parent: 2
   - uid: 7032
     components:
     - type: Transform
@@ -82438,6 +86802,11 @@ entities:
     - type: Transform
       pos: 48.5,-15.5
       parent: 2
+  - uid: 14596
+    components:
+    - type: Transform
+      pos: 44.5,-40.5
+      parent: 2
   - uid: 18532
     components:
     - type: Transform
@@ -82455,10 +86824,10 @@ entities:
     - type: Transform
       pos: 41.5,-43.5
       parent: 2
-  - uid: 7030
+  - uid: 8451
     components:
     - type: Transform
-      pos: 44.5,-40.5
+      pos: 68.5,-63.5
       parent: 2
   - uid: 10300
     components:
@@ -82470,17 +86839,22 @@ entities:
     - type: Transform
       pos: 15.5,-67.5
       parent: 2
+  - uid: 19745
+    components:
+    - type: Transform
+      pos: 42.5,-42.5
+      parent: 2
 - proto: KitchenSpike
   entities:
-  - uid: 7035
+  - uid: 4609
     components:
     - type: Transform
-      pos: 48.5,-42.5
+      pos: 43.5,-36.5
       parent: 2
-  - uid: 7036
+  - uid: 7533
     components:
     - type: Transform
-      pos: 48.5,-41.5
+      pos: 42.5,-36.5
       parent: 2
 - proto: KnifePlastic
   entities:
@@ -82518,26 +86892,60 @@ entities:
     - type: Transform
       pos: -23.242622,-14.164716
       parent: 2
+- proto: Lamp
+  entities:
+  - uid: 10252
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.53382,-47.076958
+      parent: 2
 - proto: LampGold
   entities:
   - uid: 10499
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5085,-56.088474
+      pos: 53.538273,-56.19024
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 4915
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 4915
+    - type: Physics
+      canCollide: True
+    - type: ActionsContainer
 - proto: LampInterrogator
   entities:
-  - uid: 2223
-    components:
-    - type: Transform
-      pos: 69.513466,-51.10884
-      parent: 2
   - uid: 15343
     components:
     - type: Transform
-      pos: 71.46581,-42.150627
+      pos: 50.54356,-37.204014
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 7566
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 7566
+    - type: Physics
+      canCollide: True
+    - type: ActionsContainer
 - proto: Lantern
   entities:
   - uid: 5675
@@ -82560,7 +86968,7 @@ entities:
   - uid: 7055
     components:
     - type: Transform
-      pos: 42.5,-42.5
+      pos: 42.395752,-45.319225
       parent: 2
   - uid: 17018
     components:
@@ -82572,6 +86980,16 @@ entities:
     - type: Transform
       pos: 2.5591927,-78.68594
       parent: 2
+  - uid: 19735
+    components:
+    - type: Transform
+      pos: 42.364388,-34.14802
+      parent: 2
+  - uid: 19746
+    components:
+    - type: Transform
+      pos: 42.597137,-45.117836
+      parent: 2
 - proto: LeavesCannabisDried
   entities:
   - uid: 18867
@@ -82606,27 +87024,6 @@ entities:
     - type: Transform
       pos: -25.64344,-32.075485
       parent: 2
-- proto: LightBulbBroken
-  entities:
-  - uid: 17953
-    components:
-    - type: Transform
-      parent: 17952
-    - type: Physics
-      canCollide: False
-  - uid: 17961
-    components:
-    - type: Transform
-      parent: 17960
-    - type: Physics
-      canCollide: False
-- proto: Lighter
-  entities:
-  - uid: 9356
-    components:
-    - type: Transform
-      pos: 68.51949,-38.591267
-      parent: 2
 - proto: LiquidNitrogenCanister
   entities:
   - uid: 15914
@@ -82651,30 +87048,28 @@ entities:
   - uid: 18618
     components:
     - type: Transform
-      pos: 77.18439,-43.606335
+      pos: 79.15577,-43.49481
       parent: 2
 - proto: LockableButtonArmory
   entities:
-  - uid: 3541
+  - uid: 8069
     components:
-    - type: MetaData
-      name: main armory button
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 61.5,-44.5
+      pos: 60.5,-37.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        4380:
+        4000:
         - - Pressed
           - Toggle
-        4366:
+        3548:
         - - Pressed
           - Toggle
-        13934:
+        3867:
         - - Pressed
           - Toggle
-        4377:
+        3324:
         - - Pressed
           - Toggle
 - proto: LockableButtonChiefEngineer
@@ -82780,15 +87175,15 @@ entities:
     - type: Transform
       pos: 31.5,-48.5
       parent: 2
-  - uid: 7074
+  - uid: 7347
     components:
     - type: Transform
       pos: 35.5,-48.5
       parent: 2
-  - uid: 8101
+  - uid: 14266
     components:
     - type: Transform
-      pos: 72.5,-67.5
+      pos: 58.5,-62.5
       parent: 2
 - proto: LockerBotanistFilled
   entities:
@@ -82844,10 +87239,10 @@ entities:
       parent: 2
 - proto: LockerDetectiveFilled
   entities:
-  - uid: 4810
+  - uid: 9306
     components:
     - type: Transform
-      pos: 72.5,-53.5
+      pos: 73.5,-49.5
       parent: 2
 - proto: LockerElectricalSuppliesFilled
   entities:
@@ -82856,16 +87251,16 @@ entities:
     - type: Transform
       pos: -19.5,-59.5
       parent: 2
+  - uid: 8085
+    components:
+    - type: Transform
+      pos: 34.5,-34.5
+      parent: 2
   - uid: 14741
     components:
     - type: Transform
       pos: 6.5,-63.5
       parent: 2
-  - uid: 15227
-    components:
-    - type: Transform
-      pos: 35.5,-34.5
-      parent: 2
   - uid: 16045
     components:
     - type: Transform
@@ -82915,17 +87310,17 @@ entities:
     - type: Transform
       pos: 10.5,-47.5
       parent: 2
-  - uid: 14277
+  - uid: 10236
     components:
     - type: Transform
-      pos: 57.5,-34.5
+      pos: 68.5,-41.5
       parent: 2
 - proto: LockerFreezer
   entities:
-  - uid: 7050
+  - uid: 8385
     components:
     - type: Transform
-      pos: 46.5,-44.5
+      pos: 41.5,-36.5
       parent: 2
 - proto: LockerFreezerVaultFilled
   entities:
@@ -82943,42 +87338,62 @@ entities:
       parent: 2
 - proto: LockerHeadOfSecurityFilled
   entities:
-  - uid: 15344
+  - uid: 6065
     components:
     - type: Transform
-      pos: 71.5,-45.5
+      pos: 71.5,-51.5
       parent: 2
 - proto: LockerMedical
   entities:
-  - uid: 1170
+  - uid: 8154
     components:
     - type: Transform
-      pos: 27.5,-25.5
+      pos: 27.5,-27.5
       parent: 2
 - proto: LockerMedicalFilled
   entities:
+  - uid: 2829
+    components:
+    - type: Transform
+      pos: 21.5,-15.5
+      parent: 2
   - uid: 5211
     components:
     - type: Transform
       pos: 20.5,-15.5
       parent: 2
-  - uid: 5216
-    components:
-    - type: Transform
-      pos: 18.5,-15.5
-      parent: 2
-  - uid: 5228
-    components:
-    - type: Transform
-      pos: 19.5,-15.5
-      parent: 2
   - uid: 5928
     components:
     - type: Transform
       pos: -7.5,2.5
       parent: 2
+  - uid: 7778
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 2
+  - uid: 8377
+    components:
+    - type: Transform
+      pos: 19.5,-15.5
+      parent: 2
+  - uid: 8786
+    components:
+    - type: Transform
+      pos: 23.5,-16.5
+      parent: 2
+  - uid: 9385
+    components:
+    - type: Transform
+      pos: 22.5,-15.5
+      parent: 2
 - proto: LockerMedicineFilled
   entities:
+  - uid: 8378
+    components:
+    - type: Transform
+      pos: 18.5,-15.5
+      parent: 2
   - uid: 13992
     components:
     - type: Transform
@@ -83005,52 +87420,52 @@ entities:
       parent: 2
 - proto: LockerPrisoner
   entities:
-  - uid: 16115
-    components:
-    - type: Transform
-      pos: 67.5,-27.5
-      parent: 2
-- proto: LockerPrisoner2
-  entities:
-  - uid: 17731
+  - uid: 5386
     components:
     - type: Transform
       pos: 68.5,-27.5
       parent: 2
-- proto: LockerPrisoner3
+- proto: LockerPrisoner2
   entities:
-  - uid: 18058
+  - uid: 5388
     components:
     - type: Transform
       pos: 69.5,-27.5
       parent: 2
-- proto: LockerPrisoner4
+- proto: LockerPrisoner3
   entities:
-  - uid: 15446
+  - uid: 5403
     components:
     - type: Transform
-      pos: 66.5,-29.5
+      pos: 70.5,-27.5
+      parent: 2
+- proto: LockerPrisoner4
+  entities:
+  - uid: 5405
+    components:
+    - type: Transform
+      pos: 67.5,-30.5
       parent: 2
 - proto: LockerPrisoner5
   entities:
-  - uid: 15548
+  - uid: 5406
     components:
     - type: Transform
-      pos: 67.5,-29.5
+      pos: 68.5,-30.5
       parent: 2
 - proto: LockerPrisoner6
   entities:
-  - uid: 15448
+  - uid: 5409
     components:
     - type: Transform
-      pos: 68.5,-29.5
+      pos: 69.5,-30.5
       parent: 2
 - proto: LockerPrisoner7
   entities:
-  - uid: 15547
+  - uid: 6090
     components:
     - type: Transform
-      pos: 69.5,-29.5
+      pos: 70.5,-30.5
       parent: 2
 - proto: LockerQuarterMasterFilled
   entities:
@@ -83068,20 +87483,20 @@ entities:
       parent: 2
 - proto: LockerSalvageSpecialistFilled
   entities:
-  - uid: 6900
+  - uid: 9177
     components:
     - type: Transform
-      pos: 55.5,-98.5
+      pos: 56.5,-99.5
       parent: 2
-  - uid: 6910
+  - uid: 17329
     components:
     - type: Transform
-      pos: 55.5,-99.5
+      pos: 56.5,-100.5
       parent: 2
-  - uid: 6911
+  - uid: 18765
     components:
     - type: Transform
-      pos: 55.5,-100.5
+      pos: 56.5,-98.5
       parent: 2
 - proto: LockerScienceFilled
   entities:
@@ -83107,30 +87522,35 @@ entities:
       parent: 2
 - proto: LockerSecurityFilled
   entities:
-  - uid: 3548
-    components:
-    - type: Transform
-      pos: 57.5,-39.5
-      parent: 2
-  - uid: 3549
-    components:
-    - type: Transform
-      pos: 57.5,-38.5
-      parent: 2
-  - uid: 3550
-    components:
-    - type: Transform
-      pos: 57.5,-36.5
-      parent: 2
   - uid: 6149
     components:
     - type: Transform
       pos: 11.5,-47.5
       parent: 2
-  - uid: 10252
+  - uid: 9892
     components:
     - type: Transform
-      pos: 57.5,-37.5
+      pos: 68.5,-38.5
+      parent: 2
+  - uid: 9901
+    components:
+    - type: Transform
+      pos: 69.5,-38.5
+      parent: 2
+  - uid: 9904
+    components:
+    - type: Transform
+      pos: 70.5,-38.5
+      parent: 2
+  - uid: 9949
+    components:
+    - type: Transform
+      pos: 71.5,-38.5
+      parent: 2
+  - uid: 10036
+    components:
+    - type: Transform
+      pos: 72.5,-38.5
       parent: 2
 - proto: LockerWallMedicalFilled
   entities:
@@ -83141,10 +87561,10 @@ entities:
       parent: 2
 - proto: LockerWardenFilled
   entities:
-  - uid: 3544
+  - uid: 3453
     components:
     - type: Transform
-      pos: 57.5,-45.5
+      pos: 54.5,-36.5
       parent: 2
 - proto: LockerWeldingSuppliesFilled
   entities:
@@ -83238,12 +87658,26 @@ entities:
     - type: Physics
       canCollide: False
       bodyType: Static
-- proto: LootSpawnerIndustrialFluff
+- proto: LootSpawnerCableCoil
   entities:
-  - uid: 9697
+  - uid: 15459
     components:
     - type: Transform
-      pos: 61.5,-62.5
+      pos: 66.5,-68.5
+      parent: 2
+- proto: LootSpawnerIndustrialFluff
+  entities:
+  - uid: 15460
+    components:
+    - type: Transform
+      pos: 62.5,-65.5
+      parent: 2
+- proto: LootSpawnerMaterialsHighValue
+  entities:
+  - uid: 4983
+    components:
+    - type: Transform
+      pos: -37.5,-75.5
       parent: 2
 - proto: LootSpawnerMaterialsSupplementary
   entities:
@@ -83254,17 +87688,10 @@ entities:
       parent: 2
 - proto: LootSpawnerMedicalMinor
   entities:
-  - uid: 10738
+  - uid: 7573
     components:
     - type: Transform
-      pos: 74.5,-37.5
-      parent: 2
-- proto: LootSpawnerSecurityBasic
-  entities:
-  - uid: 14252
-    components:
-    - type: Transform
-      pos: 57.5,-28.5
+      pos: 75.5,-34.5
       parent: 2
 - proto: LuxuryPen
   entities:
@@ -83333,10 +87760,15 @@ entities:
     - type: Transform
       pos: 12.5,-67.5
       parent: 2
-  - uid: 15258
+  - uid: 4252
     components:
     - type: Transform
-      pos: 37.5,-28.5
+      pos: 36.5,-13.5
+      parent: 2
+  - uid: 14297
+    components:
+    - type: Transform
+      pos: 68.5,-62.5
       parent: 2
 - proto: MachineElectrolysisUnit
   entities:
@@ -83345,13 +87777,18 @@ entities:
     - type: Transform
       pos: 13.5,-67.5
       parent: 2
-  - uid: 3714
+  - uid: 8382
     components:
     - type: Transform
-      pos: 42.5,-30.5
+      pos: 66.5,-66.5
       parent: 2
 - proto: MachineFrame
   entities:
+  - uid: 14973
+    components:
+    - type: Transform
+      pos: 43.5,-34.5
+      parent: 2
   - uid: 17019
     components:
     - type: Transform
@@ -83384,29 +87821,35 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.1149855,-10.702077
       parent: 2
+  - uid: 20078
+    components:
+    - type: Transform
+      rot: -0.3490658503988659 rad
+      pos: 53.540127,-42.392376
+      parent: 2
 - proto: MagazinePistolSubMachineGun
   entities:
   - uid: 11951
     components:
     - type: Transform
-      pos: 68.56853,-31.4625
+      pos: 69.531204,-32.483376
       parent: 2
   - uid: 16049
     components:
     - type: Transform
-      pos: 68.39492,-31.455551
+      pos: 69.312454,-32.493797
       parent: 2
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
   - uid: 3532
     components:
     - type: Transform
-      pos: 65.386,-45.460392
+      pos: 64.45614,-50.54994
       parent: 2
   - uid: 3536
     components:
     - type: Transform
-      pos: 65.62211,-45.562313
+      pos: 64.62281,-50.643757
       parent: 2
 - proto: MailBag
   entities:
@@ -83417,11 +87860,6 @@ entities:
       parent: 2
 - proto: MaintenanceFluffSpawner
   entities:
-  - uid: 7207
-    components:
-    - type: Transform
-      pos: 60.5,-62.5
-      parent: 2
   - uid: 17360
     components:
     - type: Transform
@@ -83439,21 +87877,71 @@ entities:
       parent: 2
 - proto: MaintenancePlantSpawner
   entities:
-  - uid: 17240
+  - uid: 2407
     components:
     - type: Transform
-      pos: 75.5,-59.5
+      pos: -16.5,-46.5
       parent: 2
-  - uid: 17242
+  - uid: 7611
     components:
     - type: Transform
-      pos: 6.5,-79.5
+      pos: 75.5,-41.5
+      parent: 2
+  - uid: 7708
+    components:
+    - type: Transform
+      pos: 75.5,-36.5
+      parent: 2
+  - uid: 7770
+    components:
+    - type: Transform
+      pos: 6.5,-74.5
+      parent: 2
+  - uid: 7799
+    components:
+    - type: Transform
+      pos: 76.5,-31.5
+      parent: 2
+  - uid: 10787
+    components:
+    - type: Transform
+      pos: 48.5,-34.5
+      parent: 2
+  - uid: 12407
+    components:
+    - type: Transform
+      pos: 6.5,-75.5
+      parent: 2
+  - uid: 15595
+    components:
+    - type: Transform
+      pos: 70.5,-62.5
       parent: 2
   - uid: 17243
     components:
     - type: Transform
       pos: -36.5,-72.5
       parent: 2
+  - uid: 17715
+    components:
+    - type: Transform
+      pos: 6.5,-79.5
+      parent: 2
+  - uid: 19577
+    components:
+    - type: Transform
+      pos: -9.5,-57.5
+      parent: 2
+  - uid: 19578
+    components:
+    - type: Transform
+      pos: -47.5,-22.5
+      parent: 2
+  - uid: 19579
+    components:
+    - type: Transform
+      pos: 54.5,-77.5
+      parent: 2
 - proto: MaintenanceToolSpawner
   entities:
   - uid: 7684
@@ -83466,6 +87954,11 @@ entities:
     - type: Transform
       pos: 30.5,-78.5
       parent: 2
+  - uid: 15427
+    components:
+    - type: Transform
+      pos: 47.5,-44.5
+      parent: 2
   - uid: 17000
     components:
     - type: Transform
@@ -83473,16 +87966,16 @@ entities:
       parent: 2
 - proto: MaintenanceWeaponSpawner
   entities:
+  - uid: 7421
+    components:
+    - type: Transform
+      pos: 74.5,-54.5
+      parent: 2
   - uid: 7683
     components:
     - type: Transform
       pos: 78.5,-19.5
       parent: 2
-  - uid: 17239
-    components:
-    - type: Transform
-      pos: 75.5,-56.5
-      parent: 2
 - proto: Matchbox
   entities:
   - uid: 5667
@@ -83505,17 +87998,22 @@ entities:
   - uid: 10675
     components:
     - type: Transform
-      pos: 79.32236,-26.715631
+      pos: 79.30142,-25.841785
+      parent: 2
+  - uid: 10843
+    components:
+    - type: Transform
+      pos: 96.498116,-44.486084
       parent: 2
   - uid: 17247
     components:
     - type: Transform
-      pos: 79.59391,-27.06205
+      pos: 79.27017,-26.060688
       parent: 2
   - uid: 17248
     components:
     - type: Transform
-      pos: 79.70907,-27.17235
+      pos: 79.44725,-26.27959
       parent: 2
   - uid: 17249
     components:
@@ -83527,11 +88025,6 @@ entities:
     - type: Transform
       pos: 12.563929,-2.5076818
       parent: 2
-  - uid: 17251
-    components:
-    - type: Transform
-      pos: 94.519135,-44.463116
-      parent: 2
   - uid: 17253
     components:
     - type: Transform
@@ -83550,7 +88043,7 @@ entities:
   - uid: 17256
     components:
     - type: Transform
-      pos: 31.284103,-12.202638
+      pos: 32.248436,-11.570349
       parent: 2
   - uid: 17257
     components:
@@ -83567,7 +88060,7 @@ entities:
   - uid: 16376
     components:
     - type: Transform
-      pos: 15.448459,-63.116146
+      pos: 15.45371,-59.515717
       parent: 2
 - proto: MaterialCloth1
   entities:
@@ -83595,41 +88088,50 @@ entities:
   - uid: 16377
     components:
     - type: Transform
-      pos: 13.224184,-63.266567
+      pos: 13.287043,-58.162865
       parent: 2
 - proto: MaterialWebSilk1
   entities:
-  - uid: 7220
+  - uid: 3521
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.36436,-48.69991
+      pos: 69.672005,-53.69275
       parent: 2
-  - uid: 7279
+  - uid: 4612
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.66123,-48.590458
+      pos: 69.453255,-53.61978
       parent: 2
-  - uid: 8151
+  - uid: 7103
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.39561,-48.51228
+      pos: 69.40117,-53.80741
       parent: 2
 - proto: MaterialWoodPlank
   entities:
   - uid: 8095
     components:
     - type: Transform
-      pos: 69.52955,-67.498146
+      pos: 59.643414,-62.438656
+      parent: 2
+  - uid: 19587
+    components:
+    - type: Transform
+      pos: 5.5,-79.5
       parent: 2
 - proto: MaterialWoodPlank1
   entities:
   - uid: 7336
     components:
     - type: Transform
-      pos: 80.49108,-26.808891
+      pos: 79.666,-26.185774
+      parent: 2
+- proto: MaterialWoodPlank10
+  entities:
+  - uid: 7461
+    components:
+    - type: Transform
+      pos: 5.5223966,-74.49242
       parent: 2
 - proto: MedicalBed
   entities:
@@ -83663,26 +88165,31 @@ entities:
     - type: Transform
       pos: -37.5,-16.5
       parent: 2
-  - uid: 7789
+  - uid: 7765
     components:
     - type: Transform
-      pos: 31.5,-11.5
+      pos: 50.5,-32.5
+      parent: 2
+  - uid: 7766
+    components:
+    - type: Transform
+      pos: 50.5,-33.5
       parent: 2
   - uid: 8733
     components:
     - type: Transform
       pos: -40.5,-14.5
       parent: 2
+  - uid: 9356
+    components:
+    - type: Transform
+      pos: 32.5,-11.5
+      parent: 2
   - uid: 11852
     components:
     - type: Transform
       pos: 15.5,-69.5
       parent: 2
-  - uid: 14254
-    components:
-    - type: Transform
-      pos: 60.5,-31.5
-      parent: 2
   - uid: 14366
     components:
     - type: Transform
@@ -83723,6 +88230,11 @@ entities:
     - type: Transform
       pos: 15.762657,-15.390333
       parent: 2
+  - uid: 5440
+    components:
+    - type: Transform
+      pos: 50.41688,-31.271675
+      parent: 2
   - uid: 5579
     components:
     - type: Transform
@@ -83733,15 +88245,20 @@ entities:
     - type: Transform
       pos: -38.568382,-16.260506
       parent: 2
+  - uid: 6279
+    components:
+    - type: Transform
+      pos: 74.49798,-53.45904
+      parent: 2
   - uid: 6953
     components:
     - type: Transform
       pos: 31.486631,-101.4452
       parent: 2
-  - uid: 8071
+  - uid: 7228
     components:
     - type: Transform
-      pos: 57.47399,-32.30945
+      pos: 50.651257,-31.365425
       parent: 2
   - uid: 8206
     components:
@@ -83753,16 +88270,6 @@ entities:
     - type: Transform
       pos: 77.57588,-20.876202
       parent: 2
-  - uid: 14240
-    components:
-    - type: Transform
-      pos: 57.56774,-32.434536
-      parent: 2
-  - uid: 15893
-    components:
-    - type: Transform
-      pos: 75.5,-55.5
-      parent: 2
   - uid: 16095
     components:
     - type: Transform
@@ -83806,20 +88313,20 @@ entities:
       parent: 2
 - proto: MicroManipulatorStockPart
   entities:
-  - uid: 7318
+  - uid: 12746
     components:
     - type: Transform
-      pos: 33.374638,-15.933382
+      pos: -42.292168,-79.426285
       parent: 2
   - uid: 17358
     components:
     - type: Transform
       pos: -32.45135,-29.305899
       parent: 2
-  - uid: 17879
+  - uid: 19739
     components:
     - type: Transform
-      pos: 33.547714,-15.508676
+      pos: 40.69203,-32.54189
       parent: 2
 - proto: MicrophoneInstrument
   entities:
@@ -83831,7 +88338,14 @@ entities:
   - uid: 18260
     components:
     - type: Transform
-      pos: 27.522682,-38.335285
+      pos: 27.508257,-39.500587
+      parent: 2
+- proto: MicrowaveMachineCircuitboard
+  entities:
+  - uid: 19422
+    components:
+    - type: Transform
+      pos: 41.349373,-34.246284
       parent: 2
 - proto: Mirror
   entities:
@@ -83885,55 +88399,15 @@ entities:
       parent: 2
 - proto: Morgue
   entities:
-  - uid: 5280
+  - uid: 1711
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-29.5
+      pos: 30.5,-26.5
       parent: 2
-  - uid: 5281
+  - uid: 3089
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-29.5
-      parent: 2
-  - uid: 5282
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 32.5,-29.5
-      parent: 2
-  - uid: 5283
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 33.5,-29.5
-      parent: 2
-  - uid: 5284
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 34.5,-29.5
-      parent: 2
-  - uid: 5285
-    components:
-    - type: Transform
-      pos: 30.5,-25.5
-      parent: 2
-  - uid: 5286
-    components:
-    - type: Transform
-      pos: 31.5,-25.5
-      parent: 2
-  - uid: 5287
-    components:
-    - type: Transform
-      pos: 32.5,-25.5
-      parent: 2
-  - uid: 5288
-    components:
-    - type: Transform
-      pos: 33.5,-25.5
+      pos: 31.5,-26.5
       parent: 2
   - uid: 5676
     components:
@@ -83941,18 +88415,57 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-46.5
       parent: 2
+  - uid: 6127
+    components:
+    - type: Transform
+      pos: 33.5,-26.5
+      parent: 2
+  - uid: 7623
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-30.5
+      parent: 2
+  - uid: 8134
+    components:
+    - type: Transform
+      pos: 32.5,-26.5
+      parent: 2
+  - uid: 8426
+    components:
+    - type: Transform
+      pos: 52.5,-31.5
+      parent: 2
+  - uid: 11908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-30.5
+      parent: 2
+  - uid: 11915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-30.5
+      parent: 2
+  - uid: 11919
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-30.5
+      parent: 2
+  - uid: 11936
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,-30.5
+      parent: 2
   - uid: 17637
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-28.5
       parent: 2
-  - uid: 19422
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-31.5
-      parent: 2
 - proto: MothroachCube
   entities:
   - uid: 17238
@@ -83980,19 +88493,24 @@ entities:
   - uid: 6954
     components:
     - type: Transform
-      pos: 29.4738,-90.37535
+      pos: 31.267843,-89.50989
       parent: 2
   - uid: 9214
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 57.50261,-42.147453
+      pos: 54.52982,-39.13904
       parent: 2
   - uid: 10555
     components:
     - type: Transform
       pos: -11.327834,-21.173048
       parent: 2
+  - uid: 15483
+    components:
+    - type: Transform
+      pos: 65.5059,-68.27459
+      parent: 2
   - uid: 17299
     components:
     - type: Transform
@@ -84006,7 +88524,13 @@ entities:
   - uid: 18174
     components:
     - type: Transform
-      pos: -53.444557,-43.036716
+      pos: -53.37472,-43.263702
+      parent: 2
+  - uid: 18575
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -37.663143,-76.5443
       parent: 2
 - proto: MysteryFigureBox
   entities:
@@ -84044,16 +88568,16 @@ entities:
     - type: Transform
       pos: 31.5,-33.5
       parent: 2
-  - uid: 3392
-    components:
-    - type: Transform
-      pos: 69.5,-55.5
-      parent: 2
   - uid: 5005
     components:
     - type: Transform
       pos: -2.5,-44.5
       parent: 2
+  - uid: 6907
+    components:
+    - type: Transform
+      pos: 55.5,-101.5
+      parent: 2
   - uid: 7821
     components:
     - type: Transform
@@ -84069,41 +88593,36 @@ entities:
     - type: Transform
       pos: 50.5,-77.5
       parent: 2
-  - uid: 9177
+  - uid: 10816
     components:
     - type: Transform
-      pos: 49.5,-100.5
+      pos: 61.5,-54.5
       parent: 2
-  - uid: 13646
+  - uid: 11132
     components:
     - type: Transform
-      pos: 50.5,-72.5
+      pos: -43.5,-79.5
       parent: 2
-  - uid: 16290
+  - uid: 16048
     components:
     - type: Transform
-      pos: 52.5,-40.5
-      parent: 2
-  - uid: 16606
-    components:
-    - type: Transform
-      pos: 70.5,-24.5
-      parent: 2
-  - uid: 17370
-    components:
-    - type: Transform
-      pos: -39.5,-80.5
-      parent: 2
-  - uid: 17901
-    components:
-    - type: Transform
-      pos: 50.5,-71.5
+      pos: 68.5,-23.5
       parent: 2
   - uid: 19351
     components:
     - type: Transform
       pos: 5.5,-17.5
       parent: 2
+  - uid: 19494
+    components:
+    - type: Transform
+      pos: 40.5,-73.5
+      parent: 2
+  - uid: 19499
+    components:
+    - type: Transform
+      pos: 40.5,-72.5
+      parent: 2
 - proto: NitrogenTankFilled
   entities:
   - uid: 7697
@@ -84118,6 +88637,11 @@ entities:
     - type: Transform
       pos: -24.5,-24.5
       parent: 2
+  - uid: 17658
+    components:
+    - type: Transform
+      pos: 43.5,-73.5
+      parent: 2
 - proto: NitrousOxideTankFilled
   entities:
   - uid: 6652
@@ -84132,6 +88656,11 @@ entities:
     - type: Transform
       pos: -16.357931,-27.28502
       parent: 2
+  - uid: 12745
+    components:
+    - type: Transform
+      pos: -45.562008,-76.444115
+      parent: 2
   - uid: 19288
     components:
     - type: Transform
@@ -84154,7 +88683,7 @@ entities:
   - uid: 18623
     components:
     - type: Transform
-      pos: 78.38787,-47.2619
+      pos: 79.365814,-47.469414
       parent: 2
 - proto: NuclearBomb
   entities:
@@ -84168,7 +88697,7 @@ entities:
   - uid: 18619
     components:
     - type: Transform
-      pos: 77.60105,-43.356163
+      pos: 79.641716,-43.3176
       parent: 2
 - proto: OperatingTable
   entities:
@@ -84215,11 +88744,6 @@ entities:
     - type: Transform
       pos: 15.5,-82.5
       parent: 2
-  - uid: 2656
-    components:
-    - type: Transform
-      pos: -38.5,-80.5
-      parent: 2
   - uid: 6909
     components:
     - type: Transform
@@ -84240,10 +88764,15 @@ entities:
     - type: Transform
       pos: 51.5,-77.5
       parent: 2
-  - uid: 15412
+  - uid: 10814
     components:
     - type: Transform
-      pos: 68.5,-55.5
+      pos: 60.5,-54.5
+      parent: 2
+  - uid: 15413
+    components:
+    - type: Transform
+      pos: 42.5,-29.5
       parent: 2
   - uid: 15432
     components:
@@ -84255,25 +88784,15 @@ entities:
     - type: Transform
       pos: -6.5,-77.5
       parent: 2
-  - uid: 16289
-    components:
-    - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
   - uid: 16313
     components:
     - type: Transform
       pos: -7.5,-58.5
       parent: 2
-  - uid: 17902
+  - uid: 16596
     components:
     - type: Transform
-      pos: 49.5,-71.5
-      parent: 2
-  - uid: 17903
-    components:
-    - type: Transform
-      pos: 49.5,-72.5
+      pos: -42.5,-76.5
       parent: 2
   - uid: 18567
     components:
@@ -84290,10 +88809,20 @@ entities:
     - type: Transform
       pos: 6.5,-17.5
       parent: 2
-  - uid: 19404
+  - uid: 19405
     components:
     - type: Transform
-      pos: 55.5,-95.5
+      pos: 56.5,-95.5
+      parent: 2
+  - uid: 19500
+    components:
+    - type: Transform
+      pos: 39.5,-72.5
+      parent: 2
+  - uid: 19501
+    components:
+    - type: Transform
+      pos: 39.5,-73.5
       parent: 2
 - proto: OxygenTankFilled
   entities:
@@ -84302,26 +88831,12 @@ entities:
     - type: Transform
       pos: 45.417492,-75.34028
       parent: 2
-  - uid: 19415
-    components:
-    - type: Transform
-      parent: 19414
-    - type: GasTank
-      toggleActionEntity: 19416
-    - type: Physics
-      canCollide: False
-    - type: ActionsContainer
-    - type: ContainerContainer
-      containers:
-        actions: !type:Container
-          ents:
-          - 19416
 - proto: PaintingRedBlueYellow
   entities:
-  - uid: 8126
+  - uid: 5015
     components:
     - type: Transform
-      pos: 72.5,-47.5
+      pos: 72.5,-52.5
       parent: 2
 - proto: PaintingSadClown
   entities:
@@ -84350,19 +88865,34 @@ entities:
   - uid: 18620
     components:
     - type: Transform
-      pos: 78.47605,-43.408283
+      pos: 80.3608,-43.296753
       parent: 2
 - proto: Paper
   entities:
+  - uid: 3480
+    components:
+    - type: Transform
+      pos: 66.67697,-53.468136
+      parent: 2
+  - uid: 3570
+    components:
+    - type: Transform
+      pos: 66.36447,-53.290928
+      parent: 2
+  - uid: 4165
+    components:
+    - type: Transform
+      pos: 66.5103,-53.37432
+      parent: 2
   - uid: 4186
     components:
     - type: Transform
-      pos: 54.276867,-56.4639
+      pos: 53.37837,-55.269226
       parent: 2
   - uid: 5395
     components:
     - type: Transform
-      pos: 54.524124,-56.401188
+      pos: 53.576283,-55.185833
       parent: 2
   - uid: 7024
     components:
@@ -84379,40 +88909,25 @@ entities:
     - type: Transform
       pos: 38.496128,-42.334797
       parent: 2
-  - uid: 7219
+  - uid: 10266
     components:
     - type: Transform
-      pos: 67.52061,-48.449734
+      pos: 70.50045,-46.358585
       parent: 2
-  - uid: 14317
+  - uid: 10267
     components:
     - type: Transform
-      pos: 67.72373,-48.32465
-      parent: 2
-  - uid: 14321
-    components:
-    - type: Transform
-      pos: 67.37998,-48.309013
+      pos: 70.62545,-46.452335
       parent: 2
   - uid: 15341
     components:
     - type: Transform
-      pos: 72.60022,-42.46705
-      parent: 2
-  - uid: 15387
-    components:
-    - type: Transform
-      pos: 69.470856,-50.452137
-      parent: 2
-  - uid: 15388
-    components:
-    - type: Transform
-      pos: 69.595856,-50.56159
+      pos: 51.434155,-37.362362
       parent: 2
   - uid: 15436
     components:
     - type: Transform
-      pos: 72.397095,-42.32633
+      pos: 51.29201,-37.47728
       parent: 2
   - uid: 17835
     components:
@@ -84432,17 +88947,39 @@ entities:
   - uid: 19179
     components:
     - type: Transform
-      pos: -48.143295,-45.120937
+      pos: -48.52036,-46.15865
       parent: 2
   - uid: 19180
     components:
     - type: Transform
-      pos: -47.81517,-45.324207
+      pos: -48.3398,-46.283733
       parent: 2
   - uid: 19181
     components:
     - type: Transform
-      pos: -48.09642,-45.73074
+      pos: -48.47175,-46.374077
+      parent: 2
+  - uid: 19652
+    components:
+    - type: Transform
+      pos: -47.56897,-44.41438
+      parent: 2
+  - uid: 19653
+    components:
+    - type: Transform
+      pos: -47.437027,-44.581165
+      parent: 2
+  - uid: 19654
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.39536,-45.58186
+      parent: 2
+  - uid: 19655
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -48.55508,-44.581165
       parent: 2
 - proto: PaperBin10
   entities:
@@ -84458,23 +88995,22 @@ entities:
     - type: Transform
       pos: 0.5,-66.5
       parent: 2
+  - uid: 4560
+    components:
+    - type: Transform
+      pos: 64.5,-46.5
+      parent: 2
+  - uid: 5600
+    components:
+    - type: Transform
+      pos: 56.5,-56.5
+      parent: 2
   - uid: 6213
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,-57.5
       parent: 2
-  - uid: 9359
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-32.5
-      parent: 2
-  - uid: 9372
-    components:
-    - type: Transform
-      pos: 54.5,-54.5
-      parent: 2
   - uid: 15424
     components:
     - type: Transform
@@ -84485,17 +89021,17 @@ entities:
   - uid: 5487
     components:
     - type: Transform
-      pos: -44.441452,-54.403904
+      pos: -44.415276,-54.439785
       parent: 2
   - uid: 5488
     components:
     - type: Transform
-      pos: -45.003952,-54.435177
+      pos: -44.545387,-54.377243
       parent: 2
   - uid: 5489
     components:
     - type: Transform
-      pos: -45.128952,-54.403904
+      pos: -45.073162,-54.39809
       parent: 2
 - proto: PaperCNCSheet
   entities:
@@ -84546,16 +89082,12 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 7334
-    components:
-    - type: Transform
-      pos: 80.35046,-29.185543
-      parent: 2
 - proto: ParticleAcceleratorControlBoxUnfinished
   entities:
-  - uid: 18385
+  - uid: 18576
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -24.5,-68.5
       parent: 2
 - proto: ParticleAcceleratorEmitterForeUnfinished
@@ -84605,12 +89137,12 @@ entities:
   - uid: 911
     components:
     - type: Transform
-      pos: 28.36074,-13.112216
+      pos: 29.211311,-13.129602
       parent: 2
   - uid: 2734
     components:
     - type: Transform
-      pos: 8.83535,-84.2265
+      pos: 8.644315,-84.24774
       parent: 2
   - uid: 18766
     components:
@@ -84620,7 +89152,7 @@ entities:
   - uid: 18994
     components:
     - type: Transform
-      pos: -9.543121,3.801337
+      pos: -9.507688,-8.41618
       parent: 2
 - proto: PartRodMetal1
   entities:
@@ -84636,6 +89168,11 @@ entities:
     - type: Transform
       pos: 0.61355364,-66.82697
       parent: 2
+  - uid: 3150
+    components:
+    - type: Transform
+      pos: 67.8974,-62.453743
+      parent: 2
   - uid: 3577
     components:
     - type: Transform
@@ -84644,7 +89181,7 @@ entities:
   - uid: 5390
     components:
     - type: Transform
-      pos: 53.839367,-56.307545
+      pos: 53.427128,-55.564804
       parent: 2
   - uid: 6069
     components:
@@ -84678,7 +89215,13 @@ entities:
   - uid: 19182
     components:
     - type: Transform
-      pos: -48.237045,-46.090363
+      pos: -48.624527,-46.49916
+      parent: 2
+  - uid: 19657
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.357563,-45.783386
       parent: 2
 - proto: PersonalAI
   entities:
@@ -84697,11 +89240,6 @@ entities:
       parent: 2
 - proto: Pickaxe
   entities:
-  - uid: 2499
-    components:
-    - type: Transform
-      pos: 10.213623,-84.33916
-      parent: 2
   - uid: 6933
     components:
     - type: Transform
@@ -84715,7 +89253,14 @@ entities:
   - uid: 8064
     components:
     - type: Transform
-      pos: 10.697998,-84.26103
+      pos: 9.692059,-84.39211
+      parent: 2
+- proto: PillCanisterPotassiumIodide
+  entities:
+  - uid: 19671
+    components:
+    - type: Transform
+      pos: -52.315937,-52.474583
       parent: 2
 - proto: PillSpaceDrugs
   entities:
@@ -84741,15 +89286,10 @@ entities:
     - type: Transform
       pos: -25.5,-24.5
       parent: 2
-  - uid: 7240
+  - uid: 7428
     components:
     - type: Transform
-      pos: 53.5,-72.5
-      parent: 2
-  - uid: 7246
-    components:
-    - type: Transform
-      pos: 53.5,-71.5
+      pos: 43.5,-72.5
       parent: 2
   - uid: 7824
     components:
@@ -84758,11 +89298,23 @@ entities:
       parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
-  - uid: 3583
+  - uid: 1616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 61.5,-55.5
+      pos: 61.5,-21.5
+      parent: 2
+  - uid: 3731
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-47.5
+      parent: 2
+  - uid: 3780
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-47.5
       parent: 2
   - uid: 4724
     components:
@@ -84800,29 +89352,34 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -61.5,-63.5
       parent: 2
-  - uid: 10826
+  - uid: 8805
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 78.5,-47.5
+      pos: 80.5,-47.5
       parent: 2
-  - uid: 10833
+  - uid: 8817
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 78.5,-43.5
+      pos: 80.5,-43.5
       parent: 2
-  - uid: 11949
+  - uid: 9585
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 58.5,-55.5
+      pos: 6.5,-77.5
       parent: 2
-  - uid: 15234
+  - uid: 11612
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 87.5,-46.5
+      pos: 89.5,-46.5
+      parent: 2
+  - uid: 11755
+    components:
+    - type: Transform
+      pos: 89.5,-44.5
       parent: 2
   - uid: 16336
     components:
@@ -84842,18 +89399,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -59.5,-61.5
       parent: 2
-  - uid: 19317
+  - uid: 18339
     components:
     - type: Transform
-      pos: 87.5,-44.5
+      pos: 58.5,-20.5
       parent: 2
 - proto: PlasmaTank
   entities:
   - uid: 7689
     components:
     - type: Transform
-      pos: 46.41668,-74.34582
+      pos: 46.344013,-75.307045
       parent: 2
+    - type: GasTank
+      toggleActionEntity: 3031
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 3031
   - uid: 18387
     components:
     - type: Transform
@@ -84913,17 +89478,18 @@ entities:
       parent: 2
 - proto: PlasmaWindoorSecureCommandLocked
   entities:
+  - uid: 529
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,-44.5
+      parent: 2
   - uid: 2378
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -37.5,-45.5
       parent: 2
-  - uid: 2480
-    components:
-    - type: Transform
-      pos: 76.5,-46.5
-      parent: 2
   - uid: 2896
     components:
     - type: Transform
@@ -84940,28 +89506,33 @@ entities:
     - type: Transform
       pos: -45.5,-37.5
       parent: 2
-  - uid: 7657
+  - uid: 7139
     components:
     - type: Transform
-      pos: 77.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,-44.5
+      parent: 2
+  - uid: 7540
+    components:
+    - type: Transform
+      pos: 80.5,-46.5
+      parent: 2
+  - uid: 7564
+    components:
+    - type: Transform
+      pos: 81.5,-46.5
+      parent: 2
+  - uid: 7606
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-45.5
       parent: 2
   - uid: 10491
     components:
     - type: Transform
       pos: 78.5,-46.5
       parent: 2
-  - uid: 10834
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 77.5,-44.5
-      parent: 2
-  - uid: 14303
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 76.5,-44.5
-      parent: 2
   - uid: 15816
     components:
     - type: Transform
@@ -84979,12 +89550,6 @@ entities:
     - type: Transform
       pos: 79.5,-46.5
       parent: 2
-  - uid: 18554
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 90.5,-45.5
-      parent: 2
 - proto: PlasmaWindoorSecureEngineeringLocked
   entities:
   - uid: 356
@@ -84993,17 +89558,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-74.5
       parent: 2
-  - uid: 8166
+  - uid: 10831
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 92.5,-45.5
+      pos: 94.5,-45.5
       parent: 2
-  - uid: 15288
+  - uid: 10833
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 96.5,-45.5
+      parent: 2
+  - uid: 11467
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 86.5,-45.5
+      pos: 88.5,-45.5
       parent: 2
   - uid: 17096
     components:
@@ -85011,14 +89582,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-74.5
       parent: 2
-  - uid: 17346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 94.5,-45.5
-      parent: 2
 - proto: PlasmaWindoorSecureScienceLocked
   entities:
+  - uid: 5117
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-29.5
+      parent: 2
   - uid: 11364
     components:
     - type: Transform
@@ -85037,11 +89608,17 @@ entities:
       parent: 2
 - proto: PlasmaWindoorSecureSecurityLocked
   entities:
-  - uid: 3327
+  - uid: 2724
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 60.5,-55.5
+      pos: 60.5,-47.5
+      parent: 2
+  - uid: 3065
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-47.5
       parent: 2
   - uid: 6143
     components:
@@ -85049,40 +89626,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-49.5
       parent: 2
-  - uid: 11950
+  - uid: 18316
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-55.5
-      parent: 2
-- proto: PlasmaWindow
-  entities:
-  - uid: 4020
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-20.5
       parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 5308
+  - uid: 3692
     components:
     - type: Transform
-      pos: 42.5,-26.5
-      parent: 2
-  - uid: 5367
-    components:
-    - type: Transform
-      pos: 45.5,-25.5
-      parent: 2
-  - uid: 5371
-    components:
-    - type: Transform
-      pos: 50.5,-44.5
-      parent: 2
-  - uid: 5372
-    components:
-    - type: Transform
-      pos: 53.5,-44.5
+      pos: 45.5,-31.5
       parent: 2
   - uid: 6650
     components:
@@ -85114,41 +89669,44 @@ entities:
     - type: Transform
       pos: 32.5,-85.5
       parent: 2
-  - uid: 16451
+  - uid: 10705
     components:
     - type: Transform
-      pos: 59.5,-74.5
+      pos: 72.5,-72.5
       parent: 2
-  - uid: 16452
+  - uid: 10706
     components:
     - type: Transform
-      pos: 59.5,-77.5
+      pos: 72.5,-69.5
+      parent: 2
+  - uid: 12791
+    components:
+    - type: Transform
+      pos: 45.5,-34.5
+      parent: 2
+  - uid: 13900
+    components:
+    - type: Transform
+      pos: 44.5,-26.5
+      parent: 2
+  - uid: 14863
+    components:
+    - type: Transform
+      pos: 41.5,-27.5
       parent: 2
 - proto: PlasticFlapsAirtightOpaque
   entities:
-  - uid: 5353
+  - uid: 3716
     components:
     - type: Transform
-      pos: 36.5,-26.5
+      pos: 36.5,-28.5
       parent: 2
 - proto: PlayerStationAi
   entities:
-  - uid: 16346
+  - uid: 10852
     components:
     - type: Transform
-      pos: 89.5,-45.5
-      parent: 2
-- proto: PlushieArachind
-  entities:
-  - uid: 19307
-    components:
-    - type: Transform
-      pos: 35.49261,-72.56146
-      parent: 2
-  - uid: 19381
-    components:
-    - type: Transform
-      pos: 68.46672,-46.45258
+      pos: 91.5,-45.5
       parent: 2
 - proto: PlushieAtmosian
   entities:
@@ -85175,6 +89733,13 @@ entities:
     - type: Transform
       pos: 83.57618,-18.55573
       parent: 2
+- proto: PlushieHampter
+  entities:
+  - uid: 16194
+    components:
+    - type: Transform
+      pos: 5.520261,-62.526257
+      parent: 2
 - proto: PlushieHuman
   entities:
   - uid: 17580
@@ -85182,12 +89747,12 @@ entities:
     - type: Transform
       pos: 10.276115,-44.41428
       parent: 2
-- proto: PlushieLizard
+- proto: PlushieLizardInversed
   entities:
-  - uid: 17523
+  - uid: 6922
     components:
     - type: Transform
-      pos: 83.557396,-72.530266
+      pos: 83.443275,-72.485634
       parent: 2
 - proto: PlushieLizardMirrored
   entities:
@@ -85208,12 +89773,19 @@ entities:
     - type: Transform
       pos: -31.508543,-62.98768
       parent: 2
+- proto: PlushiePenguin
+  entities:
+  - uid: 15800
+    components:
+    - type: Transform
+      pos: 35.491478,-72.45367
+      parent: 2
 - proto: PlushieRGBee
   entities:
   - uid: 15420
     components:
     - type: Transform
-      pos: 42.419292,-16.548712
+      pos: 43.497017,-16.53401
       parent: 2
 - proto: PlushieRouny
   entities:
@@ -85251,6 +89823,15 @@ entities:
     - type: Transform
       pos: -51.020004,-60.457893
       parent: 2
+- proto: PlushieSlime
+  entities:
+  - uid: 5788
+    components:
+    - type: Transform
+      parent: 2004
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: PlushieVox
   entities:
   - uid: 19377
@@ -85272,23 +89853,23 @@ entities:
       parent: 2
 - proto: PortableFlasher
   entities:
-  - uid: 3006
+  - uid: 2164
     components:
     - type: Transform
-      pos: 58.5,-55.5
+      pos: 58.5,-47.5
       parent: 2
-  - uid: 18789
+  - uid: 7585
     components:
     - type: Transform
-      pos: 62.5,-35.5
+      pos: 57.5,-31.5
+      parent: 2
+  - uid: 9196
+    components:
+    - type: Transform
+      pos: 63.5,-36.5
       parent: 2
 - proto: PortableGeneratorJrPacman
   entities:
-  - uid: 4378
-    components:
-    - type: Transform
-      pos: 72.5,-55.5
-      parent: 2
   - uid: 8372
     components:
     - type: Transform
@@ -85299,6 +89880,21 @@ entities:
     - type: Transform
       pos: -8.5,-6.5
       parent: 2
+  - uid: 15437
+    components:
+    - type: Transform
+      pos: 78.5,-41.5
+      parent: 2
+  - uid: 15529
+    components:
+    - type: Transform
+      pos: 37.5,-91.5
+      parent: 2
+  - uid: 15779
+    components:
+    - type: Transform
+      pos: 54.5,-69.5
+      parent: 2
   - uid: 16181
     components:
     - type: Transform
@@ -85329,11 +89925,6 @@ entities:
     - type: Transform
       pos: 18.5,-58.5
       parent: 2
-  - uid: 19385
-    components:
-    - type: Transform
-      pos: 45.5,-72.5
-      parent: 2
   - uid: 19388
     components:
     - type: Transform
@@ -85351,6 +89942,11 @@ entities:
     - type: Transform
       pos: -11.5,-66.5
       parent: 2
+  - uid: 17727
+    components:
+    - type: Transform
+      pos: -5.5,-75.5
+      parent: 2
 - proto: PortableGeneratorSuperPacman
   entities:
   - uid: 5729
@@ -85358,11 +89954,6 @@ entities:
     - type: Transform
       pos: -11.5,-65.5
       parent: 2
-  - uid: 16979
-    components:
-    - type: Transform
-      pos: 37.5,-91.5
-      parent: 2
 - proto: PortableScrubber
   entities:
   - uid: 7976
@@ -85538,12 +90129,6 @@ entities:
       parent: 2
 - proto: PosterContrabandExoAcid
   entities:
-  - uid: 19147
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 2
   - uid: 19150
     components:
     - type: Transform
@@ -85580,35 +90165,23 @@ entities:
       parent: 2
 - proto: PosterContrabandExoChomp
   entities:
+  - uid: 10734
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-41.5
+      parent: 2
   - uid: 18764
     components:
     - type: Transform
       pos: -37.5,-17.5
       parent: 2
-  - uid: 19128
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-3.5
-      parent: 2
   - uid: 19148
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-26.5
       parent: 2
-  - uid: 19151
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 73.5,-43.5
-      parent: 2
-  - uid: 19191
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-33.5
-      parent: 2
   - uid: 19202
     components:
     - type: Transform
@@ -85617,11 +90190,10 @@ entities:
       parent: 2
 - proto: PosterContrabandExoRun
   entities:
-  - uid: 19152
+  - uid: 7810
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 75.5,-43.5
+      pos: 74.5,-42.5
       parent: 2
   - uid: 19154
     components:
@@ -85641,11 +90213,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,-21.5
       parent: 2
-  - uid: 19192
+- proto: PosterContrabandHackingGuide
+  entities:
+  - uid: 19421
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-36.5
+      pos: 39.5,-32.5
       parent: 2
 - proto: PosterContrabandLamarr
   entities:
@@ -85661,17 +90234,16 @@ entities:
     - type: Transform
       pos: -23.5,-20.5
       parent: 2
+  - uid: 3137
+    components:
+    - type: Transform
+      pos: 76.5,-38.5
+      parent: 2
   - uid: 4387
     components:
     - type: Transform
       pos: -21.5,-17.5
       parent: 2
-  - uid: 7326
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 81.5,-27.5
-      parent: 2
 - proto: PosterContrabandRouny
   entities:
   - uid: 2672
@@ -85679,10 +90251,10 @@ entities:
     - type: Transform
       pos: -23.5,-21.5
       parent: 2
-  - uid: 19218
+  - uid: 7949
     components:
     - type: Transform
-      pos: 73.5,-37.5
+      pos: 80.5,-25.5
       parent: 2
   - uid: 19219
     components:
@@ -85718,11 +90290,6 @@ entities:
       parent: 2
 - proto: PosterLegitBuild
   entities:
-  - uid: 3712
-    components:
-    - type: Transform
-      pos: 50.5,-31.5
-      parent: 2
   - uid: 17216
     components:
     - type: Transform
@@ -85741,10 +90308,10 @@ entities:
       parent: 2
 - proto: PosterLegitDickGumshue
   entities:
-  - uid: 7263
+  - uid: 16263
     components:
     - type: Transform
-      pos: 71.5,-49.5
+      pos: 71.5,-45.5
       parent: 2
 - proto: PosterLegitDoNotQuestion
   entities:
@@ -85769,15 +90336,15 @@ entities:
       parent: 2
 - proto: PosterLegitFoamForceAd
   entities:
-  - uid: 14308
+  - uid: 8428
     components:
     - type: Transform
-      pos: 64.5,-68.5
+      pos: 70.5,-60.5
       parent: 2
-  - uid: 14956
+  - uid: 8515
     components:
     - type: Transform
-      pos: 64.5,-71.5
+      pos: 68.5,-59.5
       parent: 2
 - proto: PosterLegitHelpOthers
   entities:
@@ -85789,6 +90356,11 @@ entities:
       parent: 2
 - proto: PosterLegitHereForYourSafety
   entities:
+  - uid: 16268
+    components:
+    - type: Transform
+      pos: 70.5,-37.5
+      parent: 2
   - uid: 18196
     components:
     - type: Transform
@@ -85832,6 +90404,16 @@ entities:
       parent: 2
 - proto: PosterLegitNanotrasenLogo
   entities:
+  - uid: 16107
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 2
+  - uid: 16287
+    components:
+    - type: Transform
+      pos: 63.5,-37.5
+      parent: 2
   - uid: 16293
     components:
     - type: Transform
@@ -85855,12 +90437,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,-57.5
       parent: 2
-  - uid: 17221
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-0.5
-      parent: 2
   - uid: 18732
     components:
     - type: Transform
@@ -85871,13 +90447,6 @@ entities:
     - type: Transform
       pos: 26.5,-9.5
       parent: 2
-- proto: PosterLegitNoERP
-  entities:
-  - uid: 7338
-    components:
-    - type: Transform
-      pos: 81.5,-28.5
-      parent: 2
 - proto: PosterLegitObey
   entities:
   - uid: 7159
@@ -85905,10 +90474,10 @@ entities:
     - type: Transform
       pos: 31.5,-47.5
       parent: 2
-  - uid: 15145
+  - uid: 16269
     components:
     - type: Transform
-      pos: 65.5,-48.5
+      pos: 63.5,-45.5
       parent: 2
 - proto: PosterLegitSafetyEyeProtection
   entities:
@@ -85941,6 +90510,11 @@ entities:
       parent: 2
 - proto: PosterLegitSafetyMothEpi
   entities:
+  - uid: 16285
+    components:
+    - type: Transform
+      pos: 49.5,-34.5
+      parent: 2
   - uid: 17233
     components:
     - type: Transform
@@ -85963,6 +90537,12 @@ entities:
       parent: 2
 - proto: PosterLegitSafetyMothMeth
   entities:
+  - uid: 6970
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-67.5
+      parent: 2
   - uid: 17235
     components:
     - type: Transform
@@ -85984,6 +90564,11 @@ entities:
     - type: Transform
       pos: 48.5,-12.5
       parent: 2
+  - uid: 16284
+    components:
+    - type: Transform
+      pos: 57.5,-30.5
+      parent: 2
 - proto: PosterLegitSecWatch
   entities:
   - uid: 7068
@@ -85991,6 +90576,18 @@ entities:
     - type: Transform
       pos: 26.5,-39.5
       parent: 2
+  - uid: 16271
+    components:
+    - type: Transform
+      pos: 54.5,-40.5
+      parent: 2
+- proto: PosterLegitSpaceCops
+  entities:
+  - uid: 16272
+    components:
+    - type: Transform
+      pos: 68.5,-42.5
+      parent: 2
 - proto: PosterLegitStateLaws
   entities:
   - uid: 17222
@@ -86014,8 +90611,19 @@ entities:
     - type: Transform
       pos: 62.5,-15.5
       parent: 2
+  - uid: 16029
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-60.5
+      parent: 2
 - proto: PosterLegitWorkForAFuture
   entities:
+  - uid: 16270
+    components:
+    - type: Transform
+      pos: 73.5,-40.5
+      parent: 2
   - uid: 17220
     components:
     - type: Transform
@@ -86024,10 +90632,10 @@ entities:
       parent: 2
 - proto: PottedPlant0
   entities:
-  - uid: 7795
+  - uid: 7767
     components:
     - type: Transform
-      pos: 31.5,-12.5
+      pos: 32.5,-12.5
       parent: 2
 - proto: PottedPlant13
   entities:
@@ -86061,17 +90669,24 @@ entities:
       parent: 2
 - proto: PottedPlant2
   entities:
-  - uid: 3525
+  - uid: 7052
     components:
     - type: Transform
       pos: 52.5,-54.5
       parent: 2
-- proto: PottedPlant22
+- proto: PottedPlant21
   entities:
-  - uid: 206
+  - uid: 294
     components:
     - type: Transform
-      pos: 67.5,-50.5
+      pos: 29.5,-20.5
+      parent: 2
+- proto: PottedPlant22
+  entities:
+  - uid: 9335
+    components:
+    - type: Transform
+      pos: 68.5,-46.5
       parent: 2
   - uid: 17301
     components:
@@ -86080,6 +90695,11 @@ entities:
       parent: 2
 - proto: PottedPlant7
   entities:
+  - uid: 10797
+    components:
+    - type: Transform
+      pos: 24.5,-21.5
+      parent: 2
   - uid: 17134
     components:
     - type: Transform
@@ -86092,16 +90712,21 @@ entities:
       parent: 2
 - proto: PottedPlantBioluminscent
   entities:
-  - uid: 5794
+  - uid: 8788
     components:
     - type: Transform
-      pos: 22.5,-14.5
+      pos: 24.5,-14.5
       parent: 2
   - uid: 15882
     components:
     - type: Transform
       pos: -25.5,-14.5
       parent: 2
+  - uid: 16870
+    components:
+    - type: Transform
+      pos: 26.5,-25.5
+      parent: 2
   - uid: 18317
     components:
     - type: Transform
@@ -86124,7 +90749,14 @@ entities:
   - uid: 19374
     components:
     - type: Transform
-      pos: -22.293167,-52.05227
+      pos: -22.231848,-52.133213
+      parent: 2
+- proto: PowerCellPotato
+  entities:
+  - uid: 8837
+    components:
+    - type: Transform
+      pos: -42.410385,-62.55689
       parent: 2
 - proto: PowerCellRecharger
   entities:
@@ -86133,6 +90765,11 @@ entities:
     - type: Transform
       pos: 21.5,-30.5
       parent: 2
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 65.5,-31.5
+      parent: 2
   - uid: 1879
     components:
     - type: Transform
@@ -86159,11 +90796,40 @@ entities:
     - type: Transform
       pos: 77.5,-21.5
       parent: 2
+  - uid: 14432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-18.5
+      parent: 2
   - uid: 18523
     components:
     - type: Transform
       pos: -16.5,-57.5
       parent: 2
+  - uid: 19289
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-84.5
+      parent: 2
+  - uid: 19309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-90.5
+      parent: 2
+  - uid: 19672
+    components:
+    - type: Transform
+      pos: -53.5,-42.5
+      parent: 2
+  - uid: 20010
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-68.5
+      parent: 2
 - proto: PowerComputerCircuitboard
   entities:
   - uid: 18307
@@ -86179,18 +90845,41 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-40.5
       parent: 2
+  - uid: 287
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 94.5,-46.5
+      parent: 2
   - uid: 468
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -40.5,-15.5
       parent: 2
+  - uid: 806
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-30.5
+      parent: 2
   - uid: 850
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-32.5
       parent: 2
+  - uid: 916
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-12.5
+      parent: 2
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: 41.5,-23.5
+      parent: 2
   - uid: 1449
     components:
     - type: Transform
@@ -86238,12 +90927,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-48.5
       parent: 2
-  - uid: 2920
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-39.5
-      parent: 2
   - uid: 2968
     components:
     - type: Transform
@@ -86256,12 +90939,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-40.5
       parent: 2
-  - uid: 3023
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-53.5
-      parent: 2
   - uid: 3064
     components:
     - type: Transform
@@ -86273,17 +90950,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-30.5
       parent: 2
-  - uid: 3210
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-26.5
-      parent: 2
-  - uid: 3280
-    components:
-    - type: Transform
-      pos: 34.5,-25.5
-      parent: 2
   - uid: 3348
     components:
     - type: Transform
@@ -86307,12 +90973,6 @@ entities:
     - type: Transform
       pos: 63.5,-16.5
       parent: 2
-  - uid: 4347
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-52.5
-      parent: 2
   - uid: 4511
     components:
     - type: Transform
@@ -86365,12 +91025,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 35.5,-69.5
       parent: 2
-  - uid: 5403
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-49.5
-      parent: 2
   - uid: 5780
     components:
     - type: Transform
@@ -86387,6 +91041,12 @@ entities:
     - type: Transform
       pos: 12.5,-27.5
       parent: 2
+  - uid: 5881
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-72.5
+      parent: 2
   - uid: 6206
     components:
     - type: Transform
@@ -86398,41 +91058,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-67.5
       parent: 2
+  - uid: 6289
+    components:
+    - type: Transform
+      pos: 68.5,-32.5
+      parent: 2
+  - uid: 6390
+    components:
+    - type: Transform
+      pos: 34.5,-26.5
+      parent: 2
   - uid: 6578
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,-20.5
       parent: 2
-  - uid: 6617
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-34.5
-      parent: 2
-  - uid: 6619
+  - uid: 7158
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 68.5,-43.5
-      parent: 2
-  - uid: 6620
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-43.5
-      parent: 2
-  - uid: 7096
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-59.5
-      parent: 2
-  - uid: 7098
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-57.5
+      pos: 68.5,-36.5
       parent: 2
   - uid: 7199
     components:
@@ -86440,11 +91086,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-21.5
       parent: 2
-  - uid: 7230
-    components:
-    - type: Transform
-      pos: 61.5,-48.5
-      parent: 2
   - uid: 7234
     components:
     - type: Transform
@@ -86463,6 +91104,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-52.5
       parent: 2
+  - uid: 7568
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-27.5
+      parent: 2
+  - uid: 7598
+    components:
+    - type: Transform
+      pos: 79.5,-43.5
+      parent: 2
   - uid: 7655
     components:
     - type: Transform
@@ -86504,12 +91156,6 @@ entities:
     - type: Transform
       pos: 40.5,-52.5
       parent: 2
-  - uid: 7970
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-12.5
-      parent: 2
   - uid: 8037
     components:
     - type: Transform
@@ -86527,62 +91173,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,-51.5
       parent: 2
-  - uid: 8822
-    components:
-    - type: Transform
-      pos: 77.5,-43.5
-      parent: 2
   - uid: 9074
     components:
     - type: Transform
       pos: 11.5,-77.5
       parent: 2
-  - uid: 9297
-    components:
-    - type: Transform
-      pos: 66.5,-54.5
-      parent: 2
-  - uid: 9306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-46.5
-      parent: 2
-  - uid: 9336
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-45.5
-      parent: 2
-  - uid: 9345
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-21.5
-      parent: 2
-  - uid: 9361
-    components:
-    - type: Transform
-      pos: 56.5,-48.5
-      parent: 2
-  - uid: 9585
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-55.5
-      parent: 2
-  - uid: 9678
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-32.5
-      parent: 2
   - uid: 9679
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 65.5,-29.5
       parent: 2
+  - uid: 9822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-60.5
+      parent: 2
   - uid: 9885
     components:
     - type: Transform
@@ -86600,17 +91207,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-15.5
       parent: 2
-  - uid: 10307
+  - uid: 10411
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 46.5,-72.5
-      parent: 2
-  - uid: 10338
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-39.5
+      pos: 79.5,-47.5
       parent: 2
   - uid: 10494
     components:
@@ -86622,23 +91223,17 @@ entities:
     - type: Transform
       pos: -6.5,-30.5
       parent: 2
-  - uid: 10773
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-52.5
-      parent: 2
-  - uid: 10802
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-52.5
-      parent: 2
-  - uid: 10804
+  - uid: 10741
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 58.5,-57.5
+      pos: 50.5,-34.5
+      parent: 2
+  - uid: 10830
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 94.5,-44.5
       parent: 2
   - uid: 11365
     components:
@@ -86656,35 +91251,12 @@ entities:
     - type: Transform
       pos: -11.5,-18.5
       parent: 2
-  - uid: 11687
-    components:
-    - type: Transform
-      pos: 50.5,-49.5
-      parent: 2
-  - uid: 11697
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-34.5
-      parent: 2
-  - uid: 11699
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-28.5
-      parent: 2
   - uid: 11707
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 58.5,-20.5
       parent: 2
-  - uid: 11754
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 48.5,-70.5
-      parent: 2
   - uid: 11916
     components:
     - type: Transform
@@ -86702,11 +91274,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,-27.5
       parent: 2
-  - uid: 11956
+  - uid: 11947
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 62.5,-21.5
+      pos: 45.5,-73.5
+      parent: 2
+  - uid: 12786
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-65.5
       parent: 2
   - uid: 12827
     components:
@@ -86743,10 +91321,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-21.5
       parent: 2
-  - uid: 13797
+  - uid: 13545
     components:
     - type: Transform
-      pos: 67.5,-50.5
+      rot: 3.141592653589793 rad
+      pos: 38.5,-71.5
       parent: 2
   - uid: 13847
     components:
@@ -86754,24 +91333,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 62.5,-29.5
       parent: 2
-  - uid: 13867
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-34.5
-      parent: 2
-  - uid: 13875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 77.5,-47.5
-      parent: 2
   - uid: 13888
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 43.5,-16.5
       parent: 2
+  - uid: 13918
+    components:
+    - type: Transform
+      pos: 33.5,-63.5
+      parent: 2
   - uid: 13946
     components:
     - type: Transform
@@ -87146,12 +91718,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-56.5
       parent: 2
-  - uid: 14082
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-59.5
-      parent: 2
   - uid: 14084
     components:
     - type: Transform
@@ -87500,6 +92066,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,-47.5
       parent: 2
+  - uid: 14193
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-73.5
+      parent: 2
   - uid: 14202
     components:
     - type: Transform
@@ -87666,24 +92238,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-52.5
       parent: 2
-  - uid: 14275
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-21.5
-      parent: 2
-  - uid: 14276
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-18.5
-      parent: 2
-  - uid: 14281
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-17.5
-      parent: 2
   - uid: 14284
     components:
     - type: Transform
@@ -87706,13 +92260,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 40.5,-73.5
-      parent: 2
-  - uid: 14320
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-39.5
+      pos: 44.5,-72.5
       parent: 2
   - uid: 14324
     components:
@@ -87759,29 +92307,6 @@ entities:
     - type: Transform
       pos: 54.5,-13.5
       parent: 2
-  - uid: 14350
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 92.5,-46.5
-      parent: 2
-  - uid: 14351
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 92.5,-44.5
-      parent: 2
-  - uid: 14352
-    components:
-    - type: Transform
-      pos: 86.5,-43.5
-      parent: 2
-  - uid: 14353
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 86.5,-47.5
-      parent: 2
   - uid: 14412
     components:
     - type: Transform
@@ -87830,22 +92355,231 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,-15.5
       parent: 2
-  - uid: 14875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-23.5
-      parent: 2
   - uid: 14946
     components:
     - type: Transform
       pos: 14.5,-11.5
       parent: 2
+  - uid: 15146
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-31.5
+      parent: 2
+  - uid: 15148
+    components:
+    - type: Transform
+      pos: 57.5,-31.5
+      parent: 2
+  - uid: 15158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-38.5
+      parent: 2
+  - uid: 15200
+    components:
+    - type: Transform
+      pos: 56.5,-36.5
+      parent: 2
+  - uid: 15201
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-39.5
+      parent: 2
+  - uid: 15202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-28.5
+      parent: 2
+  - uid: 15203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-29.5
+      parent: 2
+  - uid: 15204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-28.5
+      parent: 2
+  - uid: 15205
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-39.5
+      parent: 2
+  - uid: 15206
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-41.5
+      parent: 2
+  - uid: 15207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-42.5
+      parent: 2
+  - uid: 15208
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-52.5
+      parent: 2
+  - uid: 15209
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-51.5
+      parent: 2
+  - uid: 15210
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-53.5
+      parent: 2
+  - uid: 15211
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-47.5
+      parent: 2
+  - uid: 15212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-44.5
+      parent: 2
+  - uid: 15213
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-44.5
+      parent: 2
+  - uid: 15215
+    components:
+    - type: Transform
+      pos: 52.5,-43.5
+      parent: 2
+  - uid: 15216
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-47.5
+      parent: 2
+  - uid: 15217
+    components:
+    - type: Transform
+      pos: 49.5,-50.5
+      parent: 2
+  - uid: 15218
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-46.5
+      parent: 2
+  - uid: 15219
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-41.5
+      parent: 2
+  - uid: 15225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-41.5
+      parent: 2
+  - uid: 15226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-35.5
+      parent: 2
+  - uid: 15227
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-32.5
+      parent: 2
+  - uid: 15233
+    components:
+    - type: Transform
+      pos: 60.5,-31.5
+      parent: 2
+  - uid: 15234
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-34.5
+      parent: 2
+  - uid: 15236
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-34.5
+      parent: 2
+  - uid: 15237
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-44.5
+      parent: 2
+  - uid: 15238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-38.5
+      parent: 2
+  - uid: 15247
+    components:
+    - type: Transform
+      pos: 88.5,-43.5
+      parent: 2
+  - uid: 15248
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 88.5,-47.5
+      parent: 2
+  - uid: 15251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-49.5
+      parent: 2
+  - uid: 15252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-49.5
+      parent: 2
+  - uid: 15253
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-51.5
+      parent: 2
   - uid: 15277
     components:
     - type: Transform
       pos: 49.5,-13.5
       parent: 2
+  - uid: 15394
+    components:
+    - type: Transform
+      pos: 54.5,-55.5
+      parent: 2
+  - uid: 15399
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-57.5
+      parent: 2
   - uid: 15411
     components:
     - type: Transform
@@ -87857,12 +92591,6 @@ entities:
     - type: Transform
       pos: 53.5,-18.5
       parent: 2
-  - uid: 15458
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-35.5
-      parent: 2
   - uid: 15877
     components:
     - type: Transform
@@ -87874,11 +92602,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,-14.5
       parent: 2
-  - uid: 16291
+  - uid: 16147
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 21.5,-17.5
+      pos: -37.5,-15.5
       parent: 2
   - uid: 16350
     components:
@@ -87898,23 +92626,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-100.5
       parent: 2
-  - uid: 16369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,-29.5
-      parent: 2
-  - uid: 16374
-    components:
-    - type: Transform
-      pos: 68.5,-31.5
-      parent: 2
-  - uid: 16529
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-39.5
-      parent: 2
   - uid: 16533
     components:
     - type: Transform
@@ -87959,23 +92670,6 @@ entities:
     - type: Transform
       pos: 19.5,-27.5
       parent: 2
-  - uid: 17094
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-29.5
-      parent: 2
-  - uid: 17260
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-25.5
-      parent: 2
-  - uid: 17280
-    components:
-    - type: Transform
-      pos: 39.5,-23.5
-      parent: 2
   - uid: 17290
     components:
     - type: Transform
@@ -87993,12 +92687,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,-31.5
       parent: 2
+  - uid: 17549
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-68.5
+      parent: 2
   - uid: 17698
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,-75.5
       parent: 2
+  - uid: 17785
+    components:
+    - type: Transform
+      pos: -12.5,-11.5
+      parent: 2
   - uid: 17806
     components:
     - type: Transform
@@ -88016,18 +92721,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-89.5
       parent: 2
-  - uid: 17925
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-55.5
-      parent: 2
-  - uid: 18066
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-17.5
-      parent: 2
   - uid: 18069
     components:
     - type: Transform
@@ -88039,12 +92732,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,-13.5
       parent: 2
-  - uid: 18071
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-14.5
-      parent: 2
   - uid: 18072
     components:
     - type: Transform
@@ -88216,18 +92903,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 48.5,-17.5
       parent: 2
-  - uid: 18114
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-16.5
-      parent: 2
-  - uid: 18115
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-23.5
-      parent: 2
   - uid: 18116
     components:
     - type: Transform
@@ -88270,12 +92945,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-25.5
       parent: 2
-  - uid: 18127
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -38.5,-16.5
-      parent: 2
   - uid: 18128
     components:
     - type: Transform
@@ -88324,11 +92993,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,-53.5
       parent: 2
-  - uid: 18145
-    components:
-    - type: Transform
-      pos: -16.5,-52.5
-      parent: 2
   - uid: 18146
     components:
     - type: Transform
@@ -88358,12 +93022,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,-22.5
       parent: 2
-  - uid: 18154
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,-23.5
-      parent: 2
   - uid: 18155
     components:
     - type: Transform
@@ -88376,12 +93034,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 40.5,-18.5
       parent: 2
-  - uid: 18158
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-42.5
-      parent: 2
   - uid: 18176
     components:
     - type: Transform
@@ -88441,12 +93093,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-14.5
       parent: 2
-  - uid: 18342
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-68.5
-      parent: 2
   - uid: 18357
     components:
     - type: Transform
@@ -88458,30 +93104,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-10.5
       parent: 2
-  - uid: 18525
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-46.5
-      parent: 2
-  - uid: 18629
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-26.5
-      parent: 2
-  - uid: 18630
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-32.5
-      parent: 2
   - uid: 18784
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -35.5,-15.5
       parent: 2
+  - uid: 18824
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-19.5
+      parent: 2
   - uid: 19020
     components:
     - type: Transform
@@ -88539,14 +93173,144 @@ entities:
     - type: Transform
       pos: 11.5,-34.5
       parent: 2
-- proto: PoweredlightExterior
-  entities:
-  - uid: 3206
+  - uid: 19443
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 30.5,-9.5
+      pos: -31.5,-13.5
       parent: 2
+  - uid: 19472
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-24.5
+      parent: 2
+  - uid: 19475
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-24.5
+      parent: 2
+  - uid: 19492
+    components:
+    - type: Transform
+      pos: 45.5,-63.5
+      parent: 2
+  - uid: 19498
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-72.5
+      parent: 2
+  - uid: 19511
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-24.5
+      parent: 2
+  - uid: 19512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-20.5
+      parent: 2
+  - uid: 19538
+    components:
+    - type: Transform
+      pos: -17.5,-53.5
+      parent: 2
+  - uid: 19542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+      parent: 2
+  - uid: 19543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-20.5
+      parent: 2
+  - uid: 19544
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-20.5
+      parent: 2
+  - uid: 19546
+    components:
+    - type: Transform
+      pos: 35.5,-11.5
+      parent: 2
+  - uid: 19547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,-15.5
+      parent: 2
+  - uid: 19548
+    components:
+    - type: Transform
+      pos: 34.5,-17.5
+      parent: 2
+  - uid: 19549
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,-24.5
+      parent: 2
+  - uid: 19550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-24.5
+      parent: 2
+  - uid: 19552
+    components:
+    - type: Transform
+      pos: 39.5,-23.5
+      parent: 2
+  - uid: 19553
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-11.5
+      parent: 2
+  - uid: 19576
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-51.5
+      parent: 2
+  - uid: 19580
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-14.5
+      parent: 2
+  - uid: 19644
+    components:
+    - type: Transform
+      pos: 62.5,-20.5
+      parent: 2
+  - uid: 19729
+    components:
+    - type: Transform
+      pos: 33.5,-97.5
+      parent: 2
+  - uid: 20052
+    components:
+    - type: Transform
+      pos: 84.5,-44.5
+      parent: 2
+  - uid: 20053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-46.5
+      parent: 2
+- proto: PoweredlightExterior
+  entities:
   - uid: 3393
     components:
     - type: Transform
@@ -88557,6 +93321,18 @@ entities:
     - type: Transform
       pos: -30.5,-74.5
       parent: 2
+  - uid: 3898
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 99.5,-48.5
+      parent: 2
+  - uid: 9388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 99.5,-42.5
+      parent: 2
   - uid: 9953
     components:
     - type: Transform
@@ -88569,18 +93345,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -59.5,-59.5
       parent: 2
-  - uid: 10448
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 97.5,-48.5
-      parent: 2
-  - uid: 11396
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 97.5,-42.5
-      parent: 2
   - uid: 14064
     components:
     - type: Transform
@@ -88640,6 +93404,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 87.5,-19.5
       parent: 2
+  - uid: 15249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-50.5
+      parent: 2
+  - uid: 15250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-40.5
+      parent: 2
   - uid: 15286
     components:
     - type: Transform
@@ -88739,6 +93515,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-41.5
       parent: 2
+  - uid: 19596
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-38.5
+      parent: 2
+  - uid: 19598
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-46.5
+      parent: 2
+  - uid: 19599
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-38.5
+      parent: 2
+  - uid: 19600
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-46.5
+      parent: 2
 - proto: PoweredLightPostSmall
   entities:
   - uid: 235
@@ -88767,35 +93567,35 @@ entities:
       parent: 2
 - proto: PoweredSmallLight
   entities:
-  - uid: 887
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-67.5
-      parent: 2
   - uid: 1209
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -59.5,-25.5
       parent: 2
+  - uid: 1694
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-24.5
+      parent: 2
   - uid: 1702
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,-90.5
       parent: 2
-  - uid: 1801
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-74.5
-      parent: 2
-  - uid: 1878
+  - uid: 1806
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 57.5,-64.5
+      pos: 52.5,-37.5
+      parent: 2
+  - uid: 2293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-38.5
       parent: 2
   - uid: 2882
     components:
@@ -88815,6 +93615,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,-61.5
       parent: 2
+  - uid: 3495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-37.5
+      parent: 2
+  - uid: 3948
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-36.5
+      parent: 2
   - uid: 4303
     components:
     - type: Transform
@@ -88838,11 +93650,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,-61.5
       parent: 2
-  - uid: 4983
+  - uid: 5298
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,-77.5
+      pos: 71.5,-70.5
+      parent: 2
+  - uid: 5308
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-72.5
       parent: 2
   - uid: 6045
     components:
@@ -88861,12 +93678,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-61.5
       parent: 2
-  - uid: 6618
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-43.5
-      parent: 2
   - uid: 7146
     components:
     - type: Transform
@@ -88877,28 +93688,16 @@ entities:
     - type: Transform
       pos: -47.5,-64.5
       parent: 2
-  - uid: 7171
+  - uid: 7454
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-70.5
+      pos: -41.5,-61.5
       parent: 2
-  - uid: 7180
+  - uid: 7997
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-72.5
-      parent: 2
-  - uid: 8045
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-62.5
-      parent: 2
-  - uid: 8836
-    components:
-    - type: Transform
-      pos: -41.5,-75.5
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-26.5
       parent: 2
   - uid: 9307
     components:
@@ -88911,57 +93710,46 @@ entities:
     - type: Transform
       pos: -42.5,-65.5
       parent: 2
-  - uid: 10278
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-29.5
-      parent: 2
   - uid: 10283
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 35.5,-45.5
       parent: 2
-  - uid: 10436
+  - uid: 10743
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-57.5
+      parent: 2
+  - uid: 10795
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-43.5
+      parent: 2
+  - uid: 11130
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 68.5,-57.5
+      pos: -37.5,-80.5
+      parent: 2
+  - uid: 11131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-78.5
       parent: 2
   - uid: 11397
     components:
     - type: Transform
       pos: -54.5,-27.5
       parent: 2
-  - uid: 11755
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 74.5,-43.5
-      parent: 2
-  - uid: 12910
-    components:
-    - type: Transform
-      pos: 60.5,-65.5
-      parent: 2
-  - uid: 12912
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-70.5
-      parent: 2
   - uid: 12915
     components:
     - type: Transform
       pos: 20.5,-63.5
       parent: 2
-  - uid: 12992
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 41.5,-32.5
-      parent: 2
   - uid: 13390
     components:
     - type: Transform
@@ -89171,11 +93959,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -38.5,-62.5
       parent: 2
-  - uid: 14193
-    components:
-    - type: Transform
-      pos: -40.5,-61.5
-      parent: 2
   - uid: 14194
     components:
     - type: Transform
@@ -89227,40 +94010,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-50.5
       parent: 2
-  - uid: 14237
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-41.5
-      parent: 2
-  - uid: 14279
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-12.5
-      parent: 2
-  - uid: 14318
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.5,-62.5
-      parent: 2
-  - uid: 14329
-    components:
-    - type: Transform
-      pos: 71.5,-61.5
-      parent: 2
-  - uid: 14330
-    components:
-    - type: Transform
-      pos: 70.5,-67.5
-      parent: 2
-  - uid: 14331
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-65.5
-      parent: 2
   - uid: 14332
     components:
     - type: Transform
@@ -89285,11 +94034,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
-  - uid: 14404
-    components:
-    - type: Transform
-      pos: 41.5,-37.5
-      parent: 2
   - uid: 14418
     components:
     - type: Transform
@@ -89301,60 +94045,213 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-25.5
       parent: 2
-  - uid: 14428
+  - uid: 15214
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 79.5,-69.5
+      rot: -1.5707963267948966 rad
+      pos: 79.5,-58.5
       parent: 2
-  - uid: 15160
+  - uid: 15240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-44.5
+      parent: 2
+  - uid: 15245
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 76.5,-47.5
+      parent: 2
+  - uid: 15246
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 43.5,-25.5
+      pos: 75.5,-45.5
+      parent: 2
+  - uid: 15254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-50.5
+      parent: 2
+  - uid: 15255
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-56.5
+      parent: 2
+  - uid: 15256
+    components:
+    - type: Transform
+      pos: 58.5,-68.5
+      parent: 2
+  - uid: 15257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-74.5
+      parent: 2
+  - uid: 15258
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-71.5
+      parent: 2
+  - uid: 15259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-68.5
+      parent: 2
+  - uid: 15260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-65.5
+      parent: 2
+  - uid: 15264
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-66.5
       parent: 2
   - uid: 15271
     components:
     - type: Transform
       pos: 42.5,-49.5
       parent: 2
-  - uid: 15400
+  - uid: 15288
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 74.5,-49.5
+      pos: 73.5,-61.5
       parent: 2
-  - uid: 15410
+  - uid: 15331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-66.5
+      parent: 2
+  - uid: 15334
+    components:
+    - type: Transform
+      pos: 66.5,-62.5
+      parent: 2
+  - uid: 15336
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-68.5
+      parent: 2
+  - uid: 15339
+    components:
+    - type: Transform
+      pos: 75.5,-60.5
+      parent: 2
+  - uid: 15340
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 65.5,-60.5
+      pos: 70.5,-64.5
       parent: 2
-  - uid: 15429
+  - uid: 15359
     components:
     - type: Transform
-      pos: 74.5,-58.5
+      rot: 3.141592653589793 rad
+      pos: 66.5,-69.5
+      parent: 2
+  - uid: 15373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-66.5
+      parent: 2
+  - uid: 15386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-75.5
+      parent: 2
+  - uid: 15387
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-76.5
+      parent: 2
+  - uid: 15388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-55.5
       parent: 2
   - uid: 15430
     components:
     - type: Transform
       pos: 77.5,-51.5
       parent: 2
-  - uid: 15435
+  - uid: 15462
     components:
     - type: Transform
-      pos: 67.5,-65.5
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-59.5
       parent: 2
-  - uid: 15437
+  - uid: 15546
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 48.5,-45.5
+      pos: 80.5,-70.5
       parent: 2
-  - uid: 15450
+  - uid: 15852
     components:
     - type: Transform
-      pos: 70.5,-40.5
+      pos: 48.5,-26.5
+      parent: 2
+  - uid: 15853
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-32.5
+      parent: 2
+  - uid: 15856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-38.5
+      parent: 2
+  - uid: 15857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-43.5
+      parent: 2
+  - uid: 15858
+    components:
+    - type: Transform
+      pos: 51.5,-40.5
+      parent: 2
+  - uid: 15883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 16021
+    components:
+    - type: Transform
+      pos: 41.5,-32.5
+      parent: 2
+  - uid: 16022
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-36.5
+      parent: 2
+  - uid: 16028
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-32.5
       parent: 2
   - uid: 16041
     components:
@@ -89362,16 +94259,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,-40.5
       parent: 2
+  - uid: 16118
+    components:
+    - type: Transform
+      pos: 1.5,-59.5
+      parent: 2
+  - uid: 16119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-79.5
+      parent: 2
   - uid: 16172
     components:
     - type: Transform
       pos: 4.5,-75.5
       parent: 2
-  - uid: 16378
-    components:
-    - type: Transform
-      pos: 69.5,-37.5
-      parent: 2
   - uid: 16515
     components:
     - type: Transform
@@ -89389,30 +94292,6 @@ entities:
     - type: Transform
       pos: -33.5,-27.5
       parent: 2
-  - uid: 16538
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 80.5,-64.5
-      parent: 2
-  - uid: 16539
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 76.5,-56.5
-      parent: 2
-  - uid: 16541
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-41.5
-      parent: 2
-  - uid: 16542
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,-31.5
-      parent: 2
   - uid: 16544
     components:
     - type: Transform
@@ -89425,12 +94304,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-91.5
       parent: 2
-  - uid: 16551
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-59.5
-      parent: 2
   - uid: 16554
     components:
     - type: Transform
@@ -89448,34 +94321,21 @@ entities:
     - type: Transform
       pos: -34.5,-29.5
       parent: 2
-  - uid: 16563
+  - uid: 16597
     components:
     - type: Transform
-      pos: 71.5,-71.5
+      pos: -39.5,-77.5
       parent: 2
-  - uid: 16592
+  - uid: 16974
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-63.5
-      parent: 2
-  - uid: 16861
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-76.5
+      pos: 53.5,-96.5
       parent: 2
   - uid: 17137
     components:
     - type: Transform
       pos: -30.5,-60.5
       parent: 2
-  - uid: 17261
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-24.5
-      parent: 2
   - uid: 17274
     components:
     - type: Transform
@@ -89509,22 +94369,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 40.5,-21.5
       parent: 2
-  - uid: 17960
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-17.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ContainerContainer
-      containers:
-        light_bulb: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 17961
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 18030
     components:
     - type: Transform
@@ -89596,6 +94440,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-90.5
       parent: 2
+  - uid: 18401
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-56.5
+      parent: 2
   - uid: 19030
     components:
     - type: Transform
@@ -89607,12 +94457,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-34.5
       parent: 2
-  - uid: 19243
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-29.5
-      parent: 2
   - uid: 19273
     components:
     - type: Transform
@@ -89625,34 +94469,67 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-70.5
       parent: 2
-  - uid: 19405
+  - uid: 19404
     components:
     - type: Transform
-      pos: 54.5,-97.5
+      pos: 55.5,-97.5
       parent: 2
-- proto: PoweredSmallLightEmpty
-  entities:
-  - uid: 17952
+  - uid: 19418
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-34.5
+      parent: 2
+  - uid: 19474
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
+      parent: 2
+  - uid: 19490
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 33.5,-13.5
+      pos: 51.5,-62.5
       parent: 2
-    - type: ContainerContainer
-      containers:
-        light_bulb: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 17953
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: PrefilledSyringe
-  entities:
-  - uid: 7785
+  - uid: 19551
     components:
     - type: Transform
-      pos: 27.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-20.5
       parent: 2
+  - uid: 20009
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-60.5
+      parent: 2
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 15239
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-49.5
+      parent: 2
+  - uid: 15241
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-47.5
+      parent: 2
+  - uid: 15242
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-48.5
+      parent: 2
+  - uid: 17504
+    components:
+    - type: Transform
+      pos: 70.5,-46.5
+      parent: 2
+- proto: PrefilledSyringe
+  entities:
   - uid: 17022
     components:
     - type: Transform
@@ -89660,11 +94537,17 @@ entities:
       parent: 2
 - proto: Protolathe
   entities:
-  - uid: 8016
+  - uid: 19088
     components:
     - type: Transform
-      pos: -3.5,-19.5
+      pos: -4.5,-19.5
       parent: 2
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
 - proto: ProximitySensor
   entities:
   - uid: 4726
@@ -89672,24 +94555,67 @@ entities:
     - type: Transform
       pos: 69.654045,-72.594284
       parent: 2
-- proto: Puddle
-  entities:
-  - uid: 16818
-    components:
-    - type: Transform
-      pos: 79.5,-29.5
-      parent: 2
 - proto: PuddleBlood
   entities:
-  - uid: 1197
+  - uid: 801
     components:
     - type: Transform
-      pos: 42.5,-28.5
+      pos: 80.5,-27.5
       parent: 2
-  - uid: 6711
+  - uid: 1170
     components:
     - type: Transform
-      pos: 41.5,-28.5
+      pos: 76.5,-40.5
+      parent: 2
+  - uid: 2499
+    components:
+    - type: Transform
+      pos: 76.5,-41.5
+      parent: 2
+  - uid: 2767
+    components:
+    - type: Transform
+      pos: 76.5,-39.5
+      parent: 2
+  - uid: 5100
+    components:
+    - type: Transform
+      pos: 75.5,-25.5
+      parent: 2
+  - uid: 5460
+    components:
+    - type: Transform
+      pos: 75.5,-23.5
+      parent: 2
+  - uid: 6244
+    components:
+    - type: Transform
+      pos: 75.5,-24.5
+      parent: 2
+  - uid: 6372
+    components:
+    - type: Transform
+      pos: 80.5,-26.5
+      parent: 2
+  - uid: 7579
+    components:
+    - type: Transform
+      pos: 67.5,-66.5
+      parent: 2
+  - uid: 8447
+    components:
+    - type: Transform
+      pos: 68.5,-66.5
+      parent: 2
+  - uid: 13807
+    components:
+    - type: Transform
+      pos: 79.5,-25.5
+      parent: 2
+  - uid: 13829
+    components:
+    - type: Transform
+      pos: 78.5,-25.5
       parent: 2
   - uid: 14364
     components:
@@ -89776,11 +94702,6 @@ entities:
     - type: Transform
       pos: -26.5,-43.5
       parent: 2
-  - uid: 17479
-    components:
-    - type: Transform
-      pos: 79.5,-27.5
-      parent: 2
   - uid: 17529
     components:
     - type: Transform
@@ -89821,67 +94742,42 @@ entities:
     - type: Transform
       pos: -1.5,-73.5
       parent: 2
-  - uid: 18823
+  - uid: 20054
     components:
     - type: Transform
-      pos: 56.5,-49.5
+      pos: 53.5,-42.5
       parent: 2
-  - uid: 18824
+  - uid: 20055
     components:
     - type: Transform
-      pos: 55.5,-49.5
+      pos: 53.5,-43.5
       parent: 2
-  - uid: 18825
+  - uid: 20057
     components:
     - type: Transform
-      pos: 56.5,-50.5
+      pos: 54.5,-42.5
       parent: 2
-  - uid: 18826
+  - uid: 20059
     components:
     - type: Transform
-      pos: 57.5,-49.5
-      parent: 2
-  - uid: 18835
-    components:
-    - type: Transform
-      pos: 56.5,-48.5
+      pos: 54.5,-43.5
       parent: 2
 - proto: PuddleBloodSmall
   entities:
-  - uid: 1797
+  - uid: 2480
     components:
     - type: Transform
-      pos: 75.5,-23.5
+      pos: 80.5,-28.5
       parent: 2
-  - uid: 7101
+  - uid: 3309
     components:
     - type: Transform
-      pos: 74.5,-46.5
+      pos: 75.5,-54.5
       parent: 2
-  - uid: 7264
+  - uid: 14315
     components:
     - type: Transform
-      pos: 75.5,-25.5
-      parent: 2
-  - uid: 8141
-    components:
-    - type: Transform
-      pos: 77.5,-55.5
-      parent: 2
-  - uid: 13942
-    components:
-    - type: Transform
-      pos: 74.5,-43.5
-      parent: 2
-  - uid: 16052
-    components:
-    - type: Transform
-      pos: 74.5,-42.5
-      parent: 2
-  - uid: 16098
-    components:
-    - type: Transform
-      pos: 74.5,-41.5
+      pos: 75.5,-46.5
       parent: 2
   - uid: 16810
     components:
@@ -90013,21 +94909,11 @@ entities:
     - type: Transform
       pos: 24.5,-27.5
       parent: 2
-  - uid: 17968
-    components:
-    - type: Transform
-      pos: 75.5,-24.5
-      parent: 2
   - uid: 18023
     components:
     - type: Transform
       pos: 76.5,-51.5
       parent: 2
-  - uid: 18214
-    components:
-    - type: Transform
-      pos: 79.5,-31.5
-      parent: 2
   - uid: 18552
     components:
     - type: Transform
@@ -90038,38 +94924,53 @@ entities:
     - type: Transform
       pos: 1.5,-73.5
       parent: 2
-  - uid: 18836
+  - uid: 19554
     components:
     - type: Transform
-      pos: 54.5,-50.5
+      pos: 76.5,-27.5
+      parent: 2
+  - uid: 19555
+    components:
+    - type: Transform
+      pos: 74.5,-23.5
+      parent: 2
+  - uid: 20056
+    components:
+    - type: Transform
+      pos: 53.5,-44.5
+      parent: 2
+  - uid: 20058
+    components:
+    - type: Transform
+      pos: 52.5,-43.5
+      parent: 2
+  - uid: 20067
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 20068
+    components:
+    - type: Transform
+      pos: 56.5,-41.5
       parent: 2
 - proto: PuddleFluorosulfuricAcid
   entities:
+  - uid: 3169
+    components:
+    - type: Transform
+      pos: 42.5,-26.5
+      parent: 2
   - uid: 7934
     components:
     - type: Transform
       pos: -29.5,-47.5
       parent: 2
-  - uid: 9254
-    components:
-    - type: Transform
-      pos: 63.5,-50.5
-      parent: 2
-  - uid: 15443
-    components:
-    - type: Transform
-      pos: 64.5,-50.5
-      parent: 2
   - uid: 16103
     components:
     - type: Transform
       pos: -30.5,-39.5
       parent: 2
-  - uid: 16523
-    components:
-    - type: Transform
-      pos: 43.5,-25.5
-      parent: 2
   - uid: 17454
     components:
     - type: Transform
@@ -90115,35 +95016,35 @@ entities:
     - type: Transform
       pos: -29.5,-46.5
       parent: 2
-  - uid: 18819
+  - uid: 20060
     components:
     - type: Transform
-      pos: 63.5,-51.5
+      pos: 61.5,-42.5
       parent: 2
-  - uid: 18820
+  - uid: 20061
     components:
     - type: Transform
-      pos: 63.5,-49.5
+      pos: 62.5,-42.5
       parent: 2
-  - uid: 18821
+  - uid: 20062
     components:
     - type: Transform
-      pos: 64.5,-49.5
+      pos: 62.5,-43.5
       parent: 2
-  - uid: 18822
+  - uid: 20063
     components:
     - type: Transform
-      pos: 62.5,-50.5
+      pos: 60.5,-42.5
       parent: 2
-  - uid: 18934
+  - uid: 20064
     components:
     - type: Transform
-      pos: 65.5,-50.5
+      pos: 62.5,-41.5
       parent: 2
-  - uid: 18935
+  - uid: 20065
     components:
     - type: Transform
-      pos: 65.5,-49.5
+      pos: 61.5,-43.5
       parent: 2
 - proto: PuddleFluorosulfuricAcidSmall
   entities:
@@ -90207,13 +95108,18 @@ entities:
     - type: Transform
       pos: -29.5,-48.5
       parent: 2
-- proto: Rack
-  entities:
-  - uid: 893
+  - uid: 20066
     components:
     - type: Transform
-      pos: 68.5,-31.5
+      pos: 59.5,-42.5
       parent: 2
+  - uid: 20079
+    components:
+    - type: Transform
+      pos: 57.5,-42.5
+      parent: 2
+- proto: Rack
+  entities:
   - uid: 1160
     components:
     - type: Transform
@@ -90241,25 +95147,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-22.5
       parent: 2
-  - uid: 3342
+  - uid: 3544
     components:
     - type: Transform
-      pos: 47.5,-71.5
-      parent: 2
-  - uid: 4161
-    components:
-    - type: Transform
-      pos: 47.5,-72.5
-      parent: 2
-  - uid: 4162
-    components:
-    - type: Transform
-      pos: 44.5,-73.5
-      parent: 2
-  - uid: 4516
-    components:
-    - type: Transform
-      pos: 60.5,-57.5
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-49.5
       parent: 2
   - uid: 4565
     components:
@@ -90292,16 +95184,28 @@ entities:
     - type: Transform
       pos: -19.5,-52.5
       parent: 2
+  - uid: 6089
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-48.5
+      parent: 2
+  - uid: 6555
+    components:
+    - type: Transform
+      pos: 57.5,-62.5
+      parent: 2
   - uid: 6558
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-77.5
       parent: 2
-  - uid: 6560
+  - uid: 6620
     components:
     - type: Transform
-      pos: 46.5,-47.5
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-32.5
       parent: 2
   - uid: 6642
     components:
@@ -90313,6 +95217,12 @@ entities:
     - type: Transform
       pos: 31.5,-95.5
       parent: 2
+  - uid: 7282
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-32.5
+      parent: 2
   - uid: 7675
     components:
     - type: Transform
@@ -90355,34 +95265,11 @@ entities:
     - type: Transform
       pos: 29.5,-60.5
       parent: 2
-  - uid: 8091
+  - uid: 8035
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 69.5,-69.5
-      parent: 2
-  - uid: 8092
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-69.5
-      parent: 2
-  - uid: 8093
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-67.5
-      parent: 2
-  - uid: 8094
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-69.5
-      parent: 2
-  - uid: 8132
-    components:
-    - type: Transform
-      pos: 67.5,-31.5
+      pos: 55.5,-66.5
       parent: 2
   - uid: 8169
     components:
@@ -90399,12 +95286,6 @@ entities:
     - type: Transform
       pos: -41.5,-26.5
       parent: 2
-  - uid: 8225
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -54.5,-25.5
-      parent: 2
   - uid: 8337
     components:
     - type: Transform
@@ -90427,20 +95308,26 @@ entities:
     - type: Transform
       pos: 29.5,-78.5
       parent: 2
-  - uid: 8608
+  - uid: 8427
     components:
     - type: Transform
-      pos: 36.5,-33.5
+      pos: 69.5,-60.5
       parent: 2
-  - uid: 10242
+  - uid: 8429
     components:
     - type: Transform
-      pos: 65.5,-45.5
+      pos: 69.5,-59.5
       parent: 2
-  - uid: 10411
+  - uid: 8565
     components:
     - type: Transform
-      pos: 55.5,-46.5
+      pos: 72.5,-40.5
+      parent: 2
+  - uid: 9211
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-50.5
       parent: 2
   - uid: 10657
     components:
@@ -90453,10 +95340,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-61.5
       parent: 2
-  - uid: 13649
+  - uid: 13906
     components:
     - type: Transform
-      pos: 62.5,-56.5
+      pos: 57.5,-63.5
+      parent: 2
+  - uid: 13913
+    components:
+    - type: Transform
+      pos: 59.5,-62.5
       parent: 2
   - uid: 14065
     components:
@@ -90476,10 +95368,27 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,2.5
       parent: 2
-  - uid: 15488
+  - uid: 15418
     components:
     - type: Transform
-      pos: 60.5,-36.5
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-44.5
+      parent: 2
+  - uid: 15450
+    components:
+    - type: Transform
+      pos: 67.5,-68.5
+      parent: 2
+  - uid: 15788
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-73.5
+      parent: 2
+  - uid: 16033
+    components:
+    - type: Transform
+      pos: 58.5,-56.5
       parent: 2
   - uid: 16105
     components:
@@ -90508,16 +95417,6 @@ entities:
     - type: Transform
       pos: 29.5,-33.5
       parent: 2
-  - uid: 16607
-    components:
-    - type: Transform
-      pos: 52.5,-30.5
-      parent: 2
-  - uid: 17120
-    components:
-    - type: Transform
-      pos: -36.5,-78.5
-      parent: 2
   - uid: 17135
     components:
     - type: Transform
@@ -90557,25 +95456,10 @@ entities:
     - type: Transform
       pos: -7.5,-56.5
       parent: 2
-  - uid: 17792
+  - uid: 17599
     components:
     - type: Transform
-      pos: 71.5,-59.5
-      parent: 2
-  - uid: 18261
-    components:
-    - type: Transform
-      pos: 45.5,-48.5
-      parent: 2
-  - uid: 19045
-    components:
-    - type: Transform
-      pos: 64.5,-70.5
-      parent: 2
-  - uid: 19046
-    components:
-    - type: Transform
-      pos: 64.5,-69.5
+      pos: 45.5,-73.5
       parent: 2
   - uid: 19255
     components:
@@ -90598,6 +95482,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,-94.5
       parent: 2
+  - uid: 19737
+    components:
+    - type: Transform
+      pos: 40.5,-32.5
+      parent: 2
+  - uid: 19965
+    components:
+    - type: Transform
+      pos: -51.5,-24.5
+      parent: 2
+  - uid: 20019
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-59.5
+      parent: 2
 - proto: RadiationCollectorFullTank
   entities:
   - uid: 13281
@@ -90635,15 +95535,20 @@ entities:
   - uid: 6985
     components:
     - type: Transform
-      pos: 51.540493,-98.731224
+      pos: 52.349415,-98.694435
       parent: 2
   - uid: 6986
     components:
     - type: Transform
-      pos: 51.837368,-98.40287
+      pos: 52.675804,-98.45121
       parent: 2
 - proto: RagItem
   entities:
+  - uid: 9575
+    components:
+    - type: Transform
+      pos: 35.66513,-42.94736
+      parent: 2
   - uid: 17438
     components:
     - type: Transform
@@ -90652,7 +95557,7 @@ entities:
   - uid: 17711
     components:
     - type: Transform
-      pos: 1.841008,-62.38891
+      pos: 2.3723536,-62.403503
       parent: 2
 - proto: Railing
   entities:
@@ -90674,6 +95579,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-50.5
       parent: 2
+  - uid: 1976
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-22.5
+      parent: 2
   - uid: 2447
     components:
     - type: Transform
@@ -90690,12 +95601,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-46.5
       parent: 2
-  - uid: 3391
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-55.5
-      parent: 2
   - uid: 5195
     components:
     - type: Transform
@@ -90735,6 +95640,24 @@ entities:
     - type: Transform
       pos: 56.5,-14.5
       parent: 2
+  - uid: 8111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-20.5
+      parent: 2
+  - uid: 8781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-21.5
+      parent: 2
+  - uid: 10817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-54.5
+      parent: 2
   - uid: 11466
     components:
     - type: Transform
@@ -90775,6 +95698,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,-18.5
       parent: 2
+  - uid: 15188
+    components:
+    - type: Transform
+      pos: 87.5,-70.5
+      parent: 2
+  - uid: 15189
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-69.5
+      parent: 2
+  - uid: 15190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-68.5
+      parent: 2
   - uid: 16477
     components:
     - type: Transform
@@ -90841,12 +95781,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -42.5,-54.5
       parent: 2
+  - uid: 8110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-20.5
+      parent: 2
   - uid: 11760
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 53.5,-14.5
       parent: 2
+  - uid: 15187
+    components:
+    - type: Transform
+      pos: 88.5,-70.5
+      parent: 2
 - proto: RailingCornerSmall
   entities:
   - uid: 630
@@ -90855,12 +95806,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-17.5
       parent: 2
-  - uid: 2501
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-83.5
-      parent: 2
   - uid: 13891
     components:
     - type: Transform
@@ -90885,27 +95830,17 @@ entities:
     - type: Transform
       pos: 10.5,-40.5
       parent: 2
-  - uid: 14139
+  - uid: 15270
     components:
     - type: Transform
-      pos: -19.5,-32.5
-      parent: 2
-  - uid: 18376
-    components:
-    - type: Transform
-      pos: -38.5,-77.5
+      pos: -37.5,-78.5
       parent: 2
 - proto: RandomDrinkBottle
   entities:
-  - uid: 3389
+  - uid: 15435
     components:
     - type: Transform
-      pos: 75.5,-62.5
-      parent: 2
-  - uid: 8154
-    components:
-    - type: Transform
-      pos: 66.5,-69.5
+      pos: 80.5,-64.5
       parent: 2
 - proto: RandomDrinkGlass
   entities:
@@ -90936,25 +95871,18 @@ entities:
     - type: Transform
       pos: -8.5,-77.5
       parent: 2
-- proto: RandomFoodBakedSingle
-  entities:
-  - uid: 3388
-    components:
-    - type: Transform
-      pos: 71.5,-61.5
-      parent: 2
 - proto: RandomFoodMeal
   entities:
-  - uid: 5235
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 2
   - uid: 6596
     components:
     - type: Transform
       pos: 21.5,-61.5
       parent: 2
+  - uid: 8797
+    components:
+    - type: Transform
+      pos: 21.5,-20.5
+      parent: 2
   - uid: 17376
     components:
     - type: Transform
@@ -90967,45 +95895,45 @@ entities:
     - type: Transform
       pos: -9.5,-75.5
       parent: 2
-  - uid: 4343
+  - uid: 8836
     components:
     - type: Transform
-      pos: 65.5,-59.5
+      pos: -43.5,-78.5
       parent: 2
-  - uid: 4344
+  - uid: 10818
     components:
     - type: Transform
-      pos: 65.5,-58.5
+      pos: 71.5,-70.5
       parent: 2
-  - uid: 9711
+  - uid: 14262
     components:
     - type: Transform
-      pos: 56.5,-68.5
+      pos: 76.5,-58.5
       parent: 2
-  - uid: 14792
+  - uid: 15269
     components:
     - type: Transform
-      pos: -35.5,-74.5
+      pos: -43.5,-77.5
       parent: 2
-  - uid: 17353
+  - uid: 15404
     components:
     - type: Transform
-      pos: 71.5,-71.5
+      pos: 75.5,-57.5
       parent: 2
-  - uid: 17727
+  - uid: 15471
     components:
     - type: Transform
-      pos: -42.5,-79.5
+      pos: 64.5,-58.5
       parent: 2
-  - uid: 17728
+  - uid: 15478
     components:
     - type: Transform
-      pos: -36.5,-80.5
+      pos: 66.5,-60.5
       parent: 2
-  - uid: 17729
+  - uid: 16606
     components:
     - type: Transform
-      pos: -43.5,-79.5
+      pos: 76.5,-57.5
       parent: 2
   - uid: 17730
     components:
@@ -91017,73 +95945,43 @@ entities:
     - type: Transform
       pos: 72.5,-59.5
       parent: 2
-  - uid: 17733
-    components:
-    - type: Transform
-      pos: 76.5,-58.5
-      parent: 2
-  - uid: 17778
-    components:
-    - type: Transform
-      pos: 66.5,-59.5
-      parent: 2
-  - uid: 17781
-    components:
-    - type: Transform
-      pos: 77.5,-58.5
-      parent: 2
-  - uid: 17782
-    components:
-    - type: Transform
-      pos: -36.5,-74.5
-      parent: 2
   - uid: 17784
     components:
     - type: Transform
       pos: -36.5,-73.5
       parent: 2
-  - uid: 17785
-    components:
-    - type: Transform
-      pos: -35.5,-75.5
-      parent: 2
-  - uid: 18262
-    components:
-    - type: Transform
-      pos: 45.5,-49.5
-      parent: 2
-  - uid: 18509
-    components:
-    - type: Transform
-      pos: 36.5,-32.5
-      parent: 2
   - uid: 18512
     components:
     - type: Transform
       pos: 35.5,-32.5
       parent: 2
-  - uid: 19210
-    components:
-    - type: Transform
-      pos: 66.5,-60.5
-      parent: 2
   - uid: 19362
     components:
     - type: Transform
       pos: -2.5,-45.5
       parent: 2
-- proto: RandomInstruments
-  entities:
-  - uid: 2249
+  - uid: 19588
     components:
     - type: Transform
-      pos: 53.5,-47.5
+      pos: 4.5,-78.5
       parent: 2
+  - uid: 19589
+    components:
+    - type: Transform
+      pos: -0.5,-75.5
+      parent: 2
+- proto: RandomInstruments
+  entities:
   - uid: 6007
     components:
     - type: Transform
       pos: 27.5,-37.5
       parent: 2
+  - uid: 19531
+    components:
+    - type: Transform
+      pos: 27.5,-38.5
+      parent: 2
 - proto: RandomPainting
   entities:
   - uid: 5900
@@ -91096,8 +95994,40 @@ entities:
     - type: Transform
       pos: -41.5,-60.5
       parent: 2
+- proto: RandomPosterAny
+  entities:
+  - uid: 16030
+    components:
+    - type: Transform
+      pos: 72.5,-66.5
+      parent: 2
+  - uid: 19217
+    components:
+    - type: Transform
+      pos: 38.5,-33.5
+      parent: 2
 - proto: RandomPosterContraband
   entities:
+  - uid: 6908
+    components:
+    - type: Transform
+      pos: 55.5,-96.5
+      parent: 2
+  - uid: 6911
+    components:
+    - type: Transform
+      pos: 56.5,-97.5
+      parent: 2
+  - uid: 7724
+    components:
+    - type: Transform
+      pos: 56.5,-64.5
+      parent: 2
+  - uid: 12952
+    components:
+    - type: Transform
+      pos: 47.5,-28.5
+      parent: 2
   - uid: 15134
     components:
     - type: Transform
@@ -91113,35 +96043,15 @@ entities:
     - type: Transform
       pos: 32.5,-89.5
       parent: 2
-  - uid: 17227
-    components:
-    - type: Transform
-      pos: 54.5,-96.5
-      parent: 2
-  - uid: 17228
-    components:
-    - type: Transform
-      pos: 55.5,-97.5
-      parent: 2
   - uid: 17231
     components:
     - type: Transform
       pos: 48.5,-100.5
       parent: 2
-  - uid: 19215
-    components:
-    - type: Transform
-      pos: 54.5,-29.5
-      parent: 2
   - uid: 19216
     components:
     - type: Transform
-      pos: 41.5,-27.5
-      parent: 2
-  - uid: 19217
-    components:
-    - type: Transform
-      pos: 73.5,-67.5
+      pos: 42.5,-35.5
       parent: 2
   - uid: 19239
     components:
@@ -91165,10 +96075,15 @@ entities:
     - type: Transform
       pos: 48.5,-16.5
       parent: 2
-  - uid: 19044
+  - uid: 19192
     components:
     - type: Transform
-      pos: 9.5,-46.5
+      pos: 45.5,-44.5
+      parent: 2
+  - uid: 19210
+    components:
+    - type: Transform
+      pos: 45.5,-45.5
       parent: 2
   - uid: 19212
     components:
@@ -91185,12 +96100,37 @@ entities:
     - type: Transform
       pos: 17.5,-14.5
       parent: 2
-- proto: RandomProduce
-  entities:
-  - uid: 3426
+  - uid: 19215
     components:
     - type: Transform
-      pos: 52.5,-47.5
+      pos: 34.5,-47.5
+      parent: 2
+  - uid: 19622
+    components:
+    - type: Transform
+      pos: 10.5,-46.5
+      parent: 2
+- proto: RandomProduce
+  entities:
+  - uid: 19740
+    components:
+    - type: Transform
+      pos: 39.5,-33.5
+      parent: 2
+  - uid: 19741
+    components:
+    - type: Transform
+      pos: 41.5,-34.5
+      parent: 2
+  - uid: 19743
+    components:
+    - type: Transform
+      pos: 43.5,-33.5
+      parent: 2
+  - uid: 20049
+    components:
+    - type: Transform
+      pos: 41.5,-42.5
       parent: 2
 - proto: RandomSnacks
   entities:
@@ -91268,16 +96208,6 @@ entities:
     - type: Transform
       pos: -10.5,-19.5
       parent: 2
-  - uid: 17164
-    components:
-    - type: Transform
-      pos: 23.5,-15.5
-      parent: 2
-  - uid: 17169
-    components:
-    - type: Transform
-      pos: 80.5,-66.5
-      parent: 2
   - uid: 17171
     components:
     - type: Transform
@@ -91303,17 +96233,22 @@ entities:
     - type: Transform
       pos: -34.5,-30.5
       parent: 2
+  - uid: 19080
+    components:
+    - type: Transform
+      pos: 80.5,-67.5
+      parent: 2
 - proto: RandomSpawner100
   entities:
-  - uid: 1111
+  - uid: 3315
     components:
     - type: Transform
-      pos: 60.5,-68.5
+      pos: 75.5,-64.5
       parent: 2
-  - uid: 16862
+  - uid: 5181
     components:
     - type: Transform
-      pos: 59.5,-70.5
+      pos: 73.5,-65.5
       parent: 2
 - proto: RandomVending
   entities:
@@ -91379,11 +96314,6 @@ entities:
       parent: 2
 - proto: RandomVendingDrinks
   entities:
-  - uid: 6216
-    components:
-    - type: Transform
-      pos: 6.5,-59.5
-      parent: 2
   - uid: 9913
     components:
     - type: Transform
@@ -91394,16 +96324,16 @@ entities:
     - type: Transform
       pos: 28.5,-57.5
       parent: 2
+  - uid: 10802
+    components:
+    - type: Transform
+      pos: 48.5,-50.5
+      parent: 2
   - uid: 14365
     components:
     - type: Transform
       pos: 8.5,-37.5
       parent: 2
-  - uid: 17926
-    components:
-    - type: Transform
-      pos: 51.5,-49.5
-      parent: 2
 - proto: RandomVendingSnacks
   entities:
   - uid: 595
@@ -91416,20 +96346,15 @@ entities:
     - type: Transform
       pos: 10.5,-19.5
       parent: 2
-  - uid: 6217
+  - uid: 8663
     components:
     - type: Transform
-      pos: 6.5,-60.5
+      pos: 23.5,-19.5
       parent: 2
-  - uid: 7736
+  - uid: 10800
     components:
     - type: Transform
-      pos: 52.5,-49.5
-      parent: 2
-  - uid: 12882
-    components:
-    - type: Transform
-      pos: 35.5,-75.5
+      pos: 50.5,-43.5
       parent: 2
   - uid: 13576
     components:
@@ -91446,10 +96371,15 @@ entities:
     - type: Transform
       pos: -41.5,-67.5
       parent: 2
-  - uid: 15331
+  - uid: 16051
     components:
     - type: Transform
-      pos: 21.5,-16.5
+      pos: 42.5,-75.5
+      parent: 2
+  - uid: 16117
+    components:
+    - type: Transform
+      pos: 7.5,-61.5
       parent: 2
 - proto: RCD
   entities:
@@ -91465,8 +96395,18 @@ entities:
     - type: Transform
       pos: -29.274288,-59.874645
       parent: 2
+  - uid: 20051
+    components:
+    - type: Transform
+      pos: -52.72353,-51.759876
+      parent: 2
 - proto: ReagentContainerFlour
   entities:
+  - uid: 7031
+    components:
+    - type: Transform
+      pos: 40.70177,-32.37174
+      parent: 2
   - uid: 15274
     components:
     - type: Transform
@@ -91490,14 +96430,15 @@ entities:
       parent: 2
 - proto: Recycler
   entities:
-  - uid: 9314
+  - uid: 10332
     components:
     - type: Transform
-      pos: 62.5,-68.5
+      pos: 77.5,-64.5
       parent: 2
-  - uid: 14690
+  - uid: 11474
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 50.5,-96.5
       parent: 2
 - proto: ReinforcedGirder
@@ -91519,11 +96460,6 @@ entities:
     - type: Transform
       pos: -23.5,-32.5
       parent: 2
-  - uid: 185
-    components:
-    - type: Transform
-      pos: -23.5,-29.5
-      parent: 2
   - uid: 191
     components:
     - type: Transform
@@ -91569,26 +96505,6 @@ entities:
     - type: Transform
       pos: -20.5,-29.5
       parent: 2
-  - uid: 562
-    components:
-    - type: Transform
-      pos: 14.5,-40.5
-      parent: 2
-  - uid: 563
-    components:
-    - type: Transform
-      pos: 16.5,-39.5
-      parent: 2
-  - uid: 568
-    components:
-    - type: Transform
-      pos: 15.5,-39.5
-      parent: 2
-  - uid: 581
-    components:
-    - type: Transform
-      pos: 17.5,-39.5
-      parent: 2
   - uid: 804
     components:
     - type: Transform
@@ -91629,76 +96545,16 @@ entities:
     - type: Transform
       pos: -17.5,-31.5
       parent: 2
-  - uid: 1645
-    components:
-    - type: Transform
-      pos: 18.5,-45.5
-      parent: 2
-  - uid: 1646
-    components:
-    - type: Transform
-      pos: 20.5,-41.5
-      parent: 2
-  - uid: 1647
-    components:
-    - type: Transform
-      pos: 20.5,-44.5
-      parent: 2
-  - uid: 1648
-    components:
-    - type: Transform
-      pos: 17.5,-45.5
-      parent: 2
-  - uid: 1667
-    components:
-    - type: Transform
-      pos: 19.5,-45.5
-      parent: 2
-  - uid: 1668
-    components:
-    - type: Transform
-      pos: 20.5,-40.5
-      parent: 2
-  - uid: 1688
-    components:
-    - type: Transform
-      pos: 14.5,-41.5
-      parent: 2
-  - uid: 1692
-    components:
-    - type: Transform
-      pos: 14.5,-44.5
-      parent: 2
-  - uid: 1696
-    components:
-    - type: Transform
-      pos: 14.5,-43.5
-      parent: 2
-  - uid: 1731
-    components:
-    - type: Transform
-      pos: 19.5,-39.5
-      parent: 2
-  - uid: 1798
-    components:
-    - type: Transform
-      pos: 20.5,-43.5
-      parent: 2
-  - uid: 1799
-    components:
-    - type: Transform
-      pos: 15.5,-45.5
-      parent: 2
-  - uid: 1802
-    components:
-    - type: Transform
-      pos: 18.5,-39.5
-      parent: 2
   - uid: 2617
     components:
     - type: Transform
       pos: -20.5,-30.5
       parent: 2
+  - uid: 3546
+    components:
+    - type: Transform
+      pos: 58.5,-46.5
+      parent: 2
   - uid: 3590
     components:
     - type: Transform
@@ -91719,6 +96575,11 @@ entities:
     - type: Transform
       pos: -22.5,-72.5
       parent: 2
+  - uid: 3950
+    components:
+    - type: Transform
+      pos: 61.5,-46.5
+      parent: 2
   - uid: 4422
     components:
     - type: Transform
@@ -91809,41 +96670,30 @@ entities:
     - type: Transform
       pos: -17.5,-30.5
       parent: 2
+  - uid: 6248
+    components:
+    - type: Transform
+      pos: 17.5,-39.5
+      parent: 2
   - uid: 6644
     components:
     - type: Transform
       pos: 8.5,-51.5
       parent: 2
-  - uid: 6916
+  - uid: 6902
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-42.5
+      pos: 19.5,-39.5
       parent: 2
   - uid: 7066
     components:
     - type: Transform
       pos: 6.5,-48.5
       parent: 2
-  - uid: 7444
+  - uid: 7099
     components:
     - type: Transform
-      pos: 90.5,-44.5
-      parent: 2
-  - uid: 7445
-    components:
-    - type: Transform
-      pos: 89.5,-44.5
-      parent: 2
-  - uid: 7449
-    components:
-    - type: Transform
-      pos: 89.5,-46.5
-      parent: 2
-  - uid: 7450
-    components:
-    - type: Transform
-      pos: 90.5,-46.5
+      pos: 20.5,-40.5
       parent: 2
   - uid: 7660
     components:
@@ -91870,41 +96720,126 @@ entities:
     - type: Transform
       pos: -8.5,-41.5
       parent: 2
-  - uid: 8749
+  - uid: 10766
     components:
     - type: Transform
-      pos: 58.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-44.5
       parent: 2
-  - uid: 10801
+  - uid: 10792
     components:
     - type: Transform
-      pos: 61.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-44.5
+      parent: 2
+  - uid: 10798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-21.5
+      parent: 2
+  - uid: 10823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-46.5
+      parent: 2
+  - uid: 10826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-46.5
       parent: 2
   - uid: 11401
     components:
     - type: Transform
       pos: -25.5,-72.5
       parent: 2
-  - uid: 11402
+  - uid: 11403
     components:
     - type: Transform
-      pos: 16.5,-45.5
+      pos: 16.5,-39.5
+      parent: 2
+  - uid: 13942
+    components:
+    - type: Transform
+      pos: 15.5,-39.5
+      parent: 2
+  - uid: 14024
+    components:
+    - type: Transform
+      pos: 20.5,-41.5
+      parent: 2
+  - uid: 14053
+    components:
+    - type: Transform
+      pos: 14.5,-44.5
+      parent: 2
+  - uid: 14241
+    components:
+    - type: Transform
+      pos: 18.5,-39.5
+      parent: 2
+  - uid: 14435
+    components:
+    - type: Transform
+      pos: 14.5,-41.5
+      parent: 2
+  - uid: 14436
+    components:
+    - type: Transform
+      pos: 20.5,-44.5
+      parent: 2
+  - uid: 14437
+    components:
+    - type: Transform
+      pos: 18.5,-45.5
+      parent: 2
+  - uid: 16052
+    components:
+    - type: Transform
+      pos: 20.5,-43.5
+      parent: 2
+  - uid: 16097
+    components:
+    - type: Transform
+      pos: 17.5,-45.5
+      parent: 2
+  - uid: 16170
+    components:
+    - type: Transform
+      pos: 14.5,-40.5
       parent: 2
   - uid: 16466
     components:
     - type: Transform
       pos: -17.5,-33.5
       parent: 2
+  - uid: 16521
+    components:
+    - type: Transform
+      pos: 15.5,-45.5
+      parent: 2
   - uid: 16620
     components:
     - type: Transform
       pos: 27.5,-65.5
       parent: 2
+  - uid: 16875
+    components:
+    - type: Transform
+      pos: 20.5,-42.5
+      parent: 2
   - uid: 17373
     components:
     - type: Transform
       pos: -17.5,-32.5
       parent: 2
+  - uid: 17968
+    components:
+    - type: Transform
+      pos: 14.5,-43.5
+      parent: 2
   - uid: 18152
     components:
     - type: Transform
@@ -91915,6 +96850,11 @@ entities:
     - type: Transform
       pos: 44.5,-62.5
       parent: 2
+  - uid: 18331
+    components:
+    - type: Transform
+      pos: 62.5,-21.5
+      parent: 2
   - uid: 18367
     components:
     - type: Transform
@@ -91940,8 +96880,24 @@ entities:
     - type: Transform
       pos: 36.5,-62.5
       parent: 2
+  - uid: 19070
+    components:
+    - type: Transform
+      pos: 19.5,-45.5
+      parent: 2
+  - uid: 19569
+    components:
+    - type: Transform
+      pos: 16.5,-45.5
+      parent: 2
 - proto: ReinforcedPlasmaWindowDiagonal
   entities:
+  - uid: 1731
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-45.5
+      parent: 2
   - uid: 4654
     components:
     - type: Transform
@@ -92011,52 +96967,100 @@ entities:
     - type: Transform
       pos: 23.5,-51.5
       parent: 2
-  - uid: 10446
+  - uid: 6916
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-39.5
       parent: 2
-  - uid: 10447
+  - uid: 14034
     components:
     - type: Transform
       pos: 14.5,-39.5
       parent: 2
-  - uid: 13978
-    components:
-    - type: Transform
-      pos: 19.5,-44.5
-      parent: 2
-  - uid: 14025
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-40.5
-      parent: 2
-  - uid: 14047
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-40.5
-      parent: 2
-  - uid: 14056
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-44.5
-      parent: 2
-  - uid: 14432
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-45.5
-      parent: 2
-  - uid: 14433
+  - uid: 14035
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,-45.5
       parent: 2
+- proto: ReinforcedUraniumWindow
+  entities:
+  - uid: 7264
+    components:
+    - type: Transform
+      pos: 19.5,-41.5
+      parent: 2
+  - uid: 8016
+    components:
+    - type: Transform
+      pos: 16.5,-40.5
+      parent: 2
+  - uid: 10446
+    components:
+    - type: Transform
+      pos: 19.5,-40.5
+      parent: 2
+  - uid: 10447
+    components:
+    - type: Transform
+      pos: 19.5,-43.5
+      parent: 2
+  - uid: 10774
+    components:
+    - type: Transform
+      pos: 19.5,-42.5
+      parent: 2
+  - uid: 11402
+    components:
+    - type: Transform
+      pos: 15.5,-40.5
+      parent: 2
+  - uid: 13274
+    components:
+    - type: Transform
+      pos: 17.5,-44.5
+      parent: 2
+  - uid: 13452
+    components:
+    - type: Transform
+      pos: 16.5,-44.5
+      parent: 2
+  - uid: 13978
+    components:
+    - type: Transform
+      pos: 18.5,-40.5
+      parent: 2
+  - uid: 14005
+    components:
+    - type: Transform
+      pos: 18.5,-44.5
+      parent: 2
+  - uid: 14025
+    components:
+    - type: Transform
+      pos: 17.5,-40.5
+      parent: 2
+  - uid: 14029
+    components:
+    - type: Transform
+      pos: 19.5,-44.5
+      parent: 2
+  - uid: 14047
+    components:
+    - type: Transform
+      pos: 15.5,-41.5
+      parent: 2
+  - uid: 15698
+    components:
+    - type: Transform
+      pos: 15.5,-44.5
+      parent: 2
+  - uid: 17173
+    components:
+    - type: Transform
+      pos: 15.5,-43.5
+      parent: 2
 - proto: ReinforcedWindow
   entities:
   - uid: 79
@@ -92489,6 +97493,11 @@ entities:
     - type: Transform
       pos: -29.5,-65.5
       parent: 2
+  - uid: 3030
+    components:
+    - type: Transform
+      pos: 60.5,-38.5
+      parent: 2
   - uid: 3071
     components:
     - type: Transform
@@ -92504,11 +97513,26 @@ entities:
     - type: Transform
       pos: -20.5,-69.5
       parent: 2
+  - uid: 3399
+    components:
+    - type: Transform
+      pos: 67.5,-38.5
+      parent: 2
   - uid: 3489
     components:
     - type: Transform
       pos: 10.5,-56.5
       parent: 2
+  - uid: 3520
+    components:
+    - type: Transform
+      pos: 57.5,-25.5
+      parent: 2
+  - uid: 3571
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
   - uid: 3655
     components:
     - type: Transform
@@ -92539,6 +97563,11 @@ entities:
     - type: Transform
       pos: 59.5,-18.5
       parent: 2
+  - uid: 4876
+    components:
+    - type: Transform
+      pos: 59.5,-35.5
+      parent: 2
   - uid: 5144
     components:
     - type: Transform
@@ -92569,10 +97598,15 @@ entities:
     - type: Transform
       pos: 7.5,-13.5
       parent: 2
+  - uid: 5429
+    components:
+    - type: Transform
+      pos: 58.5,-25.5
+      parent: 2
   - uid: 6095
     components:
     - type: Transform
-      pos: 60.5,-21.5
+      pos: 64.5,-21.5
       parent: 2
   - uid: 6857
     components:
@@ -92594,21 +97628,6 @@ entities:
     - type: Transform
       pos: 50.5,-95.5
       parent: 2
-  - uid: 6906
-    components:
-    - type: Transform
-      pos: 56.5,-98.5
-      parent: 2
-  - uid: 6907
-    components:
-    - type: Transform
-      pos: 56.5,-99.5
-      parent: 2
-  - uid: 6908
-    components:
-    - type: Transform
-      pos: 56.5,-100.5
-      parent: 2
   - uid: 6951
     components:
     - type: Transform
@@ -92619,30 +97638,41 @@ entities:
     - type: Transform
       pos: 20.5,-100.5
       parent: 2
-  - uid: 7151
+  - uid: 7040
     components:
     - type: Transform
-      pos: 61.5,-45.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-35.5
       parent: 2
-  - uid: 7206
+  - uid: 7154
     components:
     - type: Transform
-      pos: 64.5,-21.5
+      pos: 60.5,-39.5
       parent: 2
-  - uid: 7278
+  - uid: 7160
     components:
     - type: Transform
-      pos: 65.5,-44.5
+      pos: 59.5,-25.5
+      parent: 2
+  - uid: 7213
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
+      parent: 2
+  - uid: 7230
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
       parent: 2
   - uid: 7309
     components:
     - type: Transform
       pos: 61.5,-28.5
       parent: 2
-  - uid: 7731
+  - uid: 7748
     components:
     - type: Transform
-      pos: 66.5,-50.5
+      pos: 56.5,-35.5
       parent: 2
   - uid: 8080
     components:
@@ -92654,10 +97684,20 @@ entities:
     - type: Transform
       pos: 10.5,-58.5
       parent: 2
-  - uid: 8561
+  - uid: 9893
     components:
     - type: Transform
-      pos: 67.5,-44.5
+      pos: 63.5,-44.5
+      parent: 2
+  - uid: 9898
+    components:
+    - type: Transform
+      pos: 56.5,-40.5
+      parent: 2
+  - uid: 10276
+    components:
+    - type: Transform
+      pos: 67.5,-46.5
       parent: 2
   - uid: 10654
     components:
@@ -92719,11 +97759,6 @@ entities:
     - type: Transform
       pos: 61.5,-18.5
       parent: 2
-  - uid: 15470
-    components:
-    - type: Transform
-      pos: 59.5,-40.5
-      parent: 2
   - uid: 16349
     components:
     - type: Transform
@@ -92739,16 +97774,6 @@ entities:
     - type: Transform
       pos: 22.5,-86.5
       parent: 2
-  - uid: 16866
-    components:
-    - type: Transform
-      pos: 61.5,-36.5
-      parent: 2
-  - uid: 17311
-    components:
-    - type: Transform
-      pos: 57.5,-47.5
-      parent: 2
   - uid: 17780
     components:
     - type: Transform
@@ -92759,11 +97784,6 @@ entities:
     - type: Transform
       pos: 23.5,-88.5
       parent: 2
-  - uid: 17964
-    components:
-    - type: Transform
-      pos: 61.5,-46.5
-      parent: 2
   - uid: 18402
     components:
     - type: Transform
@@ -92784,6 +97804,21 @@ entities:
     - type: Transform
       pos: -27.5,-60.5
       parent: 2
+  - uid: 19726
+    components:
+    - type: Transform
+      pos: 57.5,-98.5
+      parent: 2
+  - uid: 19727
+    components:
+    - type: Transform
+      pos: 57.5,-99.5
+      parent: 2
+  - uid: 19728
+    components:
+    - type: Transform
+      pos: 57.5,-100.5
+      parent: 2
 - proto: RemoteSignaller
   entities:
   - uid: 8033
@@ -92803,20 +97838,20 @@ entities:
     - type: MetaData
       name: main armory remote signaller
     - type: Transform
-      pos: 59.450016,-46.424244
+      pos: 58.468006,-39.404644
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        4377:
+        3324:
         - - Pressed
           - Toggle
-        13934:
+        3867:
         - - Pressed
           - Toggle
-        4366:
+        3548:
         - - Pressed
           - Toggle
-        4380:
+        4000:
         - - Pressed
           - Toggle
 - proto: ResearchAndDevelopmentServer
@@ -92833,13 +97868,6 @@ entities:
     - type: Transform
       pos: 52.36671,-18.851082
       parent: 2
-  - uid: 6032
-    components:
-    - type: Transform
-      parent: 2004
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 17385
     components:
     - type: Transform
@@ -92851,38 +97879,49 @@ entities:
   - uid: 13842
     components:
     - type: Transform
-      pos: 67.68784,-31.256433
+      pos: 68.51489,-32.324493
       parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 6618
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 6618
   - uid: 13901
     components:
     - type: Transform
-      pos: 67.78969,-31.31666
+      pos: 68.75447,-32.376614
       parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 6619
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 6619
 - proto: RobocopCircuitBoard
   entities:
   - uid: 18624
     components:
     - type: Transform
-      pos: 78.117035,-47.564194
+      pos: 79.709564,-47.292206
       parent: 2
 - proto: RollerBed
   entities:
-  - uid: 13158
+  - uid: 7120
     components:
     - type: Transform
-      pos: 27.5,-29.5
-      parent: 2
-  - uid: 18265
-    components:
-    - type: Transform
-      pos: 34.5,-23.5
+      pos: 27.50481,-30.322935
       parent: 2
 - proto: RollingPin
   entities:
   - uid: 7200
     components:
     - type: Transform
-      pos: 42.391666,-45.264618
+      pos: 42.132645,-45.052124
       parent: 2
 - proto: RubberStampApproved
   entities:
@@ -92924,12 +97963,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 85.5,-17.5
       parent: 2
-  - uid: 15359
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,-23.5
-      parent: 2
   - uid: 15360
     components:
     - type: Transform
@@ -93008,12 +98041,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 86.5,-66.5
       parent: 2
-  - uid: 15373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,-67.5
-      parent: 2
   - uid: 15374
     components:
     - type: Transform
@@ -93037,28 +98064,21 @@ entities:
   - uid: 8226
     components:
     - type: Transform
-      pos: -54.462643,-25.38104
+      pos: -51.49735,-24.395369
       parent: 2
 - proto: SalvageMagnet
   entities:
-  - uid: 14028
+  - uid: 17227
     components:
     - type: Transform
-      pos: 51.5,-96.5
+      pos: 53.5,-101.5
       parent: 2
 - proto: SalvageMaterialCrateSpawner
   entities:
-  - uid: 6555
+  - uid: 7392
     components:
     - type: Transform
-      pos: 78.5,-31.5
-      parent: 2
-- proto: Saw
-  entities:
-  - uid: 17913
-    components:
-    - type: Transform
-      pos: 35.48436,-18.109962
+      pos: 80.5,-29.5
       parent: 2
 - proto: Scalpel
   entities:
@@ -93067,10 +98087,10 @@ entities:
     - type: Transform
       pos: 9.503026,-25.489
       parent: 2
-  - uid: 19231
+  - uid: 7728
     components:
     - type: Transform
-      pos: 40.823505,-30.393356
+      pos: 66.53385,-63.488316
       parent: 2
   - uid: 19301
     components:
@@ -93078,44 +98098,65 @@ entities:
       rot: -0.6108652381980153 rad
       pos: -3.5512772,-24.750254
       parent: 2
-- proto: SciFlash
-  entities:
-  - uid: 17886
-    components:
-    - type: Transform
-      parent: 17884
-    - type: LimitedCharges
-      maxCharges: 1
-    - type: Physics
-      canCollide: False
-  - uid: 17947
-    components:
-    - type: Transform
-      pos: 33.300842,-15.297032
-      parent: 2
-    - type: LimitedCharges
-      maxCharges: 1
 - proto: Screen
   entities:
+  - uid: 4349
+    components:
+    - type: Transform
+      pos: 30.5,-55.5
+      parent: 2
   - uid: 17989
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -34.5,-9.5
       parent: 2
-  - uid: 17990
+  - uid: 19444
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -35.5,-55.5
+      parent: 2
+  - uid: 19446
+    components:
+    - type: Transform
+      pos: -25.5,-10.5
+      parent: 2
+  - uid: 19447
+    components:
+    - type: Transform
+      pos: 12.5,-76.5
+      parent: 2
+  - uid: 19448
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-33.5
+      parent: 2
+  - uid: 19449
+    components:
+    - type: Transform
+      pos: -45.5,-47.5
+      parent: 2
+  - uid: 19450
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-28.5
+      parent: 2
+  - uid: 19451
+    components:
+    - type: Transform
+      pos: 30.5,-36.5
+      parent: 2
+  - uid: 19452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-26.5
       parent: 2
 - proto: Screwdriver
   entities:
-  - uid: 17092
-    components:
-    - type: Transform
-      pos: 52.60426,-30.606783
-      parent: 2
   - uid: 17356
     components:
     - type: Transform
@@ -93139,10 +98180,10 @@ entities:
       parent: 2
 - proto: SecurityTechFab
   entities:
-  - uid: 4118
+  - uid: 3463
     components:
     - type: Transform
-      pos: 67.5,-34.5
+      pos: 67.5,-32.5
       parent: 2
     - type: TechnologyDatabase
       supportedDisciplines:
@@ -93152,10 +98193,10 @@ entities:
       - CivilianServices
 - proto: SecurityWhistle
   entities:
-  - uid: 12805
+  - uid: 7104
     components:
     - type: Transform
-      pos: 68.0032,-48.51887
+      pos: 67.39479,-53.358547
       parent: 2
 - proto: SeedExtractor
   entities:
@@ -93169,34 +98210,46 @@ entities:
     - type: Transform
       pos: 51.5,-17.5
       parent: 2
+- proto: SeedExtractorMachineCircuitboard
+  entities:
+  - uid: 19583
+    components:
+    - type: Transform
+      pos: 4.635383,-79.48305
+      parent: 2
 - proto: ShardCrystalRandom
   entities:
   - uid: 15273
     components:
     - type: Transform
-      pos: -39.57368,-77.000206
+      pos: -39.33327,-77.43351
       parent: 2
   - uid: 17351
     components:
     - type: Transform
-      pos: -38.745556,-76.503426
+      pos: -40.67702,-78.631874
       parent: 2
 - proto: ShardGlass
   entities:
-  - uid: 6013
+  - uid: 3171
     components:
     - type: Transform
-      pos: 40.214127,-29.462494
+      pos: 66.3737,-62.429382
+      parent: 2
+  - uid: 3737
+    components:
+    - type: Transform
+      pos: 68.50926,-64.55413
+      parent: 2
+  - uid: 10853
+    components:
+    - type: Transform
+      pos: 66.41881,-64.87421
       parent: 2
   - uid: 17021
     components:
     - type: Transform
-      pos: 4.3700624,-79.34264
-      parent: 2
-  - uid: 19233
-    components:
-    - type: Transform
-      pos: 41.609596,-30.40589
+      pos: 4.3205686,-79.307
       parent: 2
 - proto: ShardGlassReinforced
   entities:
@@ -93225,15 +98278,31 @@ entities:
     - type: Transform
       pos: 1.5636982,-72.57246
       parent: 2
+  - uid: 15469
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.617294,-59.42534
+      parent: 2
+  - uid: 15508
+    components:
+    - type: Transform
+      pos: 69.83473,-56.407314
+      parent: 2
 - proto: SheetBrass
   entities:
   - uid: 8098
     components:
     - type: Transform
-      pos: 72.46222,-69.45354
+      pos: 57.65258,-62.37854
       parent: 2
 - proto: SheetGlass
   entities:
+  - uid: 5866
+    components:
+    - type: Transform
+      pos: -42.6255,-79.322044
+      parent: 2
   - uid: 6672
     components:
     - type: Transform
@@ -93252,18 +98321,20 @@ entities:
   - uid: 8100
     components:
     - type: Transform
-      pos: 72.60134,-69.3865
-      parent: 2
-  - uid: 9847
-    components:
-    - type: Transform
-      pos: 35.358883,-11.531487
+      pos: 57.418205,-62.48799
       parent: 2
   - uid: 16647
     components:
     - type: Transform
       pos: -12.36079,-23.400194
       parent: 2
+- proto: SheetGlass10
+  entities:
+  - uid: 19738
+    components:
+    - type: Transform
+      pos: 42.067513,-34.49177
+      parent: 2
 - proto: SheetPlasma
   entities:
   - uid: 3506
@@ -93271,11 +98342,11 @@ entities:
     - type: Transform
       pos: -12.6246805,-71.2753
       parent: 2
-  - uid: 14241
+  - uid: 14433
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -11.485548,-18.454052
+      pos: -15.5,-18.5
       parent: 2
 - proto: SheetPlasma1
   entities:
@@ -93291,6 +98362,11 @@ entities:
     - type: Transform
       pos: 8.602404,-83.32435
       parent: 2
+  - uid: 5418
+    components:
+    - type: Transform
+      pos: 68.51337,-20.394669
+      parent: 2
   - uid: 5971
     components:
     - type: Transform
@@ -93320,7 +98396,7 @@ entities:
   - uid: 18408
     components:
     - type: Transform
-      pos: 28.5,-13.5
+      pos: 29.539436,-13.332727
       parent: 2
 - proto: SheetPlastic
   entities:
@@ -93351,6 +98427,11 @@ entities:
     - type: Transform
       pos: 32.586887,-61.429493
       parent: 2
+  - uid: 19603
+    components:
+    - type: Transform
+      pos: 45.393383,-73.1507
+      parent: 2
 - proto: SheetRGlass1
   entities:
   - uid: 18778
@@ -93370,12 +98451,12 @@ entities:
   - uid: 1882
     components:
     - type: Transform
-      pos: 47.371796,-72.446815
+      pos: 46.415913,-73.32666
       parent: 2
   - uid: 3341
     components:
     - type: Transform
-      pos: 47.607906,-72.321724
+      pos: 46.594925,-73.20312
       parent: 2
   - uid: 6671
     components:
@@ -93400,25 +98481,20 @@ entities:
   - uid: 8096
     components:
     - type: Transform
-      pos: 69.46705,-69.43699
+      pos: 59.330914,-62.53247
       parent: 2
   - uid: 13337
     components:
     - type: Transform
-      pos: -5.400783,-19.33013
+      pos: -3.438326,-19.436022
       parent: 2
-  - uid: 17911
+  - uid: 13646
     components:
     - type: Transform
-      pos: 34.612373,-11.35557
+      pos: 45.696777,-73.20621
       parent: 2
 - proto: SheetSteel10
   entities:
-  - uid: 3384
-    components:
-    - type: Transform
-      pos: 52.432384,-30.294283
-      parent: 2
   - uid: 3911
     components:
     - type: Transform
@@ -93527,17 +98603,17 @@ entities:
       parent: 2
 - proto: ShotGunCabinetFilled
   entities:
-  - uid: 16048
+  - uid: 3609
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-31.5
+      pos: 70.5,-32.5
       parent: 2
-  - uid: 18044
+  - uid: 7311
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-32.5
+      pos: 70.5,-33.5
       parent: 2
 - proto: ShuttersNormal
   entities:
@@ -93595,6 +98671,16 @@ entities:
     - type: Transform
       pos: 22.5,-88.5
       parent: 2
+  - uid: 5539
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
+      parent: 2
+  - uid: 5666
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
+      parent: 2
   - uid: 6208
     components:
     - type: Transform
@@ -93629,16 +98715,6 @@ entities:
     - type: Transform
       pos: 26.5,-87.5
       parent: 2
-  - uid: 7052
-    components:
-    - type: Transform
-      pos: 67.5,-44.5
-      parent: 2
-  - uid: 7267
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
   - uid: 7717
     components:
     - type: Transform
@@ -93819,36 +98895,6 @@ entities:
       parent: 2
 - proto: ShuttersWindowOpen
   entities:
-  - uid: 7807
-    components:
-    - type: Transform
-      pos: 23.5,-24.5
-      parent: 2
-  - uid: 8048
-    components:
-    - type: Transform
-      pos: 24.5,-24.5
-      parent: 2
-  - uid: 8663
-    components:
-    - type: Transform
-      pos: 25.5,-24.5
-      parent: 2
-  - uid: 9066
-    components:
-    - type: Transform
-      pos: 25.5,-21.5
-      parent: 2
-  - uid: 9082
-    components:
-    - type: Transform
-      pos: 24.5,-21.5
-      parent: 2
-  - uid: 9196
-    components:
-    - type: Transform
-      pos: 23.5,-21.5
-      parent: 2
   - uid: 17740
     components:
     - type: Transform
@@ -93972,22 +99018,25 @@ entities:
       parent: 2
 - proto: SignAi
   entities:
-  - uid: 16193
+  - uid: 793
     components:
     - type: Transform
-      pos: 84.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-50.5
       parent: 2
-  - uid: 16194
+  - uid: 15199
     components:
     - type: Transform
-      pos: 84.5,-50.5
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-40.5
       parent: 2
 - proto: SignAiUpload
   entities:
-  - uid: 13878
+  - uid: 7136
     components:
     - type: Transform
-      pos: 75.5,-46.5
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-46.5
       parent: 2
 - proto: SignalButton
   entities:
@@ -94014,200 +99063,6 @@ entities:
           - Toggle
         - - Pressed
           - AutoClose
-  - uid: 4717
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-27.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        5296:
-        - - Pressed
-          - Forward
-        5297:
-        - - Pressed
-          - Forward
-        5298:
-        - - Pressed
-          - Forward
-        5299:
-        - - Pressed
-          - Forward
-        5300:
-        - - Pressed
-          - Forward
-        5301:
-        - - Pressed
-          - Forward
-        5302:
-        - - Pressed
-          - Forward
-        5344:
-        - - Pressed
-          - Forward
-        5350:
-        - - Pressed
-          - Forward
-        5351:
-        - - Pressed
-          - Forward
-        5306:
-        - - Pressed
-          - Forward
-        5307:
-        - - Pressed
-          - Forward
-        11695:
-        - - Pressed
-          - Forward
-        8637:
-        - - Pressed
-          - Forward
-        8566:
-        - - Pressed
-          - Forward
-        11694:
-        - - Pressed
-          - Forward
-        5358:
-        - - Pressed
-          - Forward
-        11693:
-        - - Pressed
-          - Forward
-        5359:
-        - - Pressed
-          - Forward
-        5360:
-        - - Pressed
-          - Forward
-        5310:
-        - - Pressed
-          - Forward
-        5311:
-        - - Pressed
-          - Forward
-        5312:
-        - - Pressed
-          - Forward
-        5313:
-        - - Pressed
-          - Forward
-        5314:
-        - - Pressed
-          - Forward
-        5315:
-        - - Pressed
-          - Forward
-        5338:
-        - - Pressed
-          - Forward
-        5339:
-        - - Pressed
-          - Forward
-        17406:
-        - - Pressed
-          - Forward
-        5316:
-        - - Pressed
-          - Forward
-        5317:
-        - - Pressed
-          - Forward
-        5361:
-        - - Pressed
-          - Forward
-        5362:
-        - - Pressed
-          - Forward
-        5363:
-        - - Pressed
-          - Forward
-        5318:
-        - - Pressed
-          - Forward
-        5319:
-        - - Pressed
-          - Forward
-        5335:
-        - - Pressed
-          - Forward
-        5336:
-        - - Pressed
-          - Forward
-        5337:
-        - - Pressed
-          - Forward
-        5320:
-        - - Pressed
-          - Forward
-        5321:
-        - - Pressed
-          - Forward
-        5364:
-        - - Pressed
-          - Forward
-        5365:
-        - - Pressed
-          - Forward
-        5366:
-        - - Pressed
-          - Forward
-        5322:
-        - - Pressed
-          - Forward
-        5323:
-        - - Pressed
-          - Forward
-        5324:
-        - - Pressed
-          - Forward
-        5325:
-        - - Pressed
-          - Forward
-        5326:
-        - - Pressed
-          - Forward
-        5327:
-        - - Pressed
-          - Forward
-        5328:
-        - - Pressed
-          - Forward
-        5329:
-        - - Pressed
-          - Forward
-        5330:
-        - - Pressed
-          - Forward
-        5332:
-        - - Pressed
-          - Forward
-        5331:
-        - - Pressed
-          - Forward
-        5333:
-        - - Pressed
-          - Forward
-        5334:
-        - - Pressed
-          - Forward
-        5370:
-        - - Pressed
-          - Forward
-        3816:
-        - - Pressed
-          - Forward
-        3792:
-        - - Pressed
-          - Forward
-        5342:
-        - - Pressed
-          - Forward
-        5341:
-        - - Pressed
-          - Forward
   - uid: 5999
     components:
     - type: Transform
@@ -94268,226 +99123,6 @@ entities:
         18451:
         - - Pressed
           - Toggle
-  - uid: 7319
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-25.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        5296:
-        - - Pressed
-          - Off
-        5297:
-        - - Pressed
-          - Off
-        5298:
-        - - Pressed
-          - Off
-        5299:
-        - - Pressed
-          - Off
-        5300:
-        - - Pressed
-          - Off
-        5301:
-        - - Pressed
-          - Off
-        5302:
-        - - Pressed
-          - Off
-        5344:
-        - - Pressed
-          - Off
-        5350:
-        - - Pressed
-          - Off
-        5351:
-        - - Pressed
-          - Off
-        5306:
-        - - Pressed
-          - Off
-        5307:
-        - - Pressed
-          - Off
-        11695:
-        - - Pressed
-          - Off
-        8637:
-        - - Pressed
-          - Off
-        8566:
-        - - Pressed
-          - Off
-        11694:
-        - - Pressed
-          - Off
-        11693:
-        - - Pressed
-          - Off
-        5358:
-        - - Pressed
-          - Off
-        5359:
-        - - Pressed
-          - Off
-        5360:
-        - - Pressed
-          - Off
-        5310:
-        - - Pressed
-          - Off
-        5311:
-        - - Pressed
-          - Off
-        5312:
-        - - Pressed
-          - Off
-        5313:
-        - - Pressed
-          - Off
-        5314:
-        - - Pressed
-          - Off
-        5315:
-        - - Pressed
-          - Off
-        5338:
-        - - Pressed
-          - Off
-        5339:
-        - - Pressed
-          - Off
-        17406:
-        - - Pressed
-          - Reverse
-        5316:
-        - - Pressed
-          - Off
-        5317:
-        - - Pressed
-          - Off
-        5361:
-        - - Pressed
-          - Off
-        5362:
-        - - Pressed
-          - Off
-        5363:
-        - - Pressed
-          - Off
-        5318:
-        - - Pressed
-          - Off
-        5319:
-        - - Pressed
-          - Off
-        5335:
-        - - Pressed
-          - Off
-        5336:
-        - - Pressed
-          - Off
-        5337:
-        - - Pressed
-          - Off
-        5320:
-        - - Pressed
-          - Off
-        5321:
-        - - Pressed
-          - Off
-        5364:
-        - - Pressed
-          - Off
-        5365:
-        - - Pressed
-          - Off
-        5366:
-        - - Pressed
-          - Off
-        5322:
-        - - Pressed
-          - Off
-        5323:
-        - - Pressed
-          - Off
-        5324:
-        - - Pressed
-          - Off
-        5325:
-        - - Pressed
-          - Off
-        5326:
-        - - Pressed
-          - Off
-        5327:
-        - - Pressed
-          - Off
-        5328:
-        - - Pressed
-          - Off
-        5329:
-        - - Pressed
-          - Off
-        5330:
-        - - Pressed
-          - Off
-        5332:
-        - - Pressed
-          - Off
-        5331:
-        - - Pressed
-          - Off
-        5333:
-        - - Pressed
-          - Off
-        5334:
-        - - Pressed
-          - Off
-        5370:
-        - - Pressed
-          - Off
-        3792:
-        - - Pressed
-          - Off
-        3816:
-        - - Pressed
-          - Off
-        5342:
-        - - Pressed
-          - Off
-        5341:
-        - - Pressed
-          - Off
-  - uid: 7810
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-24.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        9066:
-        - - Pressed
-          - Toggle
-        9082:
-        - - Pressed
-          - Toggle
-        9196:
-        - - Pressed
-          - Toggle
-        8663:
-        - - Pressed
-          - Toggle
-        8048:
-        - - Pressed
-          - Toggle
-        7807:
-        - - Pressed
-          - Toggle
   - uid: 8850
     components:
     - type: Transform
@@ -94855,13 +99490,13 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        5029:
+        2501:
         - - Pressed
           - Toggle
-        5030:
+        1341:
         - - Pressed
           - Toggle
-        5031:
+        313:
         - - Pressed
           - Toggle
   - uid: 17829
@@ -94947,46 +99582,20 @@ entities:
         4938:
         - - Pressed
           - Toggle
-  - uid: 19185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-24.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        8048:
-        - - Pressed
-          - Toggle
-        7807:
-        - - Pressed
-          - Toggle
-        9066:
-        - - Pressed
-          - Toggle
-        9196:
-        - - Pressed
-          - Toggle
-        9082:
-        - - Pressed
-          - Toggle
-        8663:
-        - - Pressed
-          - Toggle
 - proto: SignalButtonDirectional
   entities:
-  - uid: 8558
+  - uid: 5437
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 66.5,-48.5
+      pos: 65.5,-53.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7267:
+        5666:
         - - Pressed
           - Toggle
-        7052:
+        5539:
         - - Pressed
           - Toggle
   - uid: 10224
@@ -95070,24 +99679,182 @@ entities:
       linkedPorts:
         544:
         - - Pressed
-          - Toggle
+          - Open
         546:
         - - Pressed
-          - Toggle
-  - uid: 13198
+          - Open
+  - uid: 15700
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 32.5,-14.5
+      pos: 36.5,-27.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        625:
+        3725:
         - - Pressed
-          - Toggle
-        624:
+          - Forward
+        6388:
         - - Pressed
-          - Toggle
+          - Forward
+        7891:
+        - - Pressed
+          - Forward
+        6396:
+        - - Pressed
+          - Forward
+        3720:
+        - - Pressed
+          - Forward
+        3719:
+        - - Pressed
+          - Forward
+        3721:
+        - - Pressed
+          - Forward
+        6400:
+        - - Pressed
+          - Forward
+        1073:
+        - - Pressed
+          - Forward
+        1140:
+        - - Pressed
+          - Forward
+        12962:
+        - - Pressed
+          - Forward
+        6397:
+        - - Pressed
+          - Forward
+        6401:
+        - - Pressed
+          - Forward
+        3530:
+        - - Pressed
+          - Forward
+        3531:
+        - - Pressed
+          - Forward
+        3729:
+        - - Pressed
+          - Forward
+        6139:
+        - - Pressed
+          - Forward
+        3168:
+        - - Pressed
+          - Forward
+        3718:
+        - - Pressed
+          - Forward
+        3717:
+        - - Pressed
+          - Forward
+        8148:
+        - - Pressed
+          - Forward
+        12955:
+        - - Pressed
+          - Forward
+        11980:
+        - - Pressed
+          - Forward
+        8089:
+        - - Pressed
+          - Forward
+        11979:
+        - - Pressed
+          - Forward
+        11978:
+        - - Pressed
+          - Forward
+  - uid: 15849
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-29.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3725:
+        - - Pressed
+          - Off
+        6388:
+        - - Pressed
+          - Off
+        7891:
+        - - Pressed
+          - Off
+        6396:
+        - - Pressed
+          - Off
+        3720:
+        - - Pressed
+          - Off
+        3719:
+        - - Pressed
+          - Off
+        3721:
+        - - Pressed
+          - Off
+        6400:
+        - - Pressed
+          - Off
+        1073:
+        - - Pressed
+          - Off
+        1140:
+        - - Pressed
+          - Off
+        12962:
+        - - Pressed
+          - Off
+        6397:
+        - - Pressed
+          - Off
+        6401:
+        - - Pressed
+          - Off
+        3530:
+        - - Pressed
+          - Off
+        3531:
+        - - Pressed
+          - Off
+        3729:
+        - - Pressed
+          - Off
+        6139:
+        - - Pressed
+          - Off
+        3168:
+        - - Pressed
+          - Off
+        3718:
+        - - Pressed
+          - Off
+        3717:
+        - - Pressed
+          - Off
+        8148:
+        - - Pressed
+          - Off
+        12955:
+        - - Pressed
+          - Off
+        11980:
+        - - Pressed
+          - Off
+        8089:
+        - - Pressed
+          - Off
+        11979:
+        - - Pressed
+          - Off
+        11978:
+        - - Pressed
+          - Off
   - uid: 16241
     components:
     - type: Transform
@@ -95122,6 +99889,70 @@ entities:
         18213:
         - - Pressed
           - Toggle
+  - uid: 19574
+    components:
+    - type: Transform
+      pos: 13.5,-41.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19575:
+        - - Pressed
+          - Toggle
+        19564:
+        - - Pressed
+          - Toggle
+        19560:
+        - - Pressed
+          - Toggle
+        19559:
+        - - Pressed
+          - Toggle
+        19558:
+        - - Pressed
+          - Toggle
+        19557:
+        - - Pressed
+          - Toggle
+        19556:
+        - - Pressed
+          - Toggle
+        16098:
+        - - Pressed
+          - Toggle
+        19563:
+        - - Pressed
+          - Toggle
+        19561:
+        - - Pressed
+          - Toggle
+        19572:
+        - - Pressed
+          - Toggle
+        19562:
+        - - Pressed
+          - Toggle
+        19571:
+        - - Pressed
+          - Toggle
+        19566:
+        - - Pressed
+          - Toggle
+        19567:
+        - - Pressed
+          - Toggle
+        19568:
+        - - Pressed
+          - Toggle
+        19570:
+        - - Pressed
+          - Toggle
+        19565:
+        - - Pressed
+          - Toggle
+        14056:
+        - - Pressed
+          - Toggle
 - proto: SignAnomaly
   entities:
   - uid: 16210
@@ -95144,17 +99975,15 @@ entities:
       parent: 2
 - proto: SignArmory
   entities:
-  - uid: 9673
+  - uid: 208
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-53.5
+      pos: 66.5,-35.5
       parent: 2
-  - uid: 11955
+  - uid: 8576
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-34.5
+      pos: 57.5,-45.5
       parent: 2
 - proto: SignAtmos
   entities:
@@ -95163,6 +99992,16 @@ entities:
     - type: Transform
       pos: 26.5,-65.5
       parent: 2
+  - uid: 16106
+    components:
+    - type: Transform
+      pos: 36.5,-74.5
+      parent: 2
+  - uid: 16109
+    components:
+    - type: Transform
+      pos: 34.5,-75.5
+      parent: 2
   - uid: 16192
     components:
     - type: Transform
@@ -95182,18 +100021,6 @@ entities:
     - type: Transform
       pos: 4.5,-74.5
       parent: 2
-- proto: SignBiohazardMed
-  entities:
-  - uid: 18890
-    components:
-    - type: Transform
-      pos: 53.5,-27.5
-      parent: 2
-  - uid: 18891
-    components:
-    - type: Transform
-      pos: 54.5,-43.5
-      parent: 2
 - proto: SignBridge
   entities:
   - uid: 200
@@ -95272,22 +100099,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-70.5
       parent: 2
+  - uid: 9406
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-25.5
+      parent: 2
+  - uid: 14139
+    components:
+    - type: Transform
+      pos: -0.5,-58.5
+      parent: 2
   - uid: 16179
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 22.5,-75.5
       parent: 2
-  - uid: 18312
-    components:
-    - type: Transform
-      pos: 20.5,-25.5
-      parent: 2
-  - uid: 18315
-    components:
-    - type: Transform
-      pos: -0.5,-58.5
-      parent: 2
   - uid: 19281
     components:
     - type: Transform
@@ -95308,6 +100136,51 @@ entities:
     - type: Transform
       pos: 4.5,-2.5
       parent: 2
+- proto: SignCryogenicsMed
+  entities:
+  - uid: 3832
+    components:
+    - type: Transform
+      pos: -3.5,-50.5
+      parent: 2
+- proto: SignDangerMed
+  entities:
+  - uid: 17782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,6.5
+      parent: 2
+  - uid: 18269
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 2
+  - uid: 18374
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,5.5
+      parent: 2
+  - uid: 18375
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,13.5
+      parent: 2
+  - uid: 18376
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,5.5
+      parent: 2
+  - uid: 18377
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,6.5
+      parent: 2
 - proto: SignDirectionalAtmos
   entities:
   - uid: 9434
@@ -95316,18 +100189,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.498708,-51.71671
       parent: 2
+  - uid: 16151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5008106,-33.718235
+      parent: 2
   - uid: 17980
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.500819,-41.285877
       parent: 2
-  - uid: 17981
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-33.5
-      parent: 2
   - uid: 17982
     components:
     - type: Transform
@@ -95344,11 +100217,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-54.5
       parent: 2
-  - uid: 17987
+  - uid: 19621
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.4997983,-55.716797
+      pos: 12.5,-51.5
       parent: 2
 - proto: SignDirectionalBar
   entities:
@@ -95384,12 +100257,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.49973,-51.71622
       parent: 2
-  - uid: 16180
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.4990706,-55.28383
-      parent: 2
   - uid: 16185
     components:
     - type: Transform
@@ -95401,6 +100268,18 @@ entities:
     - type: Transform
       pos: -30.5,-18.5
       parent: 2
+  - uid: 19629
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-51.5
+      parent: 2
+  - uid: 19631
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5013075,-33.288094
+      parent: 2
 - proto: SignDirectionalChapel
   entities:
   - uid: 12824
@@ -95422,27 +100301,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-58.5
       parent: 2
-  - uid: 14923
+  - uid: 9290
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 19.5,-26.5
+      pos: 20.5,-26.5
       parent: 2
   - uid: 16113
     components:
     - type: Transform
       pos: 22.5,-59.5
       parent: 2
+  - uid: 16127
+    components:
+    - type: Transform
+      pos: 6.5,-55.5
+      parent: 2
   - uid: 16134
     components:
     - type: Transform
       pos: 2.498827,-33.284237
       parent: 2
-  - uid: 16151
-    components:
-    - type: Transform
-      pos: 7.5,-51.5
-      parent: 2
 - proto: SignDirectionalCryo
   entities:
   - uid: 16159
@@ -95451,6 +100330,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 22.5,-47.5
       parent: 2
+  - uid: 16180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.50015,-51.284824
+      parent: 2
   - uid: 17820
     components:
     - type: Transform
@@ -95495,6 +100380,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.501791,-54.716873
       parent: 2
+  - uid: 14808
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-33.5
+      parent: 2
   - uid: 15613
     components:
     - type: Transform
@@ -95527,14 +100418,25 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,-80.5
       parent: 2
-  - uid: 17984
+  - uid: 19632
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5003753,-33.716583
+      pos: -15.5013685,-35.71809
+      parent: 2
+  - uid: 19633
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.50085,-51.716766
       parent: 2
 - proto: SignDirectionalEvac
   entities:
+  - uid: 516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.501007,-25.282156
+      parent: 2
   - uid: 1830
     components:
     - type: Transform
@@ -95547,23 +100449,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 62.5,-22.5
       parent: 2
-  - uid: 4068
+  - uid: 5213
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 51.5,-25.5
+      pos: 1.5015326,-8.71623
       parent: 2
-  - uid: 4358
+  - uid: 7888
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-54.5
-      parent: 2
-  - uid: 6847
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-55.5
+      pos: 4.5,-0.5
       parent: 2
   - uid: 7935
     components:
@@ -95571,63 +100466,29 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 44.49919,-51.71689
       parent: 2
-  - uid: 9284
-    components:
-    - type: Transform
-      pos: 37.5,-77.5
-      parent: 2
   - uid: 9298
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 52.5,-77.5
       parent: 2
-  - uid: 10303
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-32.5
-      parent: 2
-  - uid: 10333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-53.5
-      parent: 2
-  - uid: 10646
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-14.5
-      parent: 2
   - uid: 13204
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5012168,-12.284781
       parent: 2
-  - uid: 13650
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-59.5
-      parent: 2
   - uid: 14008
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.501286,-54.06827
       parent: 2
-  - uid: 14046
+  - uid: 15790
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 44.5,-34.5
-      parent: 2
-  - uid: 15909
-    components:
-    - type: Transform
-      pos: 43.5,-24.5
+      pos: -15.5,-35.5
       parent: 2
   - uid: 15910
     components:
@@ -95639,7 +100500,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -15.500039,-41.716366
+      pos: -9.5,-10.5
       parent: 2
   - uid: 16144
     components:
@@ -95647,35 +100508,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-15.5
       parent: 2
-  - uid: 16146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-9.5
-      parent: 2
-  - uid: 16147
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-8.5
-      parent: 2
-  - uid: 16148
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-29.5
-      parent: 2
   - uid: 16162
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.49889,-51.283894
       parent: 2
-  - uid: 16163
+  - uid: 16168
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 22.500296,-33.285934
+      rot: -1.5707963267948966 rad
+      pos: 22.50092,-33.28325
       parent: 2
   - uid: 16174
     components:
@@ -95683,11 +100526,71 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-64.5
       parent: 2
-  - uid: 16178
+  - uid: 16177
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 26.5,-75.5
+      pos: 26.501543,-75.28514
+      parent: 2
+  - uid: 16358
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.499287,-25.282099
+      parent: 2
+  - uid: 16365
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-14.5
+      parent: 2
+  - uid: 16369
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.50031,-21.283514
+      parent: 2
+  - uid: 16372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-14.5
+      parent: 2
+  - uid: 16414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-45.5
+      parent: 2
+  - uid: 16432
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-75.5
+      parent: 2
+  - uid: 16979
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.4993314,-15.717761
+      parent: 2
+  - uid: 17221
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.4992862,-8.714865
+      parent: 2
+  - uid: 17409
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.499661,-41.28664
+      parent: 2
+  - uid: 17707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5012491,-29.285704
       parent: 2
   - uid: 17809
     components:
@@ -95707,17 +100610,50 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-69.5
       parent: 2
+  - uid: 18205
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 2
   - uid: 18210
     components:
     - type: Transform
       pos: -5.5,-4.5
       parent: 2
+  - uid: 18871
+    components:
+    - type: Transform
+      pos: 36.5,-77.5
+      parent: 2
   - uid: 19406
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 36.5,-80.5
       parent: 2
+  - uid: 19442
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
+  - uid: 19454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5003424,-8.714865
+      parent: 2
+  - uid: 19630
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.498548,-51.284073
+      parent: 2
+  - uid: 19637
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 2
 - proto: SignDirectionalFood
   entities:
   - uid: 5177
@@ -95737,17 +100673,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.4994224,-33.283478
       parent: 2
-  - uid: 16177
+  - uid: 16176
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 26.499176,-75.28583
+      pos: 26.5,-75.5
       parent: 2
   - uid: 18204
     components:
     - type: Transform
       pos: 22.498983,-37.717163
       parent: 2
+  - uid: 19636
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.499051,-51.286167
+      parent: 2
 - proto: SignDirectionalHop
   entities:
   - uid: 16132
@@ -95785,6 +100727,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.498922,-55.715004
       parent: 2
+  - uid: 19736
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 39.49834,-48.28038
+      parent: 2
 - proto: SignDirectionalJanitor
   entities:
   - uid: 16166
@@ -95798,10 +100746,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.500022,-33.28552
       parent: 2
-  - uid: 16168
+  - uid: 17078
     components:
     - type: Transform
-      pos: -1.5000485,-12.718935
+      pos: -1.4999341,-15.283161
       parent: 2
 - proto: SignDirectionalLibrary
   entities:
@@ -95810,10 +100758,10 @@ entities:
     - type: Transform
       pos: 3.4989862,-33.716446
       parent: 2
-  - uid: 16155
+  - uid: 16163
     components:
     - type: Transform
-      pos: 7.500051,-51.71732
+      pos: 6.499085,-55.716106
       parent: 2
 - proto: SignDirectionalMed
   entities:
@@ -95834,11 +100782,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.499496,-33.717285
       parent: 2
-  - uid: 16127
-    components:
-    - type: Transform
-      pos: -1.500161,-15.284051
-      parent: 2
   - uid: 16160
     components:
     - type: Transform
@@ -95851,10 +100794,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-33.5
       parent: 2
-  - uid: 17821
+  - uid: 16178
     components:
     - type: Transform
-      pos: 22.5,-27.5
+      pos: -1.4999341,-12.716049
+      parent: 2
+  - uid: 16373
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 2
+  - uid: 17984
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-51.5
       parent: 2
   - uid: 18201
     components:
@@ -95862,6 +100816,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5010014,-69.072586
       parent: 2
+  - uid: 19639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.499754,-10.717974
+      parent: 2
 - proto: SignDirectionalSalvage
   entities:
   - uid: 16209
@@ -95882,7 +100842,13 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5014317,-29.285109
+      pos: 7.50015,-51.71722
+      parent: 2
+  - uid: 16156
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-29.5
       parent: 2
   - uid: 16157
     components:
@@ -95916,6 +100882,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 44.5,-51.5
       parent: 2
+  - uid: 10762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-21.5
+      parent: 2
   - uid: 16122
     components:
     - type: Transform
@@ -95938,11 +100910,11 @@ entities:
     - type: Transform
       pos: -1.5,-15.5
       parent: 2
-  - uid: 16176
+  - uid: 16359
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 26.499176,-75.71822
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-25.5
       parent: 2
   - uid: 17813
     components:
@@ -95950,6 +100922,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.499488,-41.71687
       parent: 2
+  - uid: 17922
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.500002,-75.714455
+      parent: 2
+  - uid: 19635
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.499051,-51.718567
+      parent: 2
 - proto: SignDirectionalSolar
   entities:
   - uid: 6964
@@ -95987,6 +100971,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 39.5,-77.5
       parent: 2
+  - uid: 9876
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.501007,-25.714556
+      parent: 2
+  - uid: 10773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-25.5
+      parent: 2
   - uid: 14068
     components:
     - type: Transform
@@ -96017,23 +101013,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 68.5,-70.5
       parent: 2
-  - uid: 16118
+  - uid: 16370
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 37.5,-33.5
+      pos: 28.499249,-21.715097
       parent: 2
-  - uid: 16119
+  - uid: 16374
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 45.5,-30.5
+      pos: 86.5,-68.5
       parent: 2
-  - uid: 17078
+  - uid: 16378
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 46.5,-24.5
+      pos: 73.5,-70.5
+      parent: 2
+  - uid: 16420
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-73.5
       parent: 2
   - uid: 17814
     components:
@@ -96057,11 +101059,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.50103,-63.718613
       parent: 2
-  - uid: 18503
+  - uid: 18869
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 27.5,-32.5
+      pos: 77.5,-22.5
+      parent: 2
+  - uid: 18870
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,-79.5
       parent: 2
   - uid: 18905
     components:
@@ -96081,11 +101089,6 @@ entities:
     - type: Transform
       pos: 22.498564,-59.717285
       parent: 2
-  - uid: 16126
-    components:
-    - type: Transform
-      pos: -1.500161,-15.716451
-      parent: 2
   - uid: 16135
     components:
     - type: Transform
@@ -96097,11 +101100,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.501286,-54.50067
       parent: 2
-  - uid: 16156
-    components:
-    - type: Transform
-      pos: 7.49974,-51.2822
-      parent: 2
   - uid: 17364
     components:
     - type: Transform
@@ -96120,18 +101118,28 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,-41.5
       parent: 2
+  - uid: 18035
+    components:
+    - type: Transform
+      pos: -4.500692,-12.716591
+      parent: 2
   - uid: 18202
     components:
     - type: Transform
       pos: 12.5,-75.5
       parent: 2
-- proto: SignDisposalSpace
-  entities:
-  - uid: 15409
+  - uid: 19634
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-76.5
+      pos: 6.499085,-55.283707
+      parent: 2
+- proto: SignDisposalSpace
+  entities:
+  - uid: 19775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-72.5
       parent: 2
 - proto: SignDoors
   entities:
@@ -96237,6 +101245,13 @@ entities:
     - type: Transform
       pos: 3.5,-17.5
       parent: 2
+- proto: SignExamroom
+  entities:
+  - uid: 5207
+    components:
+    - type: Transform
+      pos: 11.5,-70.5
+      parent: 2
 - proto: SignGravity
   entities:
   - uid: 16203
@@ -96261,23 +101276,23 @@ entities:
       parent: 2
 - proto: SignHydro1
   entities:
+  - uid: 14927
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-47.5
+      parent: 2
   - uid: 18313
     components:
     - type: Transform
       pos: 14.5,-64.5
       parent: 2
-  - uid: 18331
-    components:
-    - type: Transform
-      pos: 38.5,-47.5
-      parent: 2
 - proto: SignInterrogation
   entities:
-  - uid: 6125
+  - uid: 7095
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-40.5
+      pos: 50.5,-35.5
       parent: 2
 - proto: SignJanitor
   entities:
@@ -96289,7 +101304,7 @@ entities:
       parent: 2
 - proto: SignKitchen
   entities:
-  - uid: 18316
+  - uid: 18300
     components:
     - type: Transform
       pos: 1.5,-51.5
@@ -96339,10 +101354,11 @@ entities:
       parent: 2
 - proto: SignMedical
   entities:
-  - uid: 17922
+  - uid: 8046
     components:
     - type: Transform
-      pos: 6.5,-33.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-24.5
       parent: 2
   - uid: 17923
     components:
@@ -96354,25 +101370,22 @@ entities:
     - type: Transform
       pos: 18.5,-64.5
       parent: 2
+  - uid: 19638
+    components:
+    - type: Transform
+      pos: 7.5,-29.5
+      parent: 2
 - proto: SignMorgue
   entities:
-  - uid: 924
+  - uid: 9303
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-21.5
+      pos: 30.5,-25.5
       parent: 2
-  - uid: 7775
+  - uid: 14731
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-21.5
-      parent: 2
-  - uid: 7776
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-24.5
+      pos: 27.5,-25.5
       parent: 2
 - proto: SignNews
   entities:
@@ -96405,6 +101418,12 @@ entities:
       parent: 2
 - proto: SignRadiationMed
   entities:
+  - uid: 10796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-75.5
+      parent: 2
   - uid: 16756
     components:
     - type: Transform
@@ -96434,10 +101453,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-72.5
       parent: 2
-  - uid: 19257
+  - uid: 19128
     components:
     - type: Transform
-      pos: -12.5,-74.5
+      pos: -10.5,-76.5
       parent: 2
   - uid: 19258
     components:
@@ -96477,6 +101496,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 46.5,-100.5
       parent: 2
+  - uid: 19731
+    components:
+    - type: Transform
+      pos: 53.5,-104.5
+      parent: 2
 - proto: SignScience
   entities:
   - uid: 6645
@@ -96498,24 +101522,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 74.5,-24.5
       parent: 2
+  - uid: 3783
+    components:
+    - type: Transform
+      pos: 77.5,-40.5
+      parent: 2
+  - uid: 7961
+    components:
+    - type: Transform
+      pos: 75.5,-40.5
+      parent: 2
   - uid: 10775
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 76.5,-24.5
       parent: 2
-  - uid: 13829
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-42.5
-      parent: 2
-  - uid: 18027
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 73.5,-42.5
-      parent: 2
 - proto: SignSecureMed
   entities:
   - uid: 6707
@@ -96529,6 +101551,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-90.5
       parent: 2
+  - uid: 15694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-27.5
+      parent: 2
+  - uid: 15696
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-28.5
+      parent: 2
   - uid: 18910
     components:
     - type: Transform
@@ -96567,17 +101601,15 @@ entities:
       parent: 2
 - proto: SignSecureSmall
   entities:
-  - uid: 11698
+  - uid: 3559
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-22.5
+      pos: 53.5,-22.5
       parent: 2
-  - uid: 11700
+  - uid: 7151
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-22.5
+      pos: 51.5,-22.5
       parent: 2
   - uid: 11713
     components:
@@ -96597,6 +101629,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 41.5,-22.5
       parent: 2
+  - uid: 17981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-22.5
+      parent: 2
+  - uid: 18145
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-55.5
+      parent: 2
   - uid: 18361
     components:
     - type: Transform
@@ -96625,23 +101669,43 @@ entities:
       parent: 2
 - proto: SignSecurity
   entities:
-  - uid: 4875
+  - uid: 3616
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-47.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-40.5
       parent: 2
-  - uid: 5015
+  - uid: 3620
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-40.5
+      parent: 2
+  - uid: 15670
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 56.5,-47.5
+      pos: 74.5,-45.5
       parent: 2
   - uid: 18041
     components:
     - type: Transform
       pos: 64.5,-26.5
       parent: 2
+- proto: SignShipDock
+  entities:
+  - uid: 19640
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-9.5
+      parent: 2
+  - uid: 19641
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -38.5,-9.5
+      parent: 2
 - proto: SignShock
   entities:
   - uid: 11726
@@ -96735,11 +101799,17 @@ entities:
       parent: 2
 - proto: SignVirology
   entities:
-  - uid: 7774
+  - uid: 7615
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 26.5,-18.5
+      pos: 32.5,-21.5
+      parent: 2
+  - uid: 8787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-17.5
       parent: 2
 - proto: SingularityGenerator
   entities:
@@ -96756,29 +101826,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,-49.5
       parent: 2
-  - uid: 7053
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-41.5
-      parent: 2
-  - uid: 7054
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-42.5
-      parent: 2
   - uid: 7092
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-50.5
       parent: 2
-  - uid: 8036
-    components:
-    - type: Transform
-      pos: 42.5,-40.5
-      parent: 2
   - uid: 17428
     components:
     - type: Transform
@@ -96790,12 +101843,6 @@ entities:
     - type: Transform
       pos: 20.5,-70.5
       parent: 2
-  - uid: 17883
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-18.5
-      parent: 2
 - proto: SinkWide
   entities:
   - uid: 1875
@@ -96803,18 +101850,43 @@ entities:
     - type: Transform
       pos: -9.5,-15.5
       parent: 2
+  - uid: 4717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-42.5
+      parent: 2
   - uid: 5357
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 45.5,-15.5
       parent: 2
+  - uid: 8160
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-43.5
+      parent: 2
   - uid: 14036
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-26.5
       parent: 2
+  - uid: 19090
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-25.5
+      parent: 2
+- proto: Skub
+  entities:
+  - uid: 16871
+    components:
+    - type: Transform
+      pos: -61.753063,-25.19519
+      parent: 2
 - proto: SmartFridge
   entities:
   - uid: 13948
@@ -96822,6 +101894,11 @@ entities:
     - type: Transform
       pos: 20.5,-27.5
       parent: 2
+  - uid: 16115
+    components:
+    - type: Transform
+      pos: 42.5,-47.5
+      parent: 2
 - proto: SMESAdvanced
   entities:
   - uid: 3092
@@ -96861,16 +101938,16 @@ entities:
       parent: 2
 - proto: SMESBasic
   entities:
+  - uid: 4344
+    components:
+    - type: Transform
+      pos: 89.5,-45.5
+      parent: 2
   - uid: 5552
     components:
     - type: Transform
       pos: -33.5,-46.5
       parent: 2
-  - uid: 11843
-    components:
-    - type: Transform
-      pos: 87.5,-45.5
-      parent: 2
   - uid: 13845
     components:
     - type: Transform
@@ -96900,6 +101977,11 @@ entities:
       parent: 2
 - proto: SodaDispenser
   entities:
+  - uid: 3742
+    components:
+    - type: Transform
+      pos: 61.5,-67.5
+      parent: 2
   - uid: 5004
     components:
     - type: Transform
@@ -96912,12 +101994,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 38.5,-45.5
       parent: 2
-  - uid: 8084
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-61.5
-      parent: 2
 - proto: SolarControlComputerCircuitboard
   entities:
   - uid: 18308
@@ -96927,215 +102003,210 @@ entities:
       parent: 2
 - proto: SolarPanel
   entities:
-  - uid: 7425
-    components:
-    - type: Transform
-      pos: 98.5,-55.5
-      parent: 2
-  - uid: 7511
-    components:
-    - type: Transform
-      pos: 98.5,-33.5
-      parent: 2
-  - uid: 7512
-    components:
-    - type: Transform
-      pos: 98.5,-34.5
-      parent: 2
-  - uid: 7513
-    components:
-    - type: Transform
-      pos: 98.5,-35.5
-      parent: 2
-  - uid: 7514
-    components:
-    - type: Transform
-      pos: 99.5,-36.5
-      parent: 2
-  - uid: 7515
-    components:
-    - type: Transform
-      pos: 99.5,-37.5
-      parent: 2
-  - uid: 7516
-    components:
-    - type: Transform
-      pos: 99.5,-38.5
-      parent: 2
-  - uid: 7517
-    components:
-    - type: Transform
-      pos: 99.5,-39.5
-      parent: 2
-  - uid: 7518
-    components:
-    - type: Transform
-      pos: 96.5,-34.5
-      parent: 2
-  - uid: 7519
-    components:
-    - type: Transform
-      pos: 100.5,-41.5
-      parent: 2
-  - uid: 7520
-    components:
-    - type: Transform
-      pos: 100.5,-42.5
-      parent: 2
-  - uid: 7521
-    components:
-    - type: Transform
-      pos: 100.5,-43.5
-      parent: 2
-  - uid: 7522
-    components:
-    - type: Transform
-      pos: 100.5,-44.5
-      parent: 2
-  - uid: 7523
-    components:
-    - type: Transform
-      pos: 100.5,-45.5
-      parent: 2
-  - uid: 7524
-    components:
-    - type: Transform
-      pos: 100.5,-46.5
-      parent: 2
-  - uid: 7525
-    components:
-    - type: Transform
-      pos: 100.5,-47.5
-      parent: 2
-  - uid: 7526
-    components:
-    - type: Transform
-      pos: 100.5,-48.5
-      parent: 2
-  - uid: 7527
-    components:
-    - type: Transform
-      pos: 100.5,-49.5
-      parent: 2
-  - uid: 7529
-    components:
-    - type: Transform
-      pos: 99.5,-51.5
-      parent: 2
-  - uid: 7530
-    components:
-    - type: Transform
-      pos: 99.5,-52.5
-      parent: 2
-  - uid: 7531
+  - uid: 5334
     components:
     - type: Transform
       pos: 99.5,-53.5
       parent: 2
-  - uid: 7532
+  - uid: 5335
     components:
     - type: Transform
-      pos: 99.5,-54.5
+      pos: 99.5,-51.5
       parent: 2
-  - uid: 7533
+  - uid: 5336
+    components:
+    - type: Transform
+      pos: 99.5,-39.5
+      parent: 2
+  - uid: 5337
+    components:
+    - type: Transform
+      pos: 99.5,-52.5
+      parent: 2
+  - uid: 5338
+    components:
+    - type: Transform
+      pos: 99.5,-40.5
+      parent: 2
+  - uid: 5339
+    components:
+    - type: Transform
+      pos: 99.5,-38.5
+      parent: 2
+  - uid: 5341
+    components:
+    - type: Transform
+      pos: 98.5,-35.5
+      parent: 2
+  - uid: 5342
     components:
     - type: Transform
       pos: 98.5,-56.5
       parent: 2
-  - uid: 7534
+  - uid: 5344
     components:
     - type: Transform
-      pos: 98.5,-57.5
+      pos: 100.5,-42.5
       parent: 2
-  - uid: 7538
+  - uid: 5346
     components:
     - type: Transform
-      pos: 96.5,-35.5
+      pos: 100.5,-45.5
       parent: 2
-  - uid: 7539
+  - uid: 5351
     components:
     - type: Transform
-      pos: 97.5,-37.5
+      pos: 98.5,-34.5
       parent: 2
-  - uid: 7540
+  - uid: 5360
     components:
     - type: Transform
-      pos: 97.5,-38.5
+      pos: 99.5,-50.5
       parent: 2
-  - uid: 7541
+  - uid: 5361
     components:
     - type: Transform
-      pos: 97.5,-39.5
+      pos: 100.5,-47.5
       parent: 2
-  - uid: 7542
+  - uid: 5362
     components:
     - type: Transform
-      pos: 97.5,-40.5
+      pos: 100.5,-46.5
       parent: 2
-  - uid: 7543
+  - uid: 5363
     components:
     - type: Transform
-      pos: 98.5,-42.5
+      pos: 100.5,-48.5
       parent: 2
-  - uid: 7544
+  - uid: 5364
     components:
     - type: Transform
-      pos: 98.5,-43.5
+      pos: 98.5,-55.5
       parent: 2
-  - uid: 7545
+  - uid: 5365
     components:
     - type: Transform
-      pos: 98.5,-44.5
+      pos: 100.5,-43.5
+      parent: 2
+  - uid: 5366
+    components:
+    - type: Transform
+      pos: 100.5,-44.5
+      parent: 2
+  - uid: 6629
+    components:
+    - type: Transform
+      pos: 99.5,-37.5
+      parent: 2
+  - uid: 7430
+    components:
+    - type: Transform
+      pos: 100.5,-35.5
+      parent: 2
+  - uid: 7513
+    components:
+    - type: Transform
+      pos: 100.5,-34.5
+      parent: 2
+  - uid: 7514
+    components:
+    - type: Transform
+      pos: 100.5,-33.5
+      parent: 2
+  - uid: 7515
+    components:
+    - type: Transform
+      pos: 102.5,-45.5
+      parent: 2
+  - uid: 7516
+    components:
+    - type: Transform
+      pos: 102.5,-44.5
+      parent: 2
+  - uid: 7517
+    components:
+    - type: Transform
+      pos: 101.5,-39.5
+      parent: 2
+  - uid: 7518
+    components:
+    - type: Transform
+      pos: 102.5,-42.5
+      parent: 2
+  - uid: 7519
+    components:
+    - type: Transform
+      pos: 102.5,-41.5
+      parent: 2
+  - uid: 7520
+    components:
+    - type: Transform
+      pos: 101.5,-38.5
+      parent: 2
+  - uid: 7521
+    components:
+    - type: Transform
+      pos: 101.5,-37.5
+      parent: 2
+  - uid: 7522
+    components:
+    - type: Transform
+      pos: 101.5,-52.5
+      parent: 2
+  - uid: 7523
+    components:
+    - type: Transform
+      pos: 101.5,-51.5
+      parent: 2
+  - uid: 7524
+    components:
+    - type: Transform
+      pos: 100.5,-57.5
+      parent: 2
+  - uid: 7525
+    components:
+    - type: Transform
+      pos: 100.5,-56.5
       parent: 2
   - uid: 7546
     components:
     - type: Transform
-      pos: 98.5,-45.5
-      parent: 2
-  - uid: 7547
-    components:
-    - type: Transform
-      pos: 98.5,-46.5
+      pos: 102.5,-49.5
       parent: 2
   - uid: 7548
     components:
     - type: Transform
-      pos: 98.5,-47.5
+      pos: 100.5,-55.5
       parent: 2
   - uid: 7549
     components:
     - type: Transform
-      pos: 98.5,-48.5
-      parent: 2
-  - uid: 7550
-    components:
-    - type: Transform
-      pos: 97.5,-50.5
-      parent: 2
-  - uid: 7551
-    components:
-    - type: Transform
-      pos: 97.5,-51.5
+      pos: 101.5,-54.5
       parent: 2
   - uid: 7552
     components:
     - type: Transform
-      pos: 97.5,-52.5
+      pos: 101.5,-53.5
       parent: 2
   - uid: 7553
     components:
     - type: Transform
-      pos: 97.5,-53.5
+      pos: 102.5,-48.5
       parent: 2
-  - uid: 7555
+  - uid: 7554
     components:
     - type: Transform
-      pos: 96.5,-56.5
+      pos: 101.5,-36.5
       parent: 2
-  - uid: 7556
+  - uid: 7560
     components:
     - type: Transform
-      pos: 96.5,-55.5
+      pos: 102.5,-47.5
+      parent: 2
+  - uid: 7561
+    components:
+    - type: Transform
+      pos: 102.5,-46.5
       parent: 2
   - uid: 8233
     components:
@@ -97317,6 +102388,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -56.5,-18.5
       parent: 2
+  - uid: 9384
+    components:
+    - type: Transform
+      pos: 102.5,-43.5
+      parent: 2
 - proto: SpaceCash10
   entities:
   - uid: 6742
@@ -97421,10 +102497,10 @@ entities:
       parent: 2
 - proto: SpawnMobMcGriff
   entities:
-  - uid: 19038
+  - uid: 7122
     components:
     - type: Transform
-      pos: 57.5,-44.5
+      pos: 54.5,-38.5
       parent: 2
 - proto: SpawnMobMedibot
   entities:
@@ -97462,6 +102538,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
@@ -97478,10 +102561,10 @@ entities:
       parent: 2
 - proto: SpawnMobShiva
   entities:
-  - uid: 3033
+  - uid: 1803
     components:
     - type: Transform
-      pos: 69.5,-48.5
+      pos: 69.5,-53.5
       parent: 2
 - proto: SpawnMobSmile
   entities:
@@ -97497,12 +102580,12 @@ entities:
     - type: Transform
       pos: 19.5,-72.5
       parent: 2
-- proto: SpawnMobXenoPraetorian
+- proto: SpawnMobXenoLonePraetorian
   entities:
-  - uid: 16770
+  - uid: 20082
     components:
     - type: Transform
-      pos: 75.5,-30.5
+      pos: 76.5,-35.5
       parent: 2
 - proto: SpawnPointAtmos
   entities:
@@ -97562,11 +102645,6 @@ entities:
     - type: Transform
       pos: -3.5,-48.5
       parent: 2
-  - uid: 17084
-    components:
-    - type: Transform
-      pos: -2.5,-48.5
-      parent: 2
 - proto: SpawnPointCaptain
   entities:
   - uid: 15311
@@ -97632,6 +102710,11 @@ entities:
     - type: Transform
       pos: 18.5,-66.5
       parent: 2
+  - uid: 19620
+    components:
+    - type: Transform
+      pos: 19.5,-66.5
+      parent: 2
 - proto: SpawnPointChiefEngineer
   entities:
   - uid: 15316
@@ -97655,10 +102738,10 @@ entities:
       parent: 2
 - proto: SpawnPointDetective
   entities:
-  - uid: 19062
+  - uid: 18029
     components:
     - type: Transform
-      pos: 70.5,-50.5
+      pos: 71.5,-46.5
       parent: 2
 - proto: SpawnPointHeadOfPersonnel
   entities:
@@ -97669,10 +102752,10 @@ entities:
       parent: 2
 - proto: SpawnPointHeadOfSecurity
   entities:
-  - uid: 13986
+  - uid: 5474
     components:
     - type: Transform
-      pos: 71.5,-47.5
+      pos: 70.5,-53.5
       parent: 2
 - proto: SpawnPointJanitor
   entities:
@@ -97693,15 +102776,25 @@ entities:
       parent: 2
 - proto: SpawnPointLawyer
   entities:
-  - uid: 19064
+  - uid: 3459
     components:
     - type: Transform
-      pos: 54.5,-57.5
+      pos: 54.5,-55.5
       parent: 2
-  - uid: 19065
+  - uid: 18037
     components:
     - type: Transform
-      pos: 53.5,-57.5
+      pos: 54.5,-56.5
+      parent: 2
+  - uid: 18038
+    components:
+    - type: Transform
+      pos: 52.5,-56.5
+      parent: 2
+  - uid: 18044
+    components:
+    - type: Transform
+      pos: 52.5,-55.5
       parent: 2
 - proto: SpawnPointLibrarian
   entities:
@@ -97734,20 +102827,20 @@ entities:
       parent: 2
 - proto: SpawnPointMedicalIntern
   entities:
-  - uid: 474
+  - uid: 7278
     components:
     - type: Transform
-      pos: 21.5,-20.5
+      pos: 22.5,-19.5
       parent: 2
-  - uid: 9901
+  - uid: 8764
     components:
     - type: Transform
       pos: 20.5,-20.5
       parent: 2
-  - uid: 14874
+  - uid: 8861
     components:
     - type: Transform
-      pos: 21.5,-18.5
+      pos: 22.5,-20.5
       parent: 2
 - proto: SpawnPointMime
   entities:
@@ -97876,49 +102969,54 @@ entities:
     - type: Transform
       pos: -21.5,-25.5
       parent: 2
+  - uid: 19618
+    components:
+    - type: Transform
+      pos: -12.5,-26.5
+      parent: 2
 - proto: SpawnPointSecurityCadet
   entities:
-  - uid: 19059
+  - uid: 908
     components:
     - type: Transform
-      pos: 58.5,-36.5
+      pos: 71.5,-39.5
       parent: 2
-  - uid: 19060
+  - uid: 4628
     components:
     - type: Transform
-      pos: 58.5,-37.5
+      pos: 69.5,-39.5
       parent: 2
-  - uid: 19061
+  - uid: 5142
     components:
     - type: Transform
-      pos: 58.5,-38.5
+      pos: 70.5,-39.5
       parent: 2
 - proto: SpawnPointSecurityOfficer
   entities:
-  - uid: 19039
+  - uid: 599
     components:
     - type: Transform
-      pos: 60.5,-31.5
+      pos: 50.5,-32.5
       parent: 2
-  - uid: 19057
+  - uid: 625
     components:
     - type: Transform
-      pos: 63.5,-39.5
+      pos: 59.5,-27.5
       parent: 2
-  - uid: 19058
+  - uid: 862
     components:
     - type: Transform
-      pos: 59.5,-35.5
+      pos: 64.5,-43.5
       parent: 2
-  - uid: 19063
+  - uid: 3578
     components:
     - type: Transform
-      pos: 58.5,-35.5
+      pos: 50.5,-33.5
       parent: 2
-  - uid: 19067
+  - uid: 4428
     components:
     - type: Transform
-      pos: 65.5,-35.5
+      pos: 58.5,-27.5
       parent: 2
 - proto: SpawnPointServiceWorker
   entities:
@@ -97959,6 +103057,11 @@ entities:
     - type: Transform
       pos: -14.5,-59.5
       parent: 2
+  - uid: 19619
+    components:
+    - type: Transform
+      pos: -15.5,-60.5
+      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 15320
@@ -97978,10 +103081,10 @@ entities:
       parent: 2
 - proto: SpawnPointWarden
   entities:
-  - uid: 19037
+  - uid: 7098
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      pos: 54.5,-37.5
       parent: 2
 - proto: SpawnVendingMachineRestockFoodDrink
   entities:
@@ -98005,14 +103108,14 @@ entities:
   - uid: 7337
     components:
     - type: Transform
-      pos: 80.55358,-27.356148
+      pos: 78.48892,-25.591612
       parent: 2
 - proto: SpeedLoaderMagnum
   entities:
-  - uid: 17851
+  - uid: 10259
     components:
     - type: Transform
-      pos: 67.51773,-52.43789
+      pos: 68.498024,-48.389458
       parent: 2
 - proto: SprayBottle
   entities:
@@ -98037,10 +103140,15 @@ entities:
             Quantity: 50
 - proto: SprayBottleSpaceCleaner
   entities:
-  - uid: 7182
+  - uid: 6971
     components:
     - type: Transform
-      pos: 58.312195,-71.26866
+      pos: -37.288506,-76.45576
+      parent: 2
+  - uid: 11866
+    components:
+    - type: Transform
+      pos: 72.36833,-67.33941
       parent: 2
   - uid: 17417
     components:
@@ -98050,7 +103158,7 @@ entities:
   - uid: 17709
     components:
     - type: Transform
-      pos: 1.5561932,-62.455708
+      pos: 1.3780347,-62.383446
       parent: 2
 - proto: StairDark
   entities:
@@ -98223,12 +103331,6 @@ entities:
       parent: 2
 - proto: StairStageDark
   entities:
-  - uid: 2962
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,-75.5
-      parent: 2
   - uid: 17041
     components:
     - type: Transform
@@ -98241,6 +103343,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-79.5
       parent: 2
+  - uid: 17118
+    components:
+    - type: Transform
+      pos: -40.5,-78.5
+      parent: 2
+  - uid: 17347
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,-77.5
+      parent: 2
+  - uid: 17352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-77.5
+      parent: 2
   - uid: 17667
     components:
     - type: Transform
@@ -98253,17 +103372,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.5,-13.5
       parent: 2
-  - uid: 18374
-    components:
-    - type: Transform
-      pos: -41.5,-77.5
-      parent: 2
-  - uid: 18375
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -40.5,-76.5
-      parent: 2
 - proto: StasisBed
   entities:
   - uid: 5223
@@ -98285,16 +103393,16 @@ entities:
       parent: 2
 - proto: StationAiUploadComputer
   entities:
-  - uid: 10839
-    components:
-    - type: Transform
-      pos: 79.5,-43.5
-      parent: 2
-  - uid: 17659
+  - uid: 7413
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 79.5,-47.5
+      pos: 81.5,-47.5
+      parent: 2
+  - uid: 7536
+    components:
+    - type: Transform
+      pos: 81.5,-43.5
       parent: 2
 - proto: StationAnchor
   entities:
@@ -98308,14 +103416,14 @@ entities:
   - uid: 17336
     components:
     - type: Transform
-      pos: 70.44866,-69.44586
+      pos: 57.362057,-63.55035
       parent: 2
 - proto: StationEfficiencyCircuitBoard
   entities:
   - uid: 18625
     components:
     - type: Transform
-      pos: 77.398285,-47.303596
+      pos: 78.51944,-47.473473
       parent: 2
 - proto: StationMap
   entities:
@@ -98330,10 +103438,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-86.5
       parent: 2
-  - uid: 6628
+  - uid: 6270
     components:
     - type: Transform
-      pos: 53.5,-48.5
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-19.5
       parent: 2
   - uid: 6959
     components:
@@ -98347,6 +103456,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,-92.5
       parent: 2
+  - uid: 7096
+    components:
+    - type: Transform
+      pos: 52.5,-22.5
+      parent: 2
   - uid: 13197
     components:
     - type: Transform
@@ -98369,11 +103483,6 @@ entities:
     - type: Transform
       pos: 4.5,-4.5
       parent: 2
-  - uid: 14823
-    components:
-    - type: Transform
-      pos: 51.5,-22.5
-      parent: 2
   - uid: 14827
     components:
     - type: Transform
@@ -98403,11 +103512,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-70.5
       parent: 2
-  - uid: 18205
+  - uid: 18834
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 22.5,-32.5
+      pos: 22.5,-31.5
       parent: 2
 - proto: SteelBench
   entities:
@@ -98459,11 +103568,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-41.5
       parent: 2
-  - uid: 13721
+  - uid: 7781
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-17.5
       parent: 2
   - uid: 14342
     components:
@@ -98511,6 +103620,12 @@ entities:
       parent: 2
 - proto: StoolBar
   entities:
+  - uid: 2951
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-71.5
+      parent: 2
   - uid: 7057
     components:
     - type: Transform
@@ -98529,31 +103644,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-44.5
       parent: 2
-  - uid: 8085
+  - uid: 8166
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-63.5
+      rot: 3.141592653589793 rad
+      pos: 61.5,-71.5
       parent: 2
-  - uid: 8086
+  - uid: 10310
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-62.5
-      parent: 2
-  - uid: 8087
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-61.5
+      rot: 3.141592653589793 rad
+      pos: 59.5,-71.5
       parent: 2
 - proto: StorageCanister
   entities:
-  - uid: 3287
-    components:
-    - type: Transform
-      pos: 54.5,-69.5
-      parent: 2
   - uid: 3593
     components:
     - type: Transform
@@ -98567,12 +103671,12 @@ entities:
   - uid: 7247
     components:
     - type: Transform
-      pos: 52.5,-72.5
+      pos: 42.5,-73.5
       parent: 2
   - uid: 7249
     components:
     - type: Transform
-      pos: 52.5,-71.5
+      pos: 42.5,-72.5
       parent: 2
   - uid: 7825
     components:
@@ -98589,11 +103693,6 @@ entities:
     - type: Transform
       pos: 51.5,-74.5
       parent: 2
-  - uid: 13918
-    components:
-    - type: Transform
-      pos: 54.5,-68.5
-      parent: 2
   - uid: 14408
     components:
     - type: Transform
@@ -98601,15 +103700,15 @@ entities:
       parent: 2
 - proto: Stunbaton
   entities:
-  - uid: 15394
+  - uid: 16289
     components:
     - type: Transform
-      pos: 60.24117,-36.438633
+      pos: 72.24739,-40.467445
       parent: 2
-  - uid: 15404
+  - uid: 16290
     components:
     - type: Transform
-      pos: 60.393944,-36.61005
+      pos: 72.37239,-40.623806
       parent: 2
   - uid: 19378
     components:
@@ -98627,12 +103726,12 @@ entities:
     - type: Transform
       pos: -62.5,-65.5
       parent: 2
-  - uid: 3066
+  - uid: 3128
     components:
     - type: MetaData
-      name: Security substation
+      name: Bar & Kitchen substation
     - type: Transform
-      pos: 70.5,-38.5
+      pos: 46.5,-40.5
       parent: 2
   - uid: 4317
     components:
@@ -98676,6 +103775,13 @@ entities:
     - type: Transform
       pos: 4.5,-63.5
       parent: 2
+  - uid: 6617
+    components:
+    - type: MetaData
+      name: Security substation
+    - type: Transform
+      pos: 50.5,-28.5
+      parent: 2
   - uid: 6929
     components:
     - type: MetaData
@@ -98683,20 +103789,6 @@ entities:
     - type: Transform
       pos: 33.5,-95.5
       parent: 2
-  - uid: 7238
-    components:
-    - type: MetaData
-      name: Bar & Kitchen substation
-    - type: Transform
-      pos: 48.5,-37.5
-      parent: 2
-  - uid: 7422
-    components:
-    - type: MetaData
-      name: AI Core substation
-    - type: Transform
-      pos: 93.5,-45.5
-      parent: 2
   - uid: 8174
     components:
     - type: MetaData
@@ -98711,6 +103803,13 @@ entities:
     - type: Transform
       pos: -54.5,-23.5
       parent: 2
+  - uid: 10835
+    components:
+    - type: MetaData
+      name: AI Core substation
+    - type: Transform
+      pos: 95.5,-45.5
+      parent: 2
   - uid: 15019
     components:
     - type: MetaData
@@ -98896,10 +103995,10 @@ entities:
       parent: 2
 - proto: SuitStorageHOS
   entities:
-  - uid: 13801
+  - uid: 3446
     components:
     - type: Transform
-      pos: 70.5,-45.5
+      pos: 70.5,-51.5
       parent: 2
 - proto: SuitStorageRD
   entities:
@@ -98927,38 +104026,25 @@ entities:
       parent: 2
 - proto: SuitStorageSec
   entities:
-  - uid: 271
+  - uid: 1226
     components:
     - type: Transform
-      pos: 60.5,-59.5
+      pos: 60.5,-51.5
       parent: 2
-  - uid: 3325
+  - uid: 2219
     components:
     - type: Transform
-      pos: 61.5,-59.5
+      pos: 61.5,-51.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 7223
+  - uid: 7157
     components:
     - type: Transform
-      pos: 69.5,-33.5
+      pos: 69.5,-36.5
+      parent: 2
+  - uid: 7226
+    components:
+    - type: Transform
+      pos: 59.5,-51.5
       parent: 2
   - uid: 7227
     components:
@@ -98970,31 +104056,26 @@ entities:
     - type: Transform
       pos: 69.5,-35.5
       parent: 2
-  - uid: 13857
-    components:
-    - type: Transform
-      pos: 59.5,-59.5
-      parent: 2
 - proto: SuitStorageWarden
   entities:
-  - uid: 7273
+  - uid: 5413
     components:
     - type: Transform
-      pos: 57.5,-41.5
+      pos: 55.5,-39.5
       parent: 2
 - proto: SurveillanceCameraCommand
   entities:
-  - uid: 7438
+  - uid: 7593
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 92.5,-53.5
+      rot: 1.5707963267948966 rad
+      pos: 89.5,-46.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Outside, South
+      id: AI Core, Consoles
   - uid: 8044
     components:
     - type: Transform
@@ -99006,28 +104087,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge, Telecomms
-  - uid: 16311
+  - uid: 10828
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-44.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Upload
-  - uid: 16344
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 74.5,-45.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Upload Entrance
+      id: AI Core, Core
   - uid: 17595
     components:
     - type: Transform
@@ -99115,17 +104185,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge, Front
-  - uid: 17661
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 92.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Core
   - uid: 17676
     components:
     - type: Transform
@@ -99137,6 +104196,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Nuke Containment
+  - uid: 18385
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-49.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core, South Entrance
   - uid: 18558
     components:
     - type: Transform
@@ -99148,48 +104218,59 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge, Northwest
-  - uid: 18723
+  - uid: 18872
+    components:
+    - type: Transform
+      pos: 84.5,-41.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core, North Entrance
+  - uid: 18873
+    components:
+    - type: Transform
+      pos: 94.5,-37.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core, North Outside
+  - uid: 18874
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 82.5,-49.5
+      pos: 94.5,-53.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Entrance, South
-  - uid: 18724
-    components:
-    - type: Transform
-      pos: 82.5,-41.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Core Entrance, North
-  - uid: 18725
+      id: AI Core, South Outside
+  - uid: 18875
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 97.5,-45.5
+      pos: 99.5,-45.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Outside, East
-  - uid: 18726
+      id: AI Core, East Outside
+  - uid: 18884
     components:
     - type: Transform
-      pos: 92.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: 76.5,-44.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Outside, North
+      id: AI Upload Entrance
   - uid: 19040
     components:
     - type: Transform
@@ -99214,10 +104295,10 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Singularity Chamber, North
-  - uid: 11942
+  - uid: 12793
     components:
     - type: Transform
-      pos: 41.5,-73.5
+      pos: 44.5,-72.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
@@ -99246,6 +104327,17 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Singularity Chamber, East
+  - uid: 17419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-64.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmos Hall, Northeast
   - uid: 17628
     components:
     - type: Transform
@@ -99319,6 +104411,17 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Atmos Reception
+  - uid: 17903
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-71.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmos Hall, Southwest
   - uid: 18164
     components:
     - type: Transform
@@ -99395,6 +104498,17 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Singularity Chamber, South
+  - uid: 19609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-70.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Singularity Chamber, Entrance
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 3912
@@ -99418,17 +104532,16 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Arrivals, Medical
-  - uid: 15173
+  - uid: 10778
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-28.5
+      pos: 36.5,-24.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
       nameSet: True
-      id: Morgue Hallway
+      id: Medical/Genpop Hallway
   - uid: 16546
     components:
     - type: Transform
@@ -99493,17 +104606,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Roundabout, Southwest
-  - uid: 17646
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-18.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Virology Hallway
   - uid: 17647
     components:
     - type: Transform
@@ -99611,7 +104713,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
       nameSet: True
-      id: Security Hallway
+      id: Lawyer Hallway
   - uid: 18555
     components:
     - type: Transform
@@ -99699,16 +104801,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Library Hallway
-  - uid: 18731
-    components:
-    - type: Transform
-      pos: 21.5,-13.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Visitor Shuttle Dock
   - uid: 18741
     components:
     - type: Transform
@@ -99773,6 +104865,61 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Engineering Hallway
+  - uid: 19218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-44.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Security Hallway
+  - uid: 19243
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-18.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Medical/Virology Hallway
+  - uid: 19244
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,-11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Visitor Docks
+  - uid: 19608
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-55.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: HoP Hallway
+  - uid: 19842
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-27.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Medical/Morgue Hallway
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 17592
@@ -99828,27 +104975,6 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: CMO's Office
-  - uid: 17643
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-16.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
-      nameSet: True
-      id: Virology Workspace
-  - uid: 17644
-    components:
-    - type: Transform
-      pos: 29.5,-23.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
-      nameSet: True
-      id: Virology Waiting Room
   - uid: 18539
     components:
     - type: Transform
@@ -99870,6 +104996,49 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Medical Outpost
+  - uid: 18908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-26.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Morgue
+  - uid: 19245
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-17.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Virology Waiting Room
+  - uid: 19246
+    components:
+    - type: Transform
+      pos: 34.5,-15.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Virology Work Area
+  - uid: 19606
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Medical Bay
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 15917
@@ -99886,10 +105055,10 @@ entities:
       parent: 2
 - proto: SurveillanceCameraRouterGeneral
   entities:
-  - uid: 18007
+  - uid: 7539
     components:
     - type: Transform
-      pos: 83.5,-43.5
+      pos: 85.5,-43.5
       parent: 2
 - proto: SurveillanceCameraRouterMedical
   entities:
@@ -99907,10 +105076,10 @@ entities:
       parent: 2
 - proto: SurveillanceCameraRouterSecurity
   entities:
-  - uid: 3087
+  - uid: 7782
     components:
     - type: Transform
-      pos: 68.5,-37.5
+      pos: 52.5,-28.5
       parent: 2
 - proto: SurveillanceCameraRouterService
   entities:
@@ -99994,49 +105163,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Security Outpost
-  - uid: 7212
-    components:
-    - type: Transform
-      pos: 68.5,-35.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Mini-Armory
-  - uid: 11940
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-48.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Security Entrance
-  - uid: 13856
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Warden's Office
-  - uid: 14568
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-41.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Interrogation Room
   - uid: 14573
     components:
     - type: Transform
@@ -100048,17 +105174,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop, Exit
-  - uid: 14574
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-27.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Genpop, Lockers
   - uid: 14806
     components:
     - type: Transform
@@ -100092,28 +105207,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop, Containment Area
-  - uid: 15451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-47.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: HoS' Office
-  - uid: 15455
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-36.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Security Hall
   - uid: 15456
     components:
     - type: Transform
@@ -100125,62 +105218,126 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop Crossing
-  - uid: 15457
+  - uid: 19223
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-55.5
+      pos: 59.5,-37.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Main Armory
-  - uid: 15459
+      id: Warden's Office
+  - uid: 19224
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 57.5,-37.5
+      pos: 58.5,-48.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Locker Room
-  - uid: 16285
+      id: Armory
+  - uid: 19225
     components:
     - type: Transform
-      pos: 60.5,-32.5
+      pos: 65.5,-52.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Brigmed
-  - uid: 18293
+      id: HoS's Office
+  - uid: 19226
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 72.5,-50.5
+      pos: 73.5,-46.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Detective's Office
-- proto: SurveillanceCameraService
-  entities:
-  - uid: 7213
+  - uid: 19227
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 54.5,-54.5
+      pos: 67.5,-43.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
-      - SurveillanceCameraService
+      - SurveillanceCameraSecurity
       nameSet: True
-      id: Lawyer's Office
+      id: South Front Desk
+  - uid: 19228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 72.5,-40.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Locker Room
+  - uid: 19229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-33.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Mini-Armory
+  - uid: 19230
+    components:
+    - type: Transform
+      pos: 53.5,-34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Brigmed
+  - uid: 19231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-36.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Interrogation
+  - uid: 19232
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-27.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Genpop Locker Room
+  - uid: 19233
+    components:
+    - type: Transform
+      pos: 60.5,-29.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: North Front Desk
+- proto: SurveillanceCameraService
+  entities:
   - uid: 15171
     components:
     - type: Transform
@@ -100192,27 +105349,6 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Bartender Backroom
-  - uid: 15172
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-42.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Freezer
-  - uid: 17476
-    components:
-    - type: Transform
-      pos: -55.5,-63.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Clown & Mime Rooms
   - uid: 17596
     components:
     - type: Transform
@@ -100244,17 +105380,6 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Chapel
-  - uid: 17641
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Kitchen
   - uid: 17642
     components:
     - type: Transform
@@ -100288,6 +105413,38 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Library
+  - uid: 18887
+    components:
+    - type: Transform
+      pos: 54.5,-57.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Lawyer's Office
+  - uid: 18888
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-43.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen
+  - uid: 18890
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 73.5,-61.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Disposals
   - uid: 19042
     components:
     - type: Transform
@@ -100309,19 +105466,19 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Chaplain's Room
-- proto: SurveillanceCameraSupply
-  entities:
-  - uid: 3832
+  - uid: 19605
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-98.5
+      rot: 3.141592653589793 rad
+      pos: -58.5,-61.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
-      - SurveillanceCameraSupply
+      - SurveillanceCameraService
       nameSet: True
-      id: Cargo Dock, West
+      id: Clown & Mime Rooms
+- proto: SurveillanceCameraSupply
+  entities:
   - uid: 4688
     components:
     - type: Transform
@@ -100408,6 +105565,17 @@ entities:
       - SurveillanceCameraSupply
       nameSet: True
       id: Cargo Employee Entrance
+  - uid: 19023
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-92.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Cargo Delivery Conveyors
   - uid: 19092
     components:
     - type: Transform
@@ -100469,22 +105637,37 @@ entities:
     - type: Transform
       pos: 83.72667,-72.569664
       parent: 2
+  - uid: 19675
+    components:
+    - type: Transform
+      pos: -42.356354,-52.532303
+      parent: 2
 - proto: Syringe
   entities:
+  - uid: 4253
+    components:
+    - type: Transform
+      pos: 36.476048,-11.482354
+      parent: 2
+  - uid: 4425
+    components:
+    - type: Transform
+      pos: 36.507298,-11.763604
+      parent: 2
   - uid: 5220
     components:
     - type: Transform
-      pos: 19.309967,-24.307837
+      pos: 20.240992,-24.33725
       parent: 2
-  - uid: 15226
+  - uid: 8078
     components:
     - type: Transform
-      pos: 42.491875,-29.366682
+      pos: 68.53264,-65.37312
       parent: 2
   - uid: 15487
     components:
     - type: Transform
-      pos: 60.567352,-32.410225
+      pos: 50.556988,-34.384045
       parent: 2
   - uid: 17704
     components:
@@ -100513,20 +105696,31 @@ entities:
     - type: Transform
       pos: 21.5,-19.5
       parent: 2
-  - uid: 599
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 2
   - uid: 1152
     components:
     - type: Transform
       pos: -14.5,-61.5
       parent: 2
-  - uid: 1681
+  - uid: 1169
     components:
     - type: Transform
-      pos: 57.5,-28.5
+      pos: 29.5,-12.5
+      parent: 2
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 29.5,-13.5
+      parent: 2
+  - uid: 1802
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-19.5
+      parent: 2
+  - uid: 2294
+    components:
+    - type: Transform
+      pos: 69.5,-41.5
       parent: 2
   - uid: 2533
     components:
@@ -100548,11 +105742,22 @@ entities:
     - type: Transform
       pos: -21.5,-64.5
       parent: 2
+  - uid: 3519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-54.5
+      parent: 2
   - uid: 3534
     components:
     - type: Transform
       pos: 35.5,-45.5
       parent: 2
+  - uid: 3602
+    components:
+    - type: Transform
+      pos: 53.5,-55.5
+      parent: 2
   - uid: 3895
     components:
     - type: Transform
@@ -100573,6 +105778,16 @@ entities:
     - type: Transform
       pos: 23.5,-85.5
       parent: 2
+  - uid: 4615
+    components:
+    - type: Transform
+      pos: 21.5,-20.5
+      parent: 2
+  - uid: 4616
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 2
   - uid: 4855
     components:
     - type: Transform
@@ -100658,11 +105873,6 @@ entities:
     - type: Transform
       pos: 32.5,-41.5
       parent: 2
-  - uid: 5083
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 2
   - uid: 5116
     components:
     - type: Transform
@@ -100703,6 +105913,11 @@ entities:
     - type: Transform
       pos: -3.5,-47.5
       parent: 2
+  - uid: 5216
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
+      parent: 2
   - uid: 5218
     components:
     - type: Transform
@@ -100748,15 +105963,10 @@ entities:
     - type: Transform
       pos: 48.5,-15.5
       parent: 2
-  - uid: 5421
+  - uid: 5416
     components:
     - type: Transform
-      pos: 28.5,-17.5
-      parent: 2
-  - uid: 5422
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
+      pos: 68.5,-20.5
       parent: 2
   - uid: 5636
     components:
@@ -100803,11 +106013,6 @@ entities:
     - type: Transform
       pos: 41.5,-42.5
       parent: 2
-  - uid: 6008
-    components:
-    - type: Transform
-      pos: 27.5,-37.5
-      parent: 2
   - uid: 6464
     components:
     - type: Transform
@@ -100818,6 +106023,18 @@ entities:
     - type: Transform
       pos: 21.5,-61.5
       parent: 2
+  - uid: 6861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-99.5
+      parent: 2
+  - uid: 6862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-98.5
+      parent: 2
   - uid: 6895
     components:
     - type: Transform
@@ -100828,16 +106045,6 @@ entities:
     - type: Transform
       pos: 52.5,-98.5
       parent: 2
-  - uid: 6915
-    components:
-    - type: Transform
-      pos: 51.5,-99.5
-      parent: 2
-  - uid: 6922
-    components:
-    - type: Transform
-      pos: 51.5,-98.5
-      parent: 2
   - uid: 6991
     components:
     - type: Transform
@@ -100898,11 +106105,6 @@ entities:
     - type: Transform
       pos: 27.5,-45.5
       parent: 2
-  - uid: 7215
-    components:
-    - type: Transform
-      pos: 62.5,-40.5
-      parent: 2
   - uid: 7280
     components:
     - type: Transform
@@ -100913,6 +106115,16 @@ entities:
     - type: Transform
       pos: -24.5,-14.5
       parent: 2
+  - uid: 7308
+    components:
+    - type: Transform
+      pos: 65.5,-31.5
+      parent: 2
+  - uid: 7586
+    components:
+    - type: Transform
+      pos: 64.5,-46.5
+      parent: 2
   - uid: 7663
     components:
     - type: Transform
@@ -100928,15 +106140,23 @@ entities:
     - type: Transform
       pos: 77.5,-21.5
       parent: 2
-  - uid: 7741
+  - uid: 7739
     components:
     - type: Transform
-      pos: 65.5,-34.5
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-20.5
       parent: 2
-  - uid: 7777
+  - uid: 7779
     components:
     - type: Transform
-      pos: 28.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-29.5
+      parent: 2
+  - uid: 7879
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-62.5
       parent: 2
   - uid: 7974
     components:
@@ -100953,40 +106173,25 @@ entities:
     - type: Transform
       pos: -3.5,-22.5
       parent: 2
-  - uid: 8574
+  - uid: 9289
     components:
     - type: Transform
-      pos: 49.5,-25.5
+      pos: 65.5,-32.5
       parent: 2
-  - uid: 8682
+  - uid: 9333
     components:
     - type: Transform
-      pos: 27.5,-13.5
+      pos: 64.5,-45.5
       parent: 2
-  - uid: 10249
+  - uid: 9363
     components:
     - type: Transform
-      pos: 60.5,-32.5
+      pos: 32.5,-16.5
       parent: 2
-  - uid: 10409
+  - uid: 9459
     components:
     - type: Transform
-      pos: 49.5,-56.5
-      parent: 2
-  - uid: 10748
-    components:
-    - type: Transform
-      pos: 57.5,-32.5
-      parent: 2
-  - uid: 10784
-    components:
-    - type: Transform
-      pos: 55.5,-56.5
-      parent: 2
-  - uid: 10818
-    components:
-    - type: Transform
-      pos: 54.5,-56.5
+      pos: 20.5,-17.5
       parent: 2
   - uid: 11772
     components:
@@ -100998,31 +106203,21 @@ entities:
     - type: Transform
       pos: 13.5,-24.5
       parent: 2
+  - uid: 11938
+    components:
+    - type: Transform
+      pos: 27.5,-39.5
+      parent: 2
   - uid: 12706
     components:
     - type: Transform
       pos: -0.5,-57.5
       parent: 2
-  - uid: 13830
-    components:
-    - type: Transform
-      pos: 62.5,-32.5
-      parent: 2
   - uid: 13860
     components:
     - type: Transform
       pos: 67.5,-35.5
       parent: 2
-  - uid: 13902
-    components:
-    - type: Transform
-      pos: 62.5,-31.5
-      parent: 2
-  - uid: 14295
-    components:
-    - type: Transform
-      pos: 60.5,-39.5
-      parent: 2
   - uid: 14624
     components:
     - type: Transform
@@ -101033,21 +106228,6 @@ entities:
     - type: Transform
       pos: 16.5,-15.5
       parent: 2
-  - uid: 14922
-    components:
-    - type: Transform
-      pos: 19.5,-24.5
-      parent: 2
-  - uid: 14925
-    components:
-    - type: Transform
-      pos: 17.5,-17.5
-      parent: 2
-  - uid: 15104
-    components:
-    - type: Transform
-      pos: 49.5,-49.5
-      parent: 2
   - uid: 15128
     components:
     - type: Transform
@@ -101098,16 +106278,6 @@ entities:
     - type: Transform
       pos: 1.5,-62.5
       parent: 2
-  - uid: 17909
-    components:
-    - type: Transform
-      pos: 34.5,-11.5
-      parent: 2
-  - uid: 17910
-    components:
-    - type: Transform
-      pos: 35.5,-11.5
-      parent: 2
   - uid: 17931
     components:
     - type: Transform
@@ -101133,16 +106303,6 @@ entities:
     - type: Transform
       pos: -21.5,-66.5
       parent: 2
-  - uid: 18259
-    components:
-    - type: Transform
-      pos: 27.5,-38.5
-      parent: 2
-  - uid: 18272
-    components:
-    - type: Transform
-      pos: 66.5,-17.5
-      parent: 2
   - uid: 18318
     components:
     - type: Transform
@@ -101153,25 +106313,8 @@ entities:
     - type: Transform
       pos: 11.5,-77.5
       parent: 2
-  - uid: 19367
-    components:
-    - type: Transform
-      pos: -19.5,-49.5
-      parent: 2
 - proto: TableCarpet
   entities:
-  - uid: 4876
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-53.5
-      parent: 2
-  - uid: 6165
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-50.5
-      parent: 2
   - uid: 6722
     components:
     - type: Transform
@@ -101217,23 +106360,36 @@ entities:
     - type: Transform
       pos: 13.5,-96.5
       parent: 2
-  - uid: 7984
+  - uid: 7236
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-51.5
+      pos: 71.5,-47.5
       parent: 2
-  - uid: 17734
+  - uid: 7970
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 70.5,-51.5
+      pos: 68.5,-48.5
       parent: 2
-  - uid: 17798
+  - uid: 8575
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-52.5
+      pos: 70.5,-46.5
+      parent: 2
+  - uid: 9295
+    components:
+    - type: Transform
+      pos: 70.5,-47.5
+      parent: 2
+  - uid: 14294
+    components:
+    - type: Transform
+      pos: 27.5,-37.5
+      parent: 2
+  - uid: 15778
+    components:
+    - type: Transform
+      pos: 27.5,-38.5
       parent: 2
 - proto: TableCounterMetal
   entities:
@@ -101326,64 +106482,58 @@ entities:
       parent: 2
 - proto: TableFrame
   entities:
-  - uid: 7330
+  - uid: 3145
     components:
     - type: Transform
-      pos: 80.5,-29.5
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-67.5
       parent: 2
-  - uid: 8074
+  - uid: 3146
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-70.5
+      parent: 2
+  - uid: 3164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-70.5
+      parent: 2
+  - uid: 5312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-70.5
+      parent: 2
+  - uid: 5313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-69.5
+      parent: 2
+  - uid: 5329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-67.5
+      parent: 2
+  - uid: 7389
+    components:
+    - type: Transform
+      pos: 59.5,-76.5
+      parent: 2
+  - uid: 7722
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-70.5
+      parent: 2
+  - uid: 10313
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 72.5,-64.5
-      parent: 2
-  - uid: 8075
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-63.5
-      parent: 2
-  - uid: 8076
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-62.5
-      parent: 2
-  - uid: 8077
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-64.5
-      parent: 2
-  - uid: 8078
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-61.5
-      parent: 2
-  - uid: 8081
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-61.5
-      parent: 2
-  - uid: 8082
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-62.5
-      parent: 2
-  - uid: 8088
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-64.5
-      parent: 2
-  - uid: 11907
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 76.5,-61.5
+      pos: 59.5,-73.5
       parent: 2
   - uid: 17017
     components:
@@ -101393,6 +106543,11 @@ entities:
       parent: 2
 - proto: TableGlass
   entities:
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 50.5,-31.5
+      parent: 2
   - uid: 458
     components:
     - type: Transform
@@ -101438,6 +106593,12 @@ entities:
     - type: Transform
       pos: 12.5,-70.5
       parent: 2
+  - uid: 8412
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-34.5
+      parent: 2
   - uid: 17338
     components:
     - type: Transform
@@ -101455,6 +106616,11 @@ entities:
       parent: 2
 - proto: TablePlasmaGlass
   entities:
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 36.5,-11.5
+      parent: 2
   - uid: 2152
     components:
     - type: Transform
@@ -101485,20 +106651,20 @@ entities:
     - type: Transform
       pos: -9.5,-77.5
       parent: 2
-  - uid: 7783
+  - uid: 7172
     components:
     - type: Transform
-      pos: 27.5,-16.5
+      pos: 32.5,-12.5
       parent: 2
-  - uid: 7784
+  - uid: 7737
     components:
     - type: Transform
-      pos: 27.5,-15.5
+      pos: 36.5,-12.5
       parent: 2
-  - uid: 7793
+  - uid: 7741
     components:
     - type: Transform
-      pos: 31.5,-12.5
+      pos: 36.5,-13.5
       parent: 2
   - uid: 9111
     components:
@@ -101510,6 +106676,11 @@ entities:
     - type: Transform
       pos: -5.5,-28.5
       parent: 2
+  - uid: 9589
+    components:
+    - type: Transform
+      pos: 34.5,-13.5
+      parent: 2
   - uid: 12416
     components:
     - type: Transform
@@ -101562,6 +106733,11 @@ entities:
       parent: 2
 - proto: TableReinforced
   entities:
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 57.5,-40.5
+      parent: 2
   - uid: 736
     components:
     - type: Transform
@@ -101582,6 +106758,11 @@ entities:
     - type: Transform
       pos: 32.5,-91.5
       parent: 2
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: 68.5,-53.5
+      parent: 2
   - uid: 2331
     components:
     - type: Transform
@@ -101597,15 +106778,16 @@ entities:
     - type: Transform
       pos: -31.5,-64.5
       parent: 2
-  - uid: 3083
+  - uid: 3539
     components:
     - type: Transform
-      pos: 67.5,-48.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-51.5
       parent: 2
-  - uid: 3530
+  - uid: 3621
     components:
     - type: Transform
-      pos: 68.5,-48.5
+      pos: 58.5,-40.5
       parent: 2
   - uid: 3884
     components:
@@ -101622,6 +106804,17 @@ entities:
     - type: Transform
       pos: 31.5,-89.5
       parent: 2
+  - uid: 4187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-50.5
+      parent: 2
+  - uid: 4272
+    components:
+    - type: Transform
+      pos: 67.5,-53.5
+      parent: 2
   - uid: 4330
     components:
     - type: Transform
@@ -101647,6 +106840,11 @@ entities:
     - type: Transform
       pos: -44.5,-45.5
       parent: 2
+  - uid: 4711
+    components:
+    - type: Transform
+      pos: 66.5,-53.5
+      parent: 2
   - uid: 4856
     components:
     - type: Transform
@@ -101657,6 +106855,11 @@ entities:
     - type: Transform
       pos: 6.5,-49.5
       parent: 2
+  - uid: 4875
+    components:
+    - type: Transform
+      pos: 57.5,-35.5
+      parent: 2
   - uid: 5348
     components:
     - type: Transform
@@ -101727,6 +106930,11 @@ entities:
     - type: Transform
       pos: -56.5,-61.5
       parent: 2
+  - uid: 6088
+    components:
+    - type: Transform
+      pos: 56.5,-39.5
+      parent: 2
   - uid: 6150
     components:
     - type: Transform
@@ -101837,20 +107045,32 @@ entities:
     - type: Transform
       pos: 12.5,-98.5
       parent: 2
+  - uid: 7212
+    components:
+    - type: Transform
+      pos: 57.5,-28.5
+      parent: 2
+  - uid: 7266
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
   - uid: 7299
     components:
     - type: Transform
       pos: -56.5,-28.5
       parent: 2
-  - uid: 7658
+  - uid: 7591
     components:
     - type: Transform
-      pos: 77.5,-47.5
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-43.5
       parent: 2
-  - uid: 8167
+  - uid: 7592
     components:
     - type: Transform
-      pos: 77.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 79.5,-43.5
       parent: 2
   - uid: 8959
     components:
@@ -101862,11 +107082,26 @@ entities:
     - type: Transform
       pos: 23.5,-89.5
       parent: 2
+  - uid: 9221
+    components:
+    - type: Transform
+      pos: 57.5,-27.5
+      parent: 2
   - uid: 9445
     components:
     - type: Transform
       pos: -48.5,-45.5
       parent: 2
+  - uid: 9889
+    components:
+    - type: Transform
+      pos: 63.5,-42.5
+      parent: 2
+  - uid: 9890
+    components:
+    - type: Transform
+      pos: 63.5,-43.5
+      parent: 2
   - uid: 10101
     components:
     - type: Transform
@@ -101877,70 +107112,32 @@ entities:
     - type: Transform
       pos: -47.5,-45.5
       parent: 2
-  - uid: 10245
-    components:
-    - type: Transform
-      pos: 57.5,-46.5
-      parent: 2
-  - uid: 10798
-    components:
-    - type: Transform
-      pos: 67.5,-45.5
-      parent: 2
-  - uid: 10815
-    components:
-    - type: Transform
-      pos: 67.5,-46.5
-      parent: 2
   - uid: 12145
     components:
     - type: Transform
       pos: 15.5,-61.5
       parent: 2
-  - uid: 13859
+  - uid: 12944
     components:
     - type: Transform
-      pos: 76.5,-47.5
+      pos: 51.5,-37.5
       parent: 2
-  - uid: 15477
+  - uid: 14918
     components:
     - type: Transform
-      pos: 61.5,-42.5
+      pos: 50.5,-37.5
       parent: 2
-  - uid: 15479
+  - uid: 15172
     components:
     - type: Transform
-      pos: 61.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 79.5,-47.5
       parent: 2
-  - uid: 15480
+  - uid: 15174
     components:
     - type: Transform
-      pos: 58.5,-47.5
-      parent: 2
-  - uid: 15481
-    components:
-    - type: Transform
-      pos: 59.5,-47.5
-      parent: 2
-  - uid: 15484
-    components:
-    - type: Transform
-      pos: 60.5,-47.5
-      parent: 2
-  - uid: 17264
-    components:
-    - type: Transform
-      pos: 76.5,-43.5
-      parent: 2
-  - uid: 17269
-    components:
-    - type: Transform
-      pos: 72.5,-42.5
-      parent: 2
-  - uid: 17270
-    components:
-    - type: Transform
-      pos: 71.5,-42.5
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-47.5
       parent: 2
   - uid: 17271
     components:
@@ -101952,6 +107149,12 @@ entities:
     - type: Transform
       pos: -56.5,-29.5
       parent: 2
+  - uid: 17476
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-40.5
+      parent: 2
   - uid: 17662
     components:
     - type: Transform
@@ -101994,25 +107197,27 @@ entities:
       parent: 2
 - proto: TableReinforcedGlass
   entities:
-  - uid: 591
+  - uid: 297
     components:
     - type: Transform
-      pos: 27.5,-27.5
+      pos: 29.5,-30.5
       parent: 2
-  - uid: 1561
+  - uid: 1809
     components:
     - type: Transform
-      pos: 29.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-36.5
       parent: 2
   - uid: 2387
     components:
     - type: Transform
       pos: 27.5,-28.5
       parent: 2
-  - uid: 7037
+  - uid: 8101
     components:
     - type: Transform
-      pos: 48.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: 27.5,-29.5
       parent: 2
 - proto: TableWood
   entities:
@@ -102028,17 +107233,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 36.5,-51.5
       parent: 2
-  - uid: 3524
+  - uid: 3456
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-54.5
+      pos: 55.5,-56.5
       parent: 2
-  - uid: 4178
+  - uid: 4352
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-54.5
+      pos: -42.5,-62.5
       parent: 2
   - uid: 5099
     components:
@@ -102070,11 +107273,6 @@ entities:
     - type: Transform
       pos: -45.5,-55.5
       parent: 2
-  - uid: 5673
-    components:
-    - type: Transform
-      pos: -19.5,-47.5
-      parent: 2
   - uid: 5674
     components:
     - type: Transform
@@ -102090,11 +107288,6 @@ entities:
     - type: Transform
       pos: -44.5,-61.5
       parent: 2
-  - uid: 5881
-    components:
-    - type: Transform
-      pos: -40.5,-61.5
-      parent: 2
   - uid: 5882
     components:
     - type: Transform
@@ -102137,16 +107330,26 @@ entities:
     - type: Transform
       pos: 33.5,-50.5
       parent: 2
-  - uid: 18167
+  - uid: 7111
     components:
     - type: Transform
-      pos: 72.5,-52.5
+      pos: 56.5,-56.5
+      parent: 2
+  - uid: 9296
+    components:
+    - type: Transform
+      pos: 73.5,-48.5
       parent: 2
   - uid: 19249
     components:
     - type: Transform
       pos: -21.5,-46.5
       parent: 2
+  - uid: 19674
+    components:
+    - type: Transform
+      pos: -42.5,-52.5
+      parent: 2
 - proto: TableXeno
   entities:
   - uid: 486
@@ -102154,16 +107357,16 @@ entities:
     - type: Transform
       pos: -6.5,-18.5
       parent: 2
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 42.5,-34.5
+      parent: 2
   - uid: 3438
     components:
     - type: Transform
       pos: -25.5,-32.5
       parent: 2
-  - uid: 4190
-    components:
-    - type: Transform
-      pos: 53.5,-47.5
-      parent: 2
   - uid: 5082
     components:
     - type: Transform
@@ -102174,40 +107377,68 @@ entities:
     - type: Transform
       pos: -10.5,-21.5
       parent: 2
+  - uid: 5101
+    components:
+    - type: Transform
+      pos: 72.5,-67.5
+      parent: 2
+  - uid: 5426
+    components:
+    - type: Transform
+      pos: 66.5,-63.5
+      parent: 2
+  - uid: 6129
+    components:
+    - type: Transform
+      pos: 67.5,-62.5
+      parent: 2
   - uid: 6702
     components:
     - type: Transform
       pos: -15.5,-18.5
       parent: 2
-  - uid: 7140
-    components:
-    - type: Transform
-      pos: 53.5,-29.5
-      parent: 2
-  - uid: 7292
-    components:
-    - type: Transform
-      pos: 53.5,-30.5
-      parent: 2
-  - uid: 7428
-    components:
-    - type: Transform
-      pos: 46.5,-74.5
-      parent: 2
   - uid: 7429
     components:
     - type: Transform
       pos: 45.5,-75.5
       parent: 2
+  - uid: 7543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-54.5
+      parent: 2
+  - uid: 7545
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-53.5
+      parent: 2
+  - uid: 7930
+    components:
+    - type: Transform
+      pos: 68.5,-63.5
+      parent: 2
   - uid: 7989
     components:
     - type: Transform
       pos: 56.5,-77.5
       parent: 2
-  - uid: 8347
+  - uid: 8076
     components:
     - type: Transform
-      pos: 61.5,-62.5
+      pos: 68.5,-62.5
+      parent: 2
+  - uid: 8450
+    components:
+    - type: Transform
+      pos: 68.5,-65.5
+      parent: 2
+  - uid: 8452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-66.5
       parent: 2
   - uid: 8833
     components:
@@ -102224,6 +107455,22 @@ entities:
     - type: Transform
       pos: 53.5,-77.5
       parent: 2
+  - uid: 10666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 40.5,-25.5
+      parent: 2
+  - uid: 10701
+    components:
+    - type: Transform
+      pos: 66.5,-62.5
+      parent: 2
+  - uid: 11129
+    components:
+    - type: Transform
+      pos: -42.5,-79.5
+      parent: 2
   - uid: 11398
     components:
     - type: Transform
@@ -102234,26 +107481,11 @@ entities:
     - type: Transform
       pos: -23.5,-39.5
       parent: 2
-  - uid: 12886
-    components:
-    - type: Transform
-      pos: 62.5,-62.5
-      parent: 2
   - uid: 13338
     components:
     - type: Transform
       pos: -24.5,-39.5
       parent: 2
-  - uid: 13906
-    components:
-    - type: Transform
-      pos: 60.5,-62.5
-      parent: 2
-  - uid: 13907
-    components:
-    - type: Transform
-      pos: 58.5,-71.5
-      parent: 2
   - uid: 13997
     components:
     - type: Transform
@@ -102294,11 +107526,6 @@ entities:
     - type: Transform
       pos: -33.5,-25.5
       parent: 2
-  - uid: 14070
-    components:
-    - type: Transform
-      pos: 66.5,-69.5
-      parent: 2
   - uid: 14119
     components:
     - type: Transform
@@ -102309,11 +107536,54 @@ entities:
     - type: Transform
       pos: -43.5,-23.5
       parent: 2
+  - uid: 14792
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-75.5
+      parent: 2
+  - uid: 14926
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-34.5
+      parent: 2
   - uid: 15115
     components:
     - type: Transform
       pos: -42.5,-23.5
       parent: 2
+  - uid: 15169
+    components:
+    - type: Transform
+      pos: 62.5,-65.5
+      parent: 2
+  - uid: 15429
+    components:
+    - type: Transform
+      pos: 80.5,-64.5
+      parent: 2
+  - uid: 15455
+    components:
+    - type: Transform
+      pos: 66.5,-68.5
+      parent: 2
+  - uid: 15479
+    components:
+    - type: Transform
+      pos: 62.5,-57.5
+      parent: 2
+  - uid: 15480
+    components:
+    - type: Transform
+      pos: 61.5,-57.5
+      parent: 2
+  - uid: 15486
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-68.5
+      parent: 2
   - uid: 16138
     components:
     - type: Transform
@@ -102334,31 +107604,11 @@ entities:
     - type: Transform
       pos: -32.5,-29.5
       parent: 2
-  - uid: 16431
-    components:
-    - type: Transform
-      pos: 33.5,-15.5
-      parent: 2
-  - uid: 16432
-    components:
-    - type: Transform
-      pos: 33.5,-16.5
-      parent: 2
-  - uid: 16433
-    components:
-    - type: Transform
-      pos: 35.5,-18.5
-      parent: 2
   - uid: 16435
     components:
     - type: Transform
       pos: -25.5,-39.5
       parent: 2
-  - uid: 16437
-    components:
-    - type: Transform
-      pos: 33.5,-17.5
-      parent: 2
   - uid: 16438
     components:
     - type: Transform
@@ -102384,51 +107634,31 @@ entities:
     - type: Transform
       pos: -11.5,-18.5
       parent: 2
-  - uid: 16608
+  - uid: 16598
     components:
     - type: Transform
-      pos: 75.5,-56.5
-      parent: 2
-  - uid: 16609
-    components:
-    - type: Transform
-      pos: 75.5,-55.5
+      pos: -40.5,-80.5
       parent: 2
   - uid: 17088
     components:
     - type: Transform
       pos: 9.5,-44.5
       parent: 2
-  - uid: 17140
-    components:
-    - type: Transform
-      pos: 40.5,-30.5
-      parent: 2
-  - uid: 17141
-    components:
-    - type: Transform
-      pos: 37.5,-29.5
-      parent: 2
-  - uid: 17142
-    components:
-    - type: Transform
-      pos: 41.5,-30.5
-      parent: 2
   - uid: 17143
     components:
     - type: Transform
       pos: 11.5,-44.5
       parent: 2
-  - uid: 17375
-    components:
-    - type: Transform
-      pos: 37.5,-28.5
-      parent: 2
   - uid: 17482
     components:
     - type: Transform
       pos: 10.5,-44.5
       parent: 2
+  - uid: 17572
+    components:
+    - type: Transform
+      pos: -37.5,-76.5
+      parent: 2
   - uid: 17603
     components:
     - type: Transform
@@ -102514,80 +107744,52 @@ entities:
     - type: Transform
       pos: -52.5,-39.5
       parent: 2
-  - uid: 18520
-    components:
-    - type: Transform
-      pos: 42.5,-30.5
-      parent: 2
-  - uid: 18521
-    components:
-    - type: Transform
-      pos: 42.5,-29.5
-      parent: 2
   - uid: 19206
     components:
     - type: Transform
       pos: -9.5,-26.5
       parent: 2
-  - uid: 19223
-    components:
-    - type: Transform
-      pos: 48.5,-29.5
-      parent: 2
-- proto: TargetStrange
-  entities:
-  - uid: 17572
-    components:
-    - type: Transform
-      pos: -39.5,-75.5
-      parent: 2
-- proto: TegCenter
-  entities:
-  - uid: 11944
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-70.5
-      parent: 2
-- proto: TegCirculator
-  entities:
-  - uid: 9210
-    components:
-    - type: Transform
-      pos: 41.5,-70.5
-      parent: 2
-    - type: PointLight
-      color: '#FF3300FF'
-  - uid: 15414
+  - uid: 19496
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 39.5,-70.5
+      pos: 46.5,-75.5
+      parent: 2
+- proto: TargetStrange
+  entities:
+  - uid: 8806
+    components:
+    - type: Transform
+      pos: -35.5,-80.5
+      parent: 2
+- proto: TegCenter
+  entities:
+  - uid: 10663
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-69.5
+      parent: 2
+- proto: TegCirculator
+  entities:
+  - uid: 14383
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-68.5
+      parent: 2
+    - type: PointLight
+      color: '#FF3300FF'
+  - uid: 15542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-70.5
       parent: 2
     - type: PointLight
       color: '#FF3300FF'
 - proto: TelecomServer
   entities:
-  - uid: 5607
-    components:
-    - type: Transform
-      pos: -45.5,-38.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 16387
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 6591
     components:
     - type: Transform
@@ -102655,12 +107857,19 @@ entities:
     - type: Transform
       pos: 27.421175,-62.3844
       parent: 2
-- proto: TelecomServerFilledCommon
+- proto: TelecomServerFilledCommand
   entities:
-  - uid: 5791
+  - uid: 15384
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      pos: -45.5,-38.5
+      parent: 2
+- proto: TelecomServerFilledCommon
+  entities:
+  - uid: 15163
+    components:
+    - type: Transform
+      pos: 85.5,-47.5
       parent: 2
 - proto: TelecomServerFilledEngineering
   entities:
@@ -102678,42 +107887,48 @@ entities:
       parent: 2
 - proto: TelecomServerFilledSecurity
   entities:
-  - uid: 3072
+  - uid: 8865
     components:
     - type: Transform
-      pos: 67.5,-37.5
+      pos: 53.5,-28.5
       parent: 2
 - proto: TeslaCoil
   entities:
-  - uid: 18568
+  - uid: 17287
     components:
     - type: Transform
-      pos: -25.5,-83.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-83.5
       parent: 2
-  - uid: 18569
+  - uid: 19776
     components:
     - type: Transform
-      pos: -25.5,-81.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-82.5
       parent: 2
-  - uid: 18570
+  - uid: 19777
     components:
     - type: Transform
-      pos: -25.5,-79.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-80.5
       parent: 2
-  - uid: 18571
+  - uid: 19778
     components:
     - type: Transform
-      pos: -21.5,-79.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-79.5
       parent: 2
-  - uid: 18572
+  - uid: 19779
     components:
     - type: Transform
-      pos: -21.5,-81.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-80.5
       parent: 2
-  - uid: 18573
+  - uid: 19780
     components:
     - type: Transform
-      pos: -21.5,-83.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-82.5
       parent: 2
 - proto: TeslaGenerator
   entities:
@@ -102724,25 +107939,29 @@ entities:
       parent: 2
 - proto: TeslaGroundingRod
   entities:
-  - uid: 18487
+  - uid: 18569
     components:
     - type: Transform
-      pos: -23.5,-83.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-79.5
+      parent: 2
+  - uid: 18570
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-83.5
+      parent: 2
+  - uid: 18572
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-80.5
       parent: 2
   - uid: 18574
     components:
     - type: Transform
-      pos: -26.5,-81.5
-      parent: 2
-  - uid: 18575
-    components:
-    - type: Transform
-      pos: -23.5,-79.5
-      parent: 2
-  - uid: 18576
-    components:
-    - type: Transform
-      pos: -20.5,-81.5
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-82.5
       parent: 2
 - proto: Thruster
   entities:
@@ -102784,15 +108003,10 @@ entities:
       parent: 2
 - proto: TintedWindow
   entities:
-  - uid: 1451
+  - uid: 8176
     components:
     - type: Transform
-      pos: 69.5,-43.5
-      parent: 2
-  - uid: 10311
-    components:
-    - type: Transform
-      pos: 69.5,-41.5
+      pos: 51.5,-35.5
       parent: 2
 - proto: ToiletEmpty
   entities:
@@ -102807,27 +108021,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,-19.5
       parent: 2
-  - uid: 17884
-    components:
-    - type: Transform
-      pos: 36.5,-11.5
-      parent: 2
-    - type: DisposalUnit
-      nextFlush: 0
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        disposals: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 17885
-          - 17886
-          - 17893
-          - 17907
 - proto: ToiletGoldenDirtyWater
   entities:
   - uid: 16100
@@ -102845,10 +108038,15 @@ entities:
   - uid: 19370
     components:
     - type: Transform
-      pos: -19.419056,-49.5568
+      pos: -22.592426,-51.68456
       parent: 2
 - proto: ToolboxElectricalFilled
   entities:
+  - uid: 5425
+    components:
+    - type: Transform
+      pos: -37.51767,-76.217834
+      parent: 2
   - uid: 5581
     components:
     - type: Transform
@@ -102874,10 +108072,10 @@ entities:
     - type: Transform
       pos: 71.665375,-19.465302
       parent: 2
-  - uid: 17605
+  - uid: 15481
     components:
     - type: Transform
-      pos: 33.437138,-16.527544
+      pos: 62.51025,-57.18848
       parent: 2
   - uid: 17751
     components:
@@ -102901,18 +108099,13 @@ entities:
   - uid: 5738
     components:
     - type: Transform
-      pos: -19.65343,-49.29099
+      pos: -22.350601,-49.183464
       parent: 2
   - uid: 17023
     components:
     - type: Transform
       pos: -46.50093,-12.413582
       parent: 2
-  - uid: 17882
-    components:
-    - type: Transform
-      pos: 35.76561,-18.532131
-      parent: 2
   - uid: 19298
     components:
     - type: Transform
@@ -102935,12 +108128,12 @@ entities:
   - uid: 5642
     components:
     - type: Transform
-      pos: -22.663105,-51.29238
+      pos: -22.536871,-51.17958
       parent: 2
   - uid: 5643
     components:
     - type: Transform
-      pos: -22.350605,-51.495647
+      pos: -22.379463,-51.43902
       parent: 2
   - uid: 5912
     components:
@@ -102960,12 +108153,12 @@ entities:
   - uid: 7744
     components:
     - type: Transform
-      pos: 61.491913,-43.517254
+      pos: 58.46033,-35.476738
       parent: 2
-  - uid: 8133
+  - uid: 15482
     components:
     - type: Transform
-      pos: 53.37742,-30.043339
+      pos: 62.040775,-57.438656
       parent: 2
   - uid: 17842
     components:
@@ -102977,21 +108170,21 @@ entities:
   - uid: 5380
     components:
     - type: Transform
-      pos: 44.5,-73.5
+      pos: 45.350067,-73.39173
       parent: 2
 - proto: TorsoSkeleton
   entities:
   - uid: 7331
     components:
     - type: Transform
-      pos: 79.86608,-26.933979
+      pos: 78.98892,-25.47695
       parent: 2
 - proto: Tourniquet
   entities:
-  - uid: 6014
+  - uid: 10855
     components:
     - type: Transform
-      pos: 42.60125,-28.663069
+      pos: 68.40143,-66.52006
       parent: 2
 - proto: ToyAi
   entities:
@@ -103019,7 +108212,14 @@ entities:
   - uid: 19391
     components:
     - type: Transform
-      pos: -21.504704,-26.468311
+      pos: -18.517744,-31.41124
+      parent: 2
+- proto: ToyFigurineFootsoldier
+  entities:
+  - uid: 16126
+    components:
+    - type: Transform
+      pos: 49.49876,-16.490688
       parent: 2
 - proto: ToyFigurineQueen
   entities:
@@ -103052,7 +108252,7 @@ entities:
   - uid: 6983
     components:
     - type: Transform
-      pos: 51.993618,-98.8094
+      pos: 52.988304,-98.97241
       parent: 2
 - proto: ToyFigurineScientist
   entities:
@@ -103083,7 +108283,7 @@ entities:
   - uid: 18018
     components:
     - type: Transform
-      pos: 15.489809,-60.14317
+      pos: 15.464093,-63.08658
       parent: 2
 - proto: ToyNuke
   entities:
@@ -103099,33 +108299,41 @@ entities:
     - type: Transform
       pos: 12.313462,-94.44978
       parent: 2
+- proto: ToyRubberDuck
+  entities:
+  - uid: 561
+    components:
+    - type: Transform
+      parent: 2004
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ToySword
   entities:
   - uid: 19047
     components:
     - type: Transform
-      pos: 64.42656,-70.317154
+      pos: 69.52158,-59.52405
       parent: 2
   - uid: 19048
     components:
     - type: Transform
-      pos: 64.58922,-70.48394
+      pos: 69.46603,-59.459236
       parent: 2
 - proto: TrashBag
   entities:
-  - uid: 7197
+  - uid: 11867
     components:
     - type: Transform
-      pos: 58.57782,-71.42502
+      pos: 72.64958,-67.37068
       parent: 2
 - proto: TrashBakedBananaPeel
   entities:
-  - uid: 14733
+  - uid: 4304
     components:
     - type: Transform
-      pos: 60.409534,-66.50437
+      pos: 74.54851,-61.465183
       parent: 2
-    - type: Conveyed
 - proto: TrashBananaPeel
   entities:
   - uid: 5987
@@ -103140,10 +108348,12 @@ entities:
     - type: Transform
       pos: -20.55822,-65.533104
       parent: 2
-  - uid: 18522
+- proto: TubaInstrument
+  entities:
+  - uid: 19532
     components:
     - type: Transform
-      pos: 45.307762,-48.38038
+      pos: 29.5,-38.5
       parent: 2
 - proto: Turnstile
   entities:
@@ -103193,188 +108403,209 @@ entities:
       parent: 2
 - proto: TwoWayLever
   entities:
-  - uid: 3622
+  - uid: 5083
     components:
     - type: Transform
-      pos: 61.5,-67.5
+      pos: 76.5,-63.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7704:
+        8075:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8801:
+        8822:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        16537:
+        9301:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8804:
+        9305:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        9314:
+        8077:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-  - uid: 3623
+        10332:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
+  - uid: 5089
     components:
     - type: Transform
-      pos: 60.5,-71.5
+      pos: 74.5,-67.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7143:
+        10278:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8219:
+        10301:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7706:
+        10306:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        6127:
+        2883:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7728:
+        11899:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7727:
+        7571:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7142:
+        11460:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        6128:
+        7408:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7141:
+        3314:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        6129:
+        11690:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7139:
+        11903:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7137:
+        10704:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7136:
+        10703:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8580:
+        5374:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7133:
+        6412:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7132:
+        6403:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        3387:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        7730:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        7185:
+        11883:
         - - Left
           - Open
         - - Right
           - Open
         - - Middle
           - Close
+  - uid: 6910
+    components:
+    - type: Transform
+      pos: 52.5,-96.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6868:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
+        11474:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
+        6918:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
   - uid: 18264
     components:
     - type: Transform
@@ -103411,17 +108642,13 @@ entities:
           - AutoClose
         - - Right
           - AutoClose
-  - uid: 18765
-    components:
-    - type: Transform
-      pos: 51.5,-97.5
-      parent: 2
 - proto: UnfinishedMachineFrame
   entities:
-  - uid: 17877
+  - uid: 8057
     components:
     - type: Transform
-      pos: 33.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: -36.5,-79.5
       parent: 2
 - proto: UniformPrinter
   entities:
@@ -103444,105 +108671,12 @@ entities:
     - type: Transform
       pos: 9.660529,-25.157125
       parent: 2
-- proto: UniformScrubsColorGreen
-  entities:
-  - uid: 17552
-    components:
-    - type: Transform
-      pos: -40.413795,-61.538876
-      parent: 2
-- proto: UraniumWindow
-  entities:
-  - uid: 6902
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-42.5
-      parent: 2
-  - uid: 11403
-    components:
-    - type: Transform
-      pos: 16.5,-40.5
-      parent: 2
-  - uid: 13274
-    components:
-    - type: Transform
-      pos: 15.5,-41.5
-      parent: 2
-  - uid: 14005
-    components:
-    - type: Transform
-      pos: 15.5,-43.5
-      parent: 2
-  - uid: 14024
-    components:
-    - type: Transform
-      pos: 17.5,-40.5
-      parent: 2
-  - uid: 14029
-    components:
-    - type: Transform
-      pos: 16.5,-44.5
-      parent: 2
-  - uid: 14034
-    components:
-    - type: Transform
-      pos: 17.5,-44.5
-      parent: 2
-  - uid: 14035
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-41.5
-      parent: 2
-  - uid: 14053
-    components:
-    - type: Transform
-      pos: 18.5,-44.5
-      parent: 2
-  - uid: 16875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-43.5
-      parent: 2
-  - uid: 17173
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-40.5
-      parent: 2
-- proto: UraniumWindowDiagonal
-  entities:
-  - uid: 14429
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-44.5
-      parent: 2
-  - uid: 14435
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-44.5
-      parent: 2
-  - uid: 14436
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,-40.5
-      parent: 2
-  - uid: 14437
-    components:
-    - type: Transform
-      pos: 15.5,-40.5
-      parent: 2
 - proto: Vaccinator
   entities:
-  - uid: 7778
+  - uid: 255
     components:
     - type: Transform
-      pos: 31.5,-16.5
+      pos: 34.5,-11.5
       parent: 2
 - proto: VendingBarDrobe
   entities:
@@ -103565,10 +108699,10 @@ entities:
     - type: Transform
       pos: 38.5,-46.5
       parent: 2
-  - uid: 5813
+  - uid: 7704
     components:
     - type: Transform
-      pos: 69.5,-63.5
+      pos: 59.5,-67.5
       parent: 2
 - proto: VendingMachineCargoDrobe
   entities:
@@ -103605,10 +108739,10 @@ entities:
     - type: Transform
       pos: 44.5,-46.5
       parent: 2
-  - uid: 7039
+  - uid: 8140
     components:
     - type: Transform
-      pos: 46.5,-40.5
+      pos: 40.5,-38.5
       parent: 2
 - proto: VendingMachineChemDrobe
   entities:
@@ -103626,10 +108760,10 @@ entities:
       parent: 2
 - proto: VendingMachineCigs
   entities:
-  - uid: 3523
+  - uid: 3650
     components:
     - type: Transform
-      pos: 55.5,-48.5
+      pos: 64.5,-51.5
       parent: 2
   - uid: 4270
     components:
@@ -103646,11 +108780,6 @@ entities:
     - type: Transform
       pos: 34.5,-46.5
       parent: 2
-  - uid: 16050
-    components:
-    - type: Transform
-      pos: 65.5,-46.5
-      parent: 2
   - uid: 17443
     components:
     - type: Transform
@@ -103697,24 +108826,24 @@ entities:
       parent: 2
 - proto: VendingMachineDetDrobe
   entities:
-  - uid: 7122
+  - uid: 8048
     components:
     - type: Transform
-      pos: 68.5,-53.5
+      pos: 71.5,-49.5
       parent: 2
 - proto: VendingMachineDinnerware
   entities:
-  - uid: 7028
+  - uid: 19170
     components:
     - type: Transform
-      pos: 42.5,-47.5
+      pos: 44.5,-45.5
       parent: 2
 - proto: VendingMachineDonut
   entities:
-  - uid: 12832
+  - uid: 8610
     components:
     - type: Transform
-      pos: 68.5,-40.5
+      pos: 60.5,-31.5
       parent: 2
 - proto: VendingMachineEngiDrobe
   entities:
@@ -103749,10 +108878,10 @@ entities:
       parent: 2
 - proto: VendingMachineHappyHonk
   entities:
-  - uid: 14282
+  - uid: 8047
     components:
     - type: Transform
-      pos: 50.5,-46.5
+      pos: 46.5,-49.5
       parent: 2
 - proto: VendingMachineHydrobe
   entities:
@@ -103819,10 +108948,10 @@ entities:
       parent: 2
 - proto: VendingMachineSalvage
   entities:
-  - uid: 6924
+  - uid: 6893
     components:
     - type: Transform
-      pos: 53.5,-101.5
+      pos: 54.5,-101.5
       parent: 2
 - proto: VendingMachineSciDrobe
   entities:
@@ -103833,22 +108962,22 @@ entities:
       parent: 2
 - proto: VendingMachineSec
   entities:
-  - uid: 7269
+  - uid: 10049
     components:
     - type: Transform
-      pos: 60.5,-34.5
+      pos: 73.5,-41.5
       parent: 2
-  - uid: 10258
+  - uid: 10059
     components:
     - type: Transform
-      pos: 60.5,-35.5
+      pos: 73.5,-42.5
       parent: 2
 - proto: VendingMachineSecDrobe
   entities:
-  - uid: 10749
+  - uid: 10042
     components:
     - type: Transform
-      pos: 57.5,-35.5
+      pos: 70.5,-42.5
       parent: 2
 - proto: VendingMachineSeeds
   entities:
@@ -103871,11 +109000,6 @@ entities:
     - type: Transform
       pos: 8.5,-92.5
       parent: 2
-  - uid: 13877
-    components:
-    - type: Transform
-      pos: 57.5,-26.5
-      parent: 2
 - proto: VendingMachineSovietSoda
   entities:
   - uid: 8218
@@ -103888,6 +109012,11 @@ entities:
     - type: Transform
       pos: 43.5,-75.5
       parent: 2
+  - uid: 15461
+    components:
+    - type: Transform
+      pos: 68.5,-57.5
+      parent: 2
   - uid: 17095
     components:
     - type: Transform
@@ -103948,12 +109077,10 @@ entities:
     - type: Transform
       pos: -8.5,-28.5
       parent: 2
-- proto: VendingMachineViroDrobe
-  entities:
-  - uid: 7781
+  - uid: 17242
     components:
     - type: Transform
-      pos: 31.5,-18.5
+      pos: -20.5,-49.5
       parent: 2
 - proto: VendingMachineWallMedical
   entities:
@@ -103981,7 +109108,7 @@ entities:
     - type: Transform
       pos: 17.5,-48.5
       parent: 2
-  - uid: 17419
+  - uid: 17552
     components:
     - type: Transform
       pos: 15.5,-25.5
@@ -104025,21 +109152,28 @@ entities:
     - type: Transform
       pos: -15.5,-63.5
       parent: 2
-  - uid: 208
+  - uid: 206
     components:
     - type: Transform
-      pos: 66.5,-49.5
-      parent: 2
-  - uid: 209
-    components:
-    - type: Transform
-      pos: 69.5,-40.5
+      pos: 72.5,-52.5
       parent: 2
   - uid: 246
     components:
     - type: Transform
       pos: -1.5,-12.5
       parent: 2
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-39.5
+      parent: 2
+  - uid: 275
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-32.5
+      parent: 2
   - uid: 334
     components:
     - type: Transform
@@ -104260,6 +109394,16 @@ entities:
     - type: Transform
       pos: 13.5,-68.5
       parent: 2
+  - uid: 1062
+    components:
+    - type: Transform
+      pos: 73.5,-43.5
+      parent: 2
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 60.5,-37.5
+      parent: 2
   - uid: 1162
     components:
     - type: Transform
@@ -104270,21 +109414,11 @@ entities:
     - type: Transform
       pos: -1.5,-15.5
       parent: 2
-  - uid: 1211
-    components:
-    - type: Transform
-      pos: 61.5,-34.5
-      parent: 2
   - uid: 1221
     components:
     - type: Transform
       pos: 11.5,-70.5
       parent: 2
-  - uid: 1426
-    components:
-    - type: Transform
-      pos: 61.5,-33.5
-      parent: 2
   - uid: 1712
     components:
     - type: Transform
@@ -104305,10 +109439,16 @@ entities:
     - type: Transform
       pos: 9.5,-85.5
       parent: 2
-  - uid: 2164
+  - uid: 2230
     components:
     - type: Transform
-      pos: 64.5,-48.5
+      pos: 58.5,-51.5
+      parent: 2
+  - uid: 2279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-52.5
       parent: 2
   - uid: 2328
     components:
@@ -104475,11 +109615,6 @@ entities:
     - type: Transform
       pos: 13.5,-90.5
       parent: 2
-  - uid: 2645
-    components:
-    - type: Transform
-      pos: 57.5,-30.5
-      parent: 2
   - uid: 2650
     components:
     - type: Transform
@@ -104875,40 +110010,141 @@ entities:
     - type: Transform
       pos: 36.5,-95.5
       parent: 2
+  - uid: 3021
+    components:
+    - type: Transform
+      pos: 72.5,-43.5
+      parent: 2
   - uid: 3047
     components:
     - type: Transform
       pos: 22.5,-100.5
       parent: 2
+  - uid: 3066
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-52.5
+      parent: 2
+  - uid: 3094
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-51.5
+      parent: 2
+  - uid: 3101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-49.5
+      parent: 2
   - uid: 3174
     components:
     - type: Transform
       pos: 11.5,-69.5
       parent: 2
-  - uid: 3311
+  - uid: 3217
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-45.5
       parent: 2
-  - uid: 3319
+  - uid: 3287
     components:
     - type: Transform
-      pos: 63.5,-55.5
-      parent: 2
-  - uid: 3324
-    components:
-    - type: Transform
-      pos: 63.5,-56.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-47.5
       parent: 2
   - uid: 3349
     components:
     - type: Transform
-      pos: 58.5,-60.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-46.5
+      parent: 2
+  - uid: 3396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-51.5
+      parent: 2
+  - uid: 3400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-45.5
+      parent: 2
+  - uid: 3451
+    components:
+    - type: Transform
+      pos: 69.5,-43.5
+      parent: 2
+  - uid: 3452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-45.5
+      parent: 2
+  - uid: 3462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-37.5
+      parent: 2
+  - uid: 3470
+    components:
+    - type: Transform
+      pos: 66.5,-54.5
+      parent: 2
+  - uid: 3543
+    components:
+    - type: Transform
+      pos: 57.5,-29.5
+      parent: 2
+  - uid: 3545
+    components:
+    - type: Transform
+      pos: 69.5,-42.5
+      parent: 2
+  - uid: 3573
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-40.5
+      parent: 2
+  - uid: 3574
+    components:
+    - type: Transform
+      pos: 72.5,-50.5
+      parent: 2
+  - uid: 3580
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-41.5
+      parent: 2
+  - uid: 3583
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-50.5
       parent: 2
   - uid: 3584
     components:
     - type: Transform
-      pos: 62.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-50.5
+      parent: 2
+  - uid: 3651
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-50.5
+      parent: 2
+  - uid: 3668
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-48.5
       parent: 2
   - uid: 3679
     components:
@@ -104935,6 +110171,30 @@ entities:
     - type: Transform
       pos: 38.5,-92.5
       parent: 2
+  - uid: 3768
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-47.5
+      parent: 2
+  - uid: 3777
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-49.5
+      parent: 2
+  - uid: 3811
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-50.5
+      parent: 2
+  - uid: 3869
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-48.5
+      parent: 2
   - uid: 3941
     components:
     - type: Transform
@@ -104965,6 +110225,12 @@ entities:
     - type: Transform
       pos: -17.5,-57.5
       parent: 2
+  - uid: 3961
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-52.5
+      parent: 2
   - uid: 4082
     components:
     - type: Transform
@@ -104975,10 +110241,25 @@ entities:
     - type: Transform
       pos: 68.5,-26.5
       parent: 2
-  - uid: 4167
+  - uid: 4109
     components:
     - type: Transform
-      pos: 20.5,-25.5
+      pos: 68.5,-42.5
+      parent: 2
+  - uid: 4174
+    components:
+    - type: Transform
+      pos: 70.5,-43.5
+      parent: 2
+  - uid: 4175
+    components:
+    - type: Transform
+      pos: 67.5,-42.5
+      parent: 2
+  - uid: 4176
+    components:
+    - type: Transform
+      pos: 67.5,-41.5
       parent: 2
   - uid: 4208
     components:
@@ -105060,6 +110341,12 @@ entities:
     - type: Transform
       pos: -32.5,-60.5
       parent: 2
+  - uid: 4297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-52.5
+      parent: 2
   - uid: 4307
     components:
     - type: Transform
@@ -105145,10 +110432,11 @@ entities:
     - type: Transform
       pos: -11.5,-62.5
       parent: 2
-  - uid: 4346
+  - uid: 4345
     components:
     - type: Transform
-      pos: 57.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-46.5
       parent: 2
   - uid: 4413
     components:
@@ -105165,26 +110453,6 @@ entities:
     - type: Transform
       pos: 70.5,-49.5
       parent: 2
-  - uid: 4710
-    components:
-    - type: Transform
-      pos: 71.5,-44.5
-      parent: 2
-  - uid: 4711
-    components:
-    - type: Transform
-      pos: 70.5,-44.5
-      parent: 2
-  - uid: 4712
-    components:
-    - type: Transform
-      pos: 69.5,-44.5
-      parent: 2
-  - uid: 4713
-    components:
-    - type: Transform
-      pos: 68.5,-44.5
-      parent: 2
   - uid: 4759
     components:
     - type: Transform
@@ -105195,11 +110463,6 @@ entities:
     - type: Transform
       pos: 68.5,-49.5
       parent: 2
-  - uid: 4912
-    components:
-    - type: Transform
-      pos: 71.5,-49.5
-      parent: 2
   - uid: 4993
     components:
     - type: Transform
@@ -105250,15 +110513,48 @@ entities:
     - type: Transform
       pos: 16.5,-25.5
       parent: 2
+  - uid: 5235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-26.5
+      parent: 2
   - uid: 5241
     components:
     - type: Transform
       pos: 11.5,-13.5
       parent: 2
-  - uid: 6273
+  - uid: 5435
     components:
     - type: Transform
-      pos: 20.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-45.5
+      parent: 2
+  - uid: 5538
+    components:
+    - type: Transform
+      pos: 72.5,-51.5
+      parent: 2
+  - uid: 5603
+    components:
+    - type: Transform
+      pos: 72.5,-53.5
+      parent: 2
+  - uid: 5615
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-45.5
+      parent: 2
+  - uid: 5957
+    components:
+    - type: Transform
+      pos: 62.5,-52.5
+      parent: 2
+  - uid: 6164
+    components:
+    - type: Transform
+      pos: 54.5,-35.5
       parent: 2
   - uid: 6462
     components:
@@ -105270,6 +110566,12 @@ entities:
     - type: Transform
       pos: 67.5,-26.5
       parent: 2
+  - uid: 6630
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-46.5
+      parent: 2
   - uid: 6673
     components:
     - type: Transform
@@ -105350,16 +110652,6 @@ entities:
     - type: Transform
       pos: 53.5,-95.5
       parent: 2
-  - uid: 6861
-    components:
-    - type: Transform
-      pos: 53.5,-103.5
-      parent: 2
-  - uid: 6862
-    components:
-    - type: Transform
-      pos: 54.5,-96.5
-      parent: 2
   - uid: 6863
     components:
     - type: Transform
@@ -105375,11 +110667,6 @@ entities:
     - type: Transform
       pos: 56.5,-101.5
       parent: 2
-  - uid: 6868
-    components:
-    - type: Transform
-      pos: 55.5,-101.5
-      parent: 2
   - uid: 6870
     components:
     - type: Transform
@@ -105443,7 +110730,7 @@ entities:
   - uid: 6888
     components:
     - type: Transform
-      pos: 55.5,-97.5
+      pos: 57.5,-97.5
       parent: 2
   - uid: 6889
     components:
@@ -105465,11 +110752,22 @@ entities:
     - type: Transform
       pos: 54.5,-102.5
       parent: 2
+  - uid: 6900
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-104.5
+      parent: 2
   - uid: 6903
     components:
     - type: Transform
       pos: 53.5,-104.5
       parent: 2
+  - uid: 6912
+    components:
+    - type: Transform
+      pos: 56.5,-102.5
+      parent: 2
   - uid: 6928
     components:
     - type: Transform
@@ -105480,131 +110778,240 @@ entities:
     - type: Transform
       pos: 33.5,-93.5
       parent: 2
-  - uid: 7192
+  - uid: 7094
     components:
     - type: Transform
-      pos: 68.5,-39.5
+      pos: 57.5,-26.5
       parent: 2
-  - uid: 7194
+  - uid: 7215
     components:
     - type: Transform
-      pos: 69.5,-39.5
-      parent: 2
-  - uid: 7208
-    components:
-    - type: Transform
-      pos: 61.5,-60.5
-      parent: 2
-  - uid: 7209
-    components:
-    - type: Transform
-      pos: 62.5,-60.5
+      pos: 57.5,-30.5
       parent: 2
   - uid: 7268
     components:
     - type: Transform
-      pos: 62.5,-54.5
+      pos: 63.5,-51.5
       parent: 2
-  - uid: 7308
+  - uid: 7277
     components:
     - type: Transform
-      pos: 61.5,-47.5
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-45.5
+      parent: 2
+  - uid: 7293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-45.5
+      parent: 2
+  - uid: 7301
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-45.5
+      parent: 2
+  - uid: 7305
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-37.5
+      parent: 2
+  - uid: 7575
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-37.5
+      parent: 2
+  - uid: 7612
+    components:
+    - type: Transform
+      pos: 68.5,-31.5
+      parent: 2
+  - uid: 7628
+    components:
+    - type: Transform
+      pos: 67.5,-36.5
+      parent: 2
+  - uid: 7731
+    components:
+    - type: Transform
+      pos: 67.5,-31.5
+      parent: 2
+  - uid: 7745
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-37.5
+      parent: 2
+  - uid: 7749
+    components:
+    - type: Transform
+      pos: 67.5,-54.5
+      parent: 2
+  - uid: 7751
+    components:
+    - type: Transform
+      pos: 72.5,-54.5
+      parent: 2
+  - uid: 7759
+    components:
+    - type: Transform
+      pos: 65.5,-53.5
+      parent: 2
+  - uid: 7783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-25.5
       parent: 2
   - uid: 7790
     components:
     - type: Transform
       pos: 26.5,-10.5
       parent: 2
+  - uid: 7939
+    components:
+    - type: Transform
+      pos: 64.5,-53.5
+      parent: 2
+  - uid: 7940
+    components:
+    - type: Transform
+      pos: 70.5,-32.5
+      parent: 2
+  - uid: 7950
+    components:
+    - type: Transform
+      pos: 70.5,-31.5
+      parent: 2
   - uid: 7962
     components:
     - type: Transform
-      pos: 72.5,-48.5
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-38.5
       parent: 2
-  - uid: 8114
+  - uid: 7963
     components:
     - type: Transform
-      pos: 63.5,-59.5
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-37.5
       parent: 2
-  - uid: 8115
+  - uid: 7984
     components:
     - type: Transform
-      pos: 63.5,-57.5
+      pos: 69.5,-54.5
       parent: 2
-  - uid: 8129
+  - uid: 7985
     components:
     - type: Transform
-      pos: 57.5,-40.5
+      pos: 70.5,-54.5
+      parent: 2
+  - uid: 7987
+    components:
+    - type: Transform
+      pos: 71.5,-54.5
+      parent: 2
+  - uid: 8068
+    components:
+    - type: Transform
+      pos: 54.5,-40.5
+      parent: 2
+  - uid: 8132
+    components:
+    - type: Transform
+      pos: 53.5,-36.5
       parent: 2
   - uid: 8143
     components:
     - type: Transform
       pos: 67.5,-49.5
       parent: 2
-  - uid: 8173
+  - uid: 8151
     components:
     - type: Transform
-      pos: 57.5,-33.5
+      pos: 53.5,-38.5
       parent: 2
-  - uid: 8176
+  - uid: 8162
     components:
     - type: Transform
-      pos: 57.5,-60.5
+      pos: 53.5,-39.5
+      parent: 2
+  - uid: 8195
+    components:
+    - type: Transform
+      pos: 50.5,-35.5
+      parent: 2
+  - uid: 8196
+    components:
+    - type: Transform
+      pos: 53.5,-40.5
       parent: 2
   - uid: 8475
     components:
     - type: Transform
       pos: -32.5,-59.5
       parent: 2
-  - uid: 9281
+  - uid: 8562
     components:
     - type: Transform
-      pos: 61.5,-39.5
+      pos: 68.5,-54.5
+      parent: 2
+  - uid: 8571
+    components:
+    - type: Transform
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 8572
+    components:
+    - type: Transform
+      pos: 53.5,-35.5
+      parent: 2
+  - uid: 8618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-26.5
+      parent: 2
+  - uid: 9407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-24.5
       parent: 2
   - uid: 9584
     components:
     - type: Transform
       pos: -13.5,-57.5
       parent: 2
-  - uid: 9795
-    components:
-    - type: Transform
-      pos: 60.5,-33.5
-      parent: 2
   - uid: 10237
     components:
     - type: Transform
       pos: 60.5,-40.5
       parent: 2
-  - uid: 10308
+  - uid: 10245
     components:
     - type: Transform
-      pos: 64.5,-46.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-48.5
       parent: 2
-  - uid: 10309
+  - uid: 10248
     components:
     - type: Transform
-      pos: 64.5,-45.5
-      parent: 2
-  - uid: 10312
-    components:
-    - type: Transform
-      pos: 64.5,-44.5
-      parent: 2
-  - uid: 10655
-    components:
-    - type: Transform
-      pos: 61.5,-35.5
-      parent: 2
-  - uid: 10658
-    components:
-    - type: Transform
-      pos: 61.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-45.5
       parent: 2
   - uid: 10767
     components:
     - type: Transform
       pos: 70.5,-34.5
       parent: 2
+  - uid: 10781
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,-52.5
+      parent: 2
   - uid: 11012
     components:
     - type: Transform
@@ -105630,21 +111037,17 @@ entities:
     - type: Transform
       pos: 48.5,-16.5
       parent: 2
-  - uid: 11953
+  - uid: 12243
     components:
     - type: Transform
-      pos: 63.5,-54.5
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-103.5
       parent: 2
   - uid: 12887
     components:
     - type: Transform
       pos: 69.5,-49.5
       parent: 2
-  - uid: 13436
-    components:
-    - type: Transform
-      pos: 49.5,-16.5
-      parent: 2
   - uid: 13575
     components:
     - type: Transform
@@ -105655,31 +111058,6 @@ entities:
     - type: Transform
       pos: 49.5,-17.5
       parent: 2
-  - uid: 13809
-    components:
-    - type: Transform
-      pos: 61.5,-32.5
-      parent: 2
-  - uid: 13810
-    components:
-    - type: Transform
-      pos: 63.5,-58.5
-      parent: 2
-  - uid: 13815
-    components:
-    - type: Transform
-      pos: 59.5,-60.5
-      parent: 2
-  - uid: 13841
-    components:
-    - type: Transform
-      pos: 60.5,-60.5
-      parent: 2
-  - uid: 13872
-    components:
-    - type: Transform
-      pos: 58.5,-59.5
-      parent: 2
   - uid: 13883
     components:
     - type: Transform
@@ -105710,11 +111088,6 @@ entities:
     - type: Transform
       pos: 43.5,-15.5
       parent: 2
-  - uid: 13909
-    components:
-    - type: Transform
-      pos: 63.5,-60.5
-      parent: 2
   - uid: 14271
     components:
     - type: Transform
@@ -105725,16 +111098,6 @@ entities:
     - type: Transform
       pos: 26.5,-9.5
       parent: 2
-  - uid: 14427
-    components:
-    - type: Transform
-      pos: 65.5,-48.5
-      parent: 2
-  - uid: 14585
-    components:
-    - type: Transform
-      pos: 72.5,-45.5
-      parent: 2
   - uid: 14625
     components:
     - type: Transform
@@ -105750,11 +111113,6 @@ entities:
     - type: Transform
       pos: 19.5,-32.5
       parent: 2
-  - uid: 14724
-    components:
-    - type: Transform
-      pos: 66.5,-48.5
-      parent: 2
   - uid: 14726
     components:
     - type: Transform
@@ -105815,51 +111173,11 @@ entities:
     - type: Transform
       pos: 26.5,-89.5
       parent: 2
-  - uid: 15444
-    components:
-    - type: Transform
-      pos: 66.5,-34.5
-      parent: 2
-  - uid: 15447
-    components:
-    - type: Transform
-      pos: 69.5,-32.5
-      parent: 2
-  - uid: 15472
-    components:
-    - type: Transform
-      pos: 72.5,-47.5
-      parent: 2
-  - uid: 15473
-    components:
-    - type: Transform
-      pos: 72.5,-46.5
-      parent: 2
-  - uid: 15474
-    components:
-    - type: Transform
-      pos: 68.5,-36.5
-      parent: 2
   - uid: 15476
     components:
     - type: Transform
       pos: 66.5,-35.5
       parent: 2
-  - uid: 15478
-    components:
-    - type: Transform
-      pos: 64.5,-47.5
-      parent: 2
-  - uid: 15482
-    components:
-    - type: Transform
-      pos: 72.5,-44.5
-      parent: 2
-  - uid: 15483
-    components:
-    - type: Transform
-      pos: 72.5,-49.5
-      parent: 2
   - uid: 15485
     components:
     - type: Transform
@@ -105920,41 +111238,11 @@ entities:
     - type: Transform
       pos: 9.5,13.5
       parent: 2
-  - uid: 15518
-    components:
-    - type: Transform
-      pos: 66.5,-37.5
-      parent: 2
   - uid: 15519
     components:
     - type: Transform
       pos: 69.5,-31.5
       parent: 2
-  - uid: 15883
-    components:
-    - type: Transform
-      pos: 67.5,-36.5
-      parent: 2
-  - uid: 15884
-    components:
-    - type: Transform
-      pos: 68.5,-30.5
-      parent: 2
-  - uid: 15908
-    components:
-    - type: Transform
-      pos: 69.5,-30.5
-      parent: 2
-  - uid: 15911
-    components:
-    - type: Transform
-      pos: 70.5,-39.5
-      parent: 2
-  - uid: 16051
-    components:
-    - type: Transform
-      pos: 67.5,-30.5
-      parent: 2
   - uid: 16108
     components:
     - type: Transform
@@ -105970,16 +111258,6 @@ entities:
     - type: Transform
       pos: 36.5,-94.5
       parent: 2
-  - uid: 16373
-    components:
-    - type: Transform
-      pos: 61.5,-31.5
-      parent: 2
-  - uid: 16876
-    components:
-    - type: Transform
-      pos: 62.5,-59.5
-      parent: 2
   - uid: 16982
     components:
     - type: Transform
@@ -105990,16 +111268,6 @@ entities:
     - type: Transform
       pos: 34.5,-80.5
       parent: 2
-  - uid: 17105
-    components:
-    - type: Transform
-      pos: 57.5,-54.5
-      parent: 2
-  - uid: 17106
-    components:
-    - type: Transform
-      pos: 57.5,-55.5
-      parent: 2
   - uid: 17138
     components:
     - type: Transform
@@ -106010,36 +111278,6 @@ entities:
     - type: Transform
       pos: -30.5,-58.5
       parent: 2
-  - uid: 17151
-    components:
-    - type: Transform
-      pos: 57.5,-56.5
-      parent: 2
-  - uid: 17152
-    components:
-    - type: Transform
-      pos: 57.5,-57.5
-      parent: 2
-  - uid: 17162
-    components:
-    - type: Transform
-      pos: 57.5,-58.5
-      parent: 2
-  - uid: 17166
-    components:
-    - type: Transform
-      pos: 57.5,-59.5
-      parent: 2
-  - uid: 17211
-    components:
-    - type: Transform
-      pos: 61.5,-44.5
-      parent: 2
-  - uid: 17268
-    components:
-    - type: Transform
-      pos: 69.5,-36.5
-      parent: 2
   - uid: 17277
     components:
     - type: Transform
@@ -106080,11 +111318,6 @@ entities:
     - type: Transform
       pos: 69.5,-26.5
       parent: 2
-  - uid: 17608
-    components:
-    - type: Transform
-      pos: 20.5,-24.5
-      parent: 2
   - uid: 17666
     components:
     - type: Transform
@@ -106110,11 +111343,6 @@ entities:
     - type: Transform
       pos: 66.5,-26.5
       parent: 2
-  - uid: 17993
-    components:
-    - type: Transform
-      pos: 67.5,-39.5
-      parent: 2
   - uid: 17994
     components:
     - type: Transform
@@ -106240,6 +111468,21 @@ entities:
     - type: Transform
       pos: 20.5,-32.5
       parent: 2
+  - uid: 19723
+    components:
+    - type: Transform
+      pos: 57.5,-101.5
+      parent: 2
+  - uid: 19724
+    components:
+    - type: Transform
+      pos: 56.5,-96.5
+      parent: 2
+  - uid: 19725
+    components:
+    - type: Transform
+      pos: 55.5,-95.5
+      parent: 2
 - proto: WallReinforcedChitin
   entities:
   - uid: 39
@@ -106287,11 +111530,6 @@ entities:
     - type: Transform
       pos: 66.5,-75.5
       parent: 2
-  - uid: 255
-    components:
-    - type: Transform
-      pos: 57.5,-61.5
-      parent: 2
   - uid: 259
     components:
     - type: Transform
@@ -106302,16 +111540,16 @@ entities:
     - type: Transform
       pos: -24.5,-23.5
       parent: 2
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 30.5,-11.5
+      parent: 2
   - uid: 311
     components:
     - type: Transform
       pos: -16.5,-14.5
       parent: 2
-  - uid: 386
-    components:
-    - type: Transform
-      pos: 73.5,-47.5
-      parent: 2
   - uid: 388
     components:
     - type: Transform
@@ -106347,6 +111585,22 @@ entities:
     - type: Transform
       pos: -8.5,-14.5
       parent: 2
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 33.5,-11.5
+      parent: 2
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 28.5,-20.5
+      parent: 2
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 79.5,-42.5
+      parent: 2
   - uid: 500
     components:
     - type: Transform
@@ -106407,6 +111661,11 @@ entities:
     - type: Transform
       pos: 12.5,-37.5
       parent: 2
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 69.5,-55.5
+      parent: 2
   - uid: 521
     components:
     - type: Transform
@@ -106712,6 +111971,12 @@ entities:
     - type: Transform
       pos: 8.5,-44.5
       parent: 2
+  - uid: 792
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-37.5
+      parent: 2
   - uid: 816
     components:
     - type: Transform
@@ -106957,25 +112222,10 @@ entities:
     - type: Transform
       pos: 28.5,-9.5
       parent: 2
-  - uid: 915
-    components:
-    - type: Transform
-      pos: 26.5,-14.5
-      parent: 2
-  - uid: 916
-    components:
-    - type: Transform
-      pos: 26.5,-17.5
-      parent: 2
   - uid: 917
     components:
     - type: Transform
-      pos: 26.5,-18.5
-      parent: 2
-  - uid: 918
-    components:
-    - type: Transform
-      pos: 26.5,-21.5
+      pos: 28.5,-17.5
       parent: 2
   - uid: 954
     components:
@@ -107032,6 +112282,12 @@ entities:
     - type: Transform
       pos: -38.5,-30.5
       parent: 2
+  - uid: 1061
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-27.5
+      parent: 2
   - uid: 1064
     components:
     - type: Transform
@@ -109612,16 +114868,6 @@ entities:
     - type: Transform
       pos: -58.5,-68.5
       parent: 2
-  - uid: 2218
-    components:
-    - type: Transform
-      pos: 56.5,-40.5
-      parent: 2
-  - uid: 2219
-    components:
-    - type: Transform
-      pos: 56.5,-38.5
-      parent: 2
   - uid: 2222
     components:
     - type: Transform
@@ -109637,6 +114883,11 @@ entities:
     - type: Transform
       pos: -57.5,-69.5
       parent: 2
+  - uid: 2249
+    components:
+    - type: Transform
+      pos: 47.5,-40.5
+      parent: 2
   - uid: 2253
     components:
     - type: Transform
@@ -109702,11 +114953,6 @@ entities:
     - type: Transform
       pos: -15.5,-33.5
       parent: 2
-  - uid: 2294
-    components:
-    - type: Transform
-      pos: 58.5,-61.5
-      parent: 2
   - uid: 2295
     components:
     - type: Transform
@@ -110267,11 +115513,6 @@ entities:
     - type: Transform
       pos: 28.5,-80.5
       parent: 2
-  - uid: 2756
-    components:
-    - type: Transform
-      pos: 56.5,-32.5
-      parent: 2
   - uid: 2805
     components:
     - type: Transform
@@ -110322,6 +115563,11 @@ entities:
     - type: Transform
       pos: -15.5,-36.5
       parent: 2
+  - uid: 2931
+    components:
+    - type: Transform
+      pos: 63.5,-55.5
+      parent: 2
   - uid: 2946
     components:
     - type: Transform
@@ -110522,6 +115768,16 @@ entities:
     - type: Transform
       pos: 63.5,-76.5
       parent: 2
+  - uid: 3019
+    components:
+    - type: Transform
+      pos: 95.5,-44.5
+      parent: 2
+  - uid: 3020
+    components:
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
   - uid: 3035
     components:
     - type: Transform
@@ -110565,7 +115821,8 @@ entities:
   - uid: 3053
     components:
     - type: Transform
-      pos: 67.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-26.5
       parent: 2
   - uid: 3069
     components:
@@ -110577,10 +115834,29 @@ entities:
     - type: Transform
       pos: 64.5,-22.5
       parent: 2
+  - uid: 3072
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-49.5
+      parent: 2
+  - uid: 3083
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-48.5
+      parent: 2
   - uid: 3086
     components:
     - type: Transform
-      pos: 72.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-30.5
+      parent: 2
+  - uid: 3087
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-27.5
       parent: 2
   - uid: 3088
     components:
@@ -110590,7 +115866,8 @@ entities:
   - uid: 3093
     components:
     - type: Transform
-      pos: 66.5,-52.5
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-27.5
       parent: 2
   - uid: 3096
     components:
@@ -110662,16 +115939,6 @@ entities:
     - type: Transform
       pos: 71.5,-73.5
       parent: 2
-  - uid: 3137
-    components:
-    - type: Transform
-      pos: 72.5,-72.5
-      parent: 2
-  - uid: 3138
-    components:
-    - type: Transform
-      pos: 72.5,-73.5
-      parent: 2
   - uid: 3139
     components:
     - type: Transform
@@ -110682,50 +115949,22 @@ entities:
     - type: Transform
       pos: 78.5,-72.5
       parent: 2
-  - uid: 3162
+  - uid: 3142
     components:
     - type: Transform
-      pos: 76.5,-66.5
+      rot: -1.5707963267948966 rad
+      pos: 78.5,-40.5
       parent: 2
-  - uid: 3163
+  - uid: 3175
     components:
     - type: Transform
-      pos: 77.5,-66.5
-      parent: 2
-  - uid: 3164
-    components:
-    - type: Transform
-      pos: 78.5,-66.5
-      parent: 2
-  - uid: 3200
-    components:
-    - type: Transform
-      pos: 73.5,-43.5
+      pos: 84.5,-47.5
       parent: 2
   - uid: 3201
     components:
     - type: Transform
-      pos: 76.5,-62.5
-      parent: 2
-  - uid: 3202
-    components:
-    - type: Transform
-      pos: 73.5,-42.5
-      parent: 2
-  - uid: 3213
-    components:
-    - type: Transform
-      pos: 77.5,-62.5
-      parent: 2
-  - uid: 3214
-    components:
-    - type: Transform
-      pos: 78.5,-62.5
-      parent: 2
-  - uid: 3217
-    components:
-    - type: Transform
-      pos: 20.5,-69.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-30.5
       parent: 2
   - uid: 3218
     components:
@@ -110802,11 +116041,6 @@ entities:
     - type: Transform
       pos: 82.5,-65.5
       parent: 2
-  - uid: 3234
-    components:
-    - type: Transform
-      pos: 73.5,-41.5
-      parent: 2
   - uid: 3235
     components:
     - type: Transform
@@ -111002,21 +116236,6 @@ entities:
     - type: Transform
       pos: 85.5,-71.5
       parent: 2
-  - uid: 3277
-    components:
-    - type: Transform
-      pos: 75.5,-43.5
-      parent: 2
-  - uid: 3281
-    components:
-    - type: Transform
-      pos: 75.5,-47.5
-      parent: 2
-  - uid: 3282
-    components:
-    - type: Transform
-      pos: 75.5,-48.5
-      parent: 2
   - uid: 3293
     components:
     - type: Transform
@@ -111067,20 +116286,22 @@ entities:
     - type: Transform
       pos: 81.5,-56.5
       parent: 2
-  - uid: 3309
-    components:
-    - type: Transform
-      pos: 74.5,-55.5
-      parent: 2
   - uid: 3310
     components:
     - type: Transform
       pos: 73.5,-55.5
       parent: 2
-  - uid: 3358
+  - uid: 3311
     components:
     - type: Transform
-      pos: 48.5,-71.5
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-51.5
+      parent: 2
+  - uid: 3319
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-47.5
       parent: 2
   - uid: 3366
     components:
@@ -111107,6 +116328,12 @@ entities:
     - type: Transform
       pos: -37.5,-66.5
       parent: 2
+  - uid: 3397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-50.5
+      parent: 2
   - uid: 3404
     components:
     - type: Transform
@@ -111172,15 +116399,10 @@ entities:
     - type: Transform
       pos: 77.5,-48.5
       parent: 2
-  - uid: 3423
+  - uid: 3425
     components:
     - type: Transform
-      pos: 76.5,-48.5
-      parent: 2
-  - uid: 3428
-    components:
-    - type: Transform
-      pos: 76.5,-42.5
+      pos: 57.5,-74.5
       parent: 2
   - uid: 3429
     components:
@@ -111217,55 +116439,27 @@ entities:
     - type: Transform
       pos: 80.5,-39.5
       parent: 2
-  - uid: 3458
-    components:
-    - type: Transform
-      pos: 71.5,-39.5
-      parent: 2
-  - uid: 3466
-    components:
-    - type: Transform
-      pos: 64.5,-55.5
-      parent: 2
-  - uid: 3469
-    components:
-    - type: Transform
-      pos: 64.5,-53.5
-      parent: 2
   - uid: 3537
     components:
     - type: Transform
-      pos: 70.5,-29.5
+      pos: 63.5,-54.5
       parent: 2
-  - uid: 3538
+  - uid: 3547
     components:
     - type: Transform
-      pos: 70.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-30.5
       parent: 2
-  - uid: 3539
+  - uid: 3553
     components:
     - type: Transform
-      pos: 70.5,-31.5
+      pos: 30.5,-10.5
       parent: 2
-  - uid: 3540
+  - uid: 3557
     components:
     - type: Transform
-      pos: 70.5,-32.5
-      parent: 2
-  - uid: 3569
-    components:
-    - type: Transform
-      pos: 56.5,-42.5
-      parent: 2
-  - uid: 3570
-    components:
-    - type: Transform
-      pos: 56.5,-43.5
-      parent: 2
-  - uid: 3571
-    components:
-    - type: Transform
-      pos: 56.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-31.5
       parent: 2
   - uid: 3572
     components:
@@ -111282,60 +116476,133 @@ entities:
     - type: Transform
       pos: 80.5,-38.5
       parent: 2
-  - uid: 3616
+  - uid: 3612
     components:
     - type: Transform
-      pos: 56.5,-37.5
+      pos: 53.5,-22.5
       parent: 2
-  - uid: 3621
+  - uid: 3614
     components:
     - type: Transform
-      pos: 56.5,-33.5
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-30.5
       parent: 2
   - uid: 3631
     components:
     - type: Transform
-      pos: 70.5,-28.5
-      parent: 2
-  - uid: 3632
-    components:
-    - type: Transform
-      pos: 70.5,-27.5
+      pos: 68.5,-55.5
       parent: 2
   - uid: 3633
     components:
     - type: Transform
       pos: 70.5,-26.5
       parent: 2
-  - uid: 3634
+  - uid: 3739
     components:
     - type: Transform
-      pos: 70.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,-42.5
       parent: 2
-  - uid: 3649
+  - uid: 3756
     components:
     - type: Transform
-      pos: 56.5,-25.5
+      pos: 83.5,-43.5
       parent: 2
-  - uid: 3650
+  - uid: 3772
     components:
     - type: Transform
-      pos: 56.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-46.5
       parent: 2
-  - uid: 3651
+  - uid: 3773
     components:
     - type: Transform
-      pos: 56.5,-27.5
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-48.5
       parent: 2
-  - uid: 3652
+  - uid: 3797
     components:
     - type: Transform
-      pos: 56.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-36.5
       parent: 2
-  - uid: 3777
+  - uid: 3814
     components:
     - type: Transform
-      pos: 56.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-39.5
+      parent: 2
+  - uid: 3815
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-38.5
+      parent: 2
+  - uid: 3823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-40.5
+      parent: 2
+  - uid: 3824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-41.5
+      parent: 2
+  - uid: 3825
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-41.5
+      parent: 2
+  - uid: 3826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-43.5
+      parent: 2
+  - uid: 3846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-49.5
+      parent: 2
+  - uid: 3847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-48.5
+      parent: 2
+  - uid: 3848
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-49.5
+      parent: 2
+  - uid: 3849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-47.5
+      parent: 2
+  - uid: 3850
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-44.5
+      parent: 2
+  - uid: 3851
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-45.5
+      parent: 2
+  - uid: 3852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-46.5
       parent: 2
   - uid: 3870
     components:
@@ -111392,6 +116659,30 @@ entities:
     - type: Transform
       pos: 81.5,-35.5
       parent: 2
+  - uid: 3902
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-40.5
+      parent: 2
+  - uid: 3903
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-39.5
+      parent: 2
+  - uid: 3908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-40.5
+      parent: 2
+  - uid: 3910
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 75.5,-40.5
+      parent: 2
   - uid: 3917
     components:
     - type: Transform
@@ -111407,6 +116698,18 @@ entities:
     - type: Transform
       pos: 82.5,-30.5
       parent: 2
+  - uid: 3924
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-40.5
+      parent: 2
+  - uid: 3925
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-35.5
+      parent: 2
   - uid: 3965
     components:
     - type: Transform
@@ -111792,11 +117095,6 @@ entities:
     - type: Transform
       pos: 67.5,-18.5
       parent: 2
-  - uid: 4086
-    components:
-    - type: Transform
-      pos: 50.5,-22.5
-      parent: 2
   - uid: 4087
     components:
     - type: Transform
@@ -111832,21 +117130,6 @@ entities:
     - type: Transform
       pos: 69.5,-22.5
       parent: 2
-  - uid: 4099
-    components:
-    - type: Transform
-      pos: 69.5,-54.5
-      parent: 2
-  - uid: 4100
-    components:
-    - type: Transform
-      pos: 70.5,-54.5
-      parent: 2
-  - uid: 4109
-    components:
-    - type: Transform
-      pos: 56.5,-47.5
-      parent: 2
   - uid: 4112
     components:
     - type: Transform
@@ -112012,16 +117295,6 @@ entities:
     - type: Transform
       pos: 41.5,-20.5
       parent: 2
-  - uid: 4219
-    components:
-    - type: Transform
-      pos: 32.5,-10.5
-      parent: 2
-  - uid: 4220
-    components:
-    - type: Transform
-      pos: 32.5,-9.5
-      parent: 2
   - uid: 4236
     components:
     - type: Transform
@@ -112182,6 +117455,11 @@ entities:
     - type: Transform
       pos: 30.5,-68.5
       parent: 2
+  - uid: 4305
+    components:
+    - type: Transform
+      pos: 56.5,-73.5
+      parent: 2
   - uid: 4314
     components:
     - type: Transform
@@ -112352,80 +117630,20 @@ entities:
     - type: Transform
       pos: -15.5,-28.5
       parent: 2
-  - uid: 4560
-    components:
-    - type: Transform
-      pos: 32.5,-23.5
-      parent: 2
   - uid: 4561
     components:
     - type: Transform
       pos: 32.5,-21.5
       parent: 2
-  - uid: 4562
-    components:
-    - type: Transform
-      pos: 32.5,-20.5
-      parent: 2
-  - uid: 4610
-    components:
-    - type: Transform
-      pos: 32.5,-19.5
-      parent: 2
-  - uid: 4613
-    components:
-    - type: Transform
-      pos: 32.5,-18.5
-      parent: 2
-  - uid: 4614
-    components:
-    - type: Transform
-      pos: 32.5,-17.5
-      parent: 2
-  - uid: 4615
-    components:
-    - type: Transform
-      pos: 32.5,-16.5
-      parent: 2
-  - uid: 4616
-    components:
-    - type: Transform
-      pos: 32.5,-15.5
-      parent: 2
   - uid: 4617
     components:
     - type: Transform
-      pos: 32.5,-14.5
-      parent: 2
-  - uid: 4618
-    components:
-    - type: Transform
-      pos: 32.5,-13.5
+      pos: 28.5,-21.5
       parent: 2
   - uid: 4624
     components:
     - type: Transform
-      pos: 32.5,-12.5
-      parent: 2
-  - uid: 4625
-    components:
-    - type: Transform
-      pos: 32.5,-11.5
-      parent: 2
-  - uid: 4626
-    components:
-    - type: Transform
-      pos: 29.5,-13.5
-      parent: 2
-  - uid: 4627
-    components:
-    - type: Transform
-      pos: 29.5,-12.5
-      parent: 2
-  - uid: 4628
-    components:
-    - type: Transform
-      pos: 29.5,-11.5
+      pos: 30.5,-14.5
       parent: 2
   - uid: 4629
     components:
@@ -112482,6 +117700,11 @@ entities:
     - type: Transform
       pos: 34.5,-73.5
       parent: 2
+  - uid: 4810
+    components:
+    - type: Transform
+      pos: 70.5,-55.5
+      parent: 2
   - uid: 4829
     components:
     - type: Transform
@@ -112492,26 +117715,11 @@ entities:
     - type: Transform
       pos: -10.5,-68.5
       parent: 2
-  - uid: 4907
-    components:
-    - type: Transform
-      pos: 71.5,-54.5
-      parent: 2
-  - uid: 4913
-    components:
-    - type: Transform
-      pos: 67.5,-53.5
-      parent: 2
   - uid: 4914
     components:
     - type: Transform
       pos: 39.5,-18.5
       parent: 2
-  - uid: 4915
-    components:
-    - type: Transform
-      pos: 66.5,-53.5
-      parent: 2
   - uid: 4918
     components:
     - type: Transform
@@ -112552,6 +117760,12 @@ entities:
     - type: Transform
       pos: 54.5,-60.5
       parent: 2
+  - uid: 5110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-21.5
+      parent: 2
   - uid: 5185
     components:
     - type: Transform
@@ -112567,20 +117781,21 @@ entities:
     - type: Transform
       pos: -62.5,-64.5
       parent: 2
-  - uid: 5381
+  - uid: 5276
     components:
     - type: Transform
-      pos: 56.5,-36.5
+      pos: 49.5,-37.5
       parent: 2
-  - uid: 5388
+  - uid: 5315
     components:
     - type: Transform
-      pos: 56.5,-34.5
+      rot: 3.141592653589793 rad
+      pos: 79.5,-48.5
       parent: 2
-  - uid: 5437
+  - uid: 5322
     components:
     - type: Transform
-      pos: 64.5,-54.5
+      pos: 84.5,-43.5
       parent: 2
   - uid: 5497
     components:
@@ -112617,6 +117832,11 @@ entities:
     - type: Transform
       pos: 74.5,-72.5
       parent: 2
+  - uid: 5607
+    components:
+    - type: Transform
+      pos: 38.5,-77.5
+      parent: 2
   - uid: 5740
     components:
     - type: Transform
@@ -112637,6 +117857,18 @@ entities:
     - type: Transform
       pos: 22.5,-63.5
       parent: 2
+  - uid: 5813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-49.5
+      parent: 2
+  - uid: 5814
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-47.5
+      parent: 2
   - uid: 5819
     components:
     - type: Transform
@@ -112652,11 +117884,38 @@ entities:
     - type: Transform
       pos: -9.5,-72.5
       parent: 2
+  - uid: 5894
+    components:
+    - type: Transform
+      pos: 73.5,-37.5
+      parent: 2
+  - uid: 5895
+    components:
+    - type: Transform
+      pos: 73.5,-36.5
+      parent: 2
+  - uid: 6009
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-29.5
+      parent: 2
+  - uid: 6012
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-31.5
+      parent: 2
   - uid: 6037
     components:
     - type: Transform
       pos: 43.5,-61.5
       parent: 2
+  - uid: 6041
+    components:
+    - type: Transform
+      pos: 64.5,-54.5
+      parent: 2
   - uid: 6062
     components:
     - type: Transform
@@ -112727,10 +117986,11 @@ entities:
     - type: Transform
       pos: 82.5,-19.5
       parent: 2
-  - uid: 6639
+  - uid: 6638
     components:
     - type: Transform
-      pos: 82.5,-43.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,-48.5
       parent: 2
   - uid: 6669
     components:
@@ -112742,30 +118002,73 @@ entities:
     - type: Transform
       pos: 39.5,-59.5
       parent: 2
-  - uid: 7124
+  - uid: 7119
     components:
     - type: Transform
-      pos: 75.5,-44.5
-      parent: 2
-  - uid: 7127
-    components:
-    - type: Transform
-      pos: 75.5,-42.5
-      parent: 2
-  - uid: 7128
-    components:
-    - type: Transform
-      pos: 75.5,-46.5
+      pos: 54.5,-31.5
       parent: 2
   - uid: 7134
     components:
     - type: Transform
       pos: 39.5,-61.5
       parent: 2
-  - uid: 7189
+  - uid: 7165
     components:
     - type: Transform
-      pos: 71.5,-38.5
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-50.5
+      parent: 2
+  - uid: 7171
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-48.5
+      parent: 2
+  - uid: 7180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-48.5
+      parent: 2
+  - uid: 7182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-40.5
+      parent: 2
+  - uid: 7185
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 87.5,-40.5
+      parent: 2
+  - uid: 7186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 87.5,-50.5
+      parent: 2
+  - uid: 7220
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-53.5
+      parent: 2
+  - uid: 7235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-53.5
+      parent: 2
+  - uid: 7241
+    components:
+    - type: Transform
+      pos: 38.5,-73.5
+      parent: 2
+  - uid: 7246
+    components:
+    - type: Transform
+      pos: 38.5,-72.5
       parent: 2
   - uid: 7257
     components:
@@ -112777,15 +118080,28 @@ entities:
     - type: Transform
       pos: 51.5,-79.5
       parent: 2
-  - uid: 7339
+  - uid: 7263
     components:
     - type: Transform
-      pos: 82.5,-42.5
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-53.5
       parent: 2
-  - uid: 7341
+  - uid: 7269
     components:
     - type: Transform
-      pos: 83.5,-42.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-53.5
+      parent: 2
+  - uid: 7270
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-53.5
+      parent: 2
+  - uid: 7326
+    components:
+    - type: Transform
+      pos: 83.5,-47.5
       parent: 2
   - uid: 7343
     components:
@@ -112802,31 +118118,11 @@ entities:
     - type: Transform
       pos: 86.5,-42.5
       parent: 2
-  - uid: 7347
-    components:
-    - type: Transform
-      pos: 84.5,-40.5
-      parent: 2
-  - uid: 7348
-    components:
-    - type: Transform
-      pos: 85.5,-40.5
-      parent: 2
   - uid: 7349
     components:
     - type: Transform
       pos: 86.5,-40.5
       parent: 2
-  - uid: 7350
-    components:
-    - type: Transform
-      pos: 85.5,-39.5
-      parent: 2
-  - uid: 7351
-    components:
-    - type: Transform
-      pos: 86.5,-39.5
-      parent: 2
   - uid: 7352
     components:
     - type: Transform
@@ -112887,116 +118183,21 @@ entities:
     - type: Transform
       pos: 88.5,-38.5
       parent: 2
-  - uid: 7364
-    components:
-    - type: Transform
-      pos: 87.5,-38.5
-      parent: 2
-  - uid: 7365
-    components:
-    - type: Transform
-      pos: 86.5,-38.5
-      parent: 2
-  - uid: 7366
-    components:
-    - type: Transform
-      pos: 92.5,-40.5
-      parent: 2
-  - uid: 7367
-    components:
-    - type: Transform
-      pos: 93.5,-40.5
-      parent: 2
   - uid: 7368
     components:
     - type: Transform
       pos: 94.5,-40.5
       parent: 2
-  - uid: 7369
-    components:
-    - type: Transform
-      pos: 93.5,-41.5
-      parent: 2
-  - uid: 7370
-    components:
-    - type: Transform
-      pos: 94.5,-41.5
-      parent: 2
   - uid: 7371
     components:
     - type: Transform
       pos: 95.5,-41.5
       parent: 2
-  - uid: 7372
-    components:
-    - type: Transform
-      pos: 94.5,-42.5
-      parent: 2
-  - uid: 7373
-    components:
-    - type: Transform
-      pos: 95.5,-42.5
-      parent: 2
   - uid: 7374
     components:
     - type: Transform
       pos: 96.5,-42.5
       parent: 2
-  - uid: 7375
-    components:
-    - type: Transform
-      pos: 95.5,-43.5
-      parent: 2
-  - uid: 7376
-    components:
-    - type: Transform
-      pos: 95.5,-44.5
-      parent: 2
-  - uid: 7377
-    components:
-    - type: Transform
-      pos: 95.5,-45.5
-      parent: 2
-  - uid: 7378
-    components:
-    - type: Transform
-      pos: 95.5,-46.5
-      parent: 2
-  - uid: 7379
-    components:
-    - type: Transform
-      pos: 95.5,-47.5
-      parent: 2
-  - uid: 7380
-    components:
-    - type: Transform
-      pos: 95.5,-48.5
-      parent: 2
-  - uid: 7381
-    components:
-    - type: Transform
-      pos: 96.5,-43.5
-      parent: 2
-  - uid: 7382
-    components:
-    - type: Transform
-      pos: 96.5,-44.5
-      parent: 2
-  - uid: 7383
-    components:
-    - type: Transform
-      pos: 96.5,-45.5
-      parent: 2
-  - uid: 7384
-    components:
-    - type: Transform
-      pos: 96.5,-46.5
-      parent: 2
-  - uid: 7385
-    components:
-    - type: Transform
-      pos: 96.5,-47.5
-      parent: 2
   - uid: 7386
     components:
     - type: Transform
@@ -113007,36 +118208,11 @@ entities:
     - type: Transform
       pos: 95.5,-49.5
       parent: 2
-  - uid: 7388
-    components:
-    - type: Transform
-      pos: 94.5,-49.5
-      parent: 2
-  - uid: 7389
-    components:
-    - type: Transform
-      pos: 93.5,-49.5
-      parent: 2
-  - uid: 7390
-    components:
-    - type: Transform
-      pos: 94.5,-48.5
-      parent: 2
   - uid: 7391
     components:
     - type: Transform
       pos: 94.5,-50.5
       parent: 2
-  - uid: 7392
-    components:
-    - type: Transform
-      pos: 93.5,-50.5
-      parent: 2
-  - uid: 7393
-    components:
-    - type: Transform
-      pos: 92.5,-50.5
-      parent: 2
   - uid: 7394
     components:
     - type: Transform
@@ -113072,16 +118248,6 @@ entities:
     - type: Transform
       pos: 87.5,-51.5
       parent: 2
-  - uid: 7401
-    components:
-    - type: Transform
-      pos: 86.5,-51.5
-      parent: 2
-  - uid: 7402
-    components:
-    - type: Transform
-      pos: 85.5,-51.5
-      parent: 2
   - uid: 7403
     components:
     - type: Transform
@@ -113107,41 +118273,11 @@ entities:
     - type: Transform
       pos: 88.5,-52.5
       parent: 2
-  - uid: 7408
-    components:
-    - type: Transform
-      pos: 87.5,-52.5
-      parent: 2
-  - uid: 7409
-    components:
-    - type: Transform
-      pos: 86.5,-52.5
-      parent: 2
-  - uid: 7410
-    components:
-    - type: Transform
-      pos: 84.5,-50.5
-      parent: 2
-  - uid: 7411
-    components:
-    - type: Transform
-      pos: 85.5,-50.5
-      parent: 2
   - uid: 7412
     components:
     - type: Transform
       pos: 86.5,-50.5
       parent: 2
-  - uid: 7413
-    components:
-    - type: Transform
-      pos: 82.5,-48.5
-      parent: 2
-  - uid: 7414
-    components:
-    - type: Transform
-      pos: 83.5,-48.5
-      parent: 2
   - uid: 7415
     components:
     - type: Transform
@@ -113157,16 +118293,6 @@ entities:
     - type: Transform
       pos: 86.5,-48.5
       parent: 2
-  - uid: 7421
-    components:
-    - type: Transform
-      pos: 93.5,-44.5
-      parent: 2
-  - uid: 7423
-    components:
-    - type: Transform
-      pos: 93.5,-46.5
-      parent: 2
   - uid: 7457
     components:
     - type: Transform
@@ -113182,35 +118308,132 @@ entities:
     - type: Transform
       pos: -63.5,-64.5
       parent: 2
+  - uid: 7529
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,-45.5
+      parent: 2
+  - uid: 7531
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,-44.5
+      parent: 2
+  - uid: 7538
+    components:
+    - type: Transform
+      pos: 59.5,-77.5
+      parent: 2
+  - uid: 7542
+    components:
+    - type: Transform
+      pos: 58.5,-78.5
+      parent: 2
+  - uid: 7544
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 73.5,-51.5
+      parent: 2
+  - uid: 7595
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-47.5
+      parent: 2
+  - uid: 7596
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-46.5
+      parent: 2
+  - uid: 7599
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,-46.5
+      parent: 2
+  - uid: 7607
+    components:
+    - type: Transform
+      pos: 72.5,-55.5
+      parent: 2
+  - uid: 7616
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-43.5
+      parent: 2
+  - uid: 7618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-44.5
+      parent: 2
+  - uid: 7654
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-43.5
+      parent: 2
+  - uid: 7657
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-42.5
+      parent: 2
+  - uid: 7707
+    components:
+    - type: Transform
+      pos: 30.5,-13.5
+      parent: 2
+  - uid: 7727
+    components:
+    - type: Transform
+      pos: 74.5,-45.5
+      parent: 2
+  - uid: 7743
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-52.5
+      parent: 2
+  - uid: 7746
+    components:
+    - type: Transform
+      pos: 29.5,-21.5
+      parent: 2
   - uid: 7747
     components:
     - type: Transform
-      pos: 64.5,-59.5
+      pos: 49.5,-39.5
       parent: 2
-  - uid: 7765
+  - uid: 7776
     components:
     - type: Transform
-      pos: 31.5,-17.5
+      pos: 57.5,-76.5
+      parent: 2
+  - uid: 7787
+    components:
+    - type: Transform
+      pos: 30.5,-12.5
       parent: 2
   - uid: 7788
     components:
     - type: Transform
       pos: 29.5,-14.5
       parent: 2
-  - uid: 7794
+  - uid: 7791
     components:
     - type: Transform
-      pos: 27.5,-14.5
+      pos: 28.5,-16.5
       parent: 2
-  - uid: 7939
+  - uid: 7908
     components:
     - type: Transform
-      pos: 56.5,-56.5
-      parent: 2
-  - uid: 7940
-    components:
-    - type: Transform
-      pos: 56.5,-57.5
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-17.5
       parent: 2
   - uid: 7972
     components:
@@ -113222,16 +118445,31 @@ entities:
     - type: Transform
       pos: 29.5,-64.5
       parent: 2
+  - uid: 7988
+    components:
+    - type: Transform
+      pos: 65.5,-54.5
+      parent: 2
   - uid: 7994
     components:
     - type: Transform
       pos: 71.5,-55.5
       parent: 2
+  - uid: 8003
+    components:
+    - type: Transform
+      pos: 66.5,-55.5
+      parent: 2
   - uid: 8018
     components:
     - type: Transform
       pos: -22.5,-15.5
       parent: 2
+  - uid: 8029
+    components:
+    - type: Transform
+      pos: 47.5,-39.5
+      parent: 2
   - uid: 8032
     components:
     - type: Transform
@@ -113242,10 +118480,16 @@ entities:
     - type: Transform
       pos: -44.5,-76.5
       parent: 2
-  - uid: 8127
+  - uid: 8088
     components:
     - type: Transform
-      pos: 62.5,-61.5
+      pos: 49.5,-34.5
+      parent: 2
+  - uid: 8114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-27.5
       parent: 2
   - uid: 8136
     components:
@@ -113257,10 +118501,10 @@ entities:
     - type: Transform
       pos: 19.5,-59.5
       parent: 2
-  - uid: 8161
+  - uid: 8173
     components:
     - type: Transform
-      pos: 61.5,-61.5
+      pos: 50.5,-39.5
       parent: 2
   - uid: 8175
     components:
@@ -113282,71 +118526,218 @@ entities:
     - type: Transform
       pos: 39.5,-77.5
       parent: 2
-  - uid: 8564
+  - uid: 8387
     components:
     - type: Transform
-      pos: 37.5,-12.5
+      pos: 48.5,-36.5
       parent: 2
-  - uid: 8565
+  - uid: 8389
     components:
     - type: Transform
-      pos: 37.5,-13.5
+      pos: 48.5,-37.5
+      parent: 2
+  - uid: 8390
+    components:
+    - type: Transform
+      pos: 48.5,-35.5
+      parent: 2
+  - uid: 8391
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-38.5
+      parent: 2
+  - uid: 8403
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-30.5
+      parent: 2
+  - uid: 8404
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-28.5
+      parent: 2
+  - uid: 8405
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-45.5
+      parent: 2
+  - uid: 8413
+    components:
+    - type: Transform
+      pos: 49.5,-35.5
       parent: 2
   - uid: 8567
     components:
     - type: Transform
       pos: 38.5,-20.5
       parent: 2
-  - uid: 8570
+  - uid: 8574
     components:
     - type: Transform
-      pos: 73.5,-46.5
+      pos: 51.5,-39.5
       parent: 2
-  - uid: 8575
+  - uid: 8578
     components:
     - type: Transform
-      pos: 33.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-28.5
+      parent: 2
+  - uid: 8589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-46.5
+      parent: 2
+  - uid: 8590
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-44.5
+      parent: 2
+  - uid: 8591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-48.5
+      parent: 2
+  - uid: 8606
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-42.5
+      parent: 2
+  - uid: 8608
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-47.5
+      parent: 2
+  - uid: 8609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-52.5
+      parent: 2
+  - uid: 8611
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-50.5
+      parent: 2
+  - uid: 8627
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-28.5
+      parent: 2
+  - uid: 8629
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-51.5
       parent: 2
   - uid: 8631
     components:
     - type: Transform
       pos: 60.5,-22.5
       parent: 2
+  - uid: 8634
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-27.5
+      parent: 2
   - uid: 8635
     components:
     - type: Transform
       pos: 67.5,-22.5
       parent: 2
+  - uid: 8637
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-51.5
+      parent: 2
+  - uid: 8651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-26.5
+      parent: 2
+  - uid: 8685
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 93.5,-52.5
+      parent: 2
   - uid: 8686
     components:
     - type: Transform
-      pos: 73.5,-39.5
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-50.5
+      parent: 2
+  - uid: 8703
+    components:
+    - type: Transform
+      pos: 30.5,-9.5
+      parent: 2
+  - uid: 8709
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-50.5
+      parent: 2
+  - uid: 8783
+    components:
+    - type: Transform
+      pos: 34.5,-21.5
+      parent: 2
+  - uid: 8784
+    components:
+    - type: Transform
+      pos: 36.5,-16.5
+      parent: 2
+  - uid: 8801
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 93.5,-38.5
+      parent: 2
+  - uid: 8812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-27.5
+      parent: 2
+  - uid: 8823
+    components:
+    - type: Transform
+      pos: 54.5,-29.5
+      parent: 2
+  - uid: 8825
+    components:
+    - type: Transform
+      pos: 54.5,-30.5
       parent: 2
   - uid: 8830
     components:
     - type: Transform
       pos: 6.5,-81.5
       parent: 2
+  - uid: 8867
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 2
   - uid: 9245
     components:
     - type: Transform
       pos: 61.5,-22.5
       parent: 2
-  - uid: 9295
-    components:
-    - type: Transform
-      pos: 55.5,-53.5
-      parent: 2
-  - uid: 9296
-    components:
-    - type: Transform
-      pos: 56.5,-54.5
-      parent: 2
-  - uid: 9301
-    components:
-    - type: Transform
-      pos: 72.5,-57.5
-      parent: 2
   - uid: 9316
     components:
     - type: Transform
@@ -113372,35 +118763,57 @@ entities:
     - type: Transform
       pos: 55.5,-67.5
       parent: 2
-  - uid: 9342
-    components:
-    - type: Transform
-      pos: 35.5,-19.5
-      parent: 2
   - uid: 9355
     components:
     - type: Transform
       pos: 29.5,-59.5
       parent: 2
+  - uid: 9358
+    components:
+    - type: Transform
+      pos: 33.5,-12.5
+      parent: 2
+  - uid: 9361
+    components:
+    - type: Transform
+      pos: 34.5,-16.5
+      parent: 2
   - uid: 9362
     components:
     - type: Transform
       pos: 53.5,-12.5
       parent: 2
-  - uid: 9397
+  - uid: 9366
     components:
     - type: Transform
-      pos: 64.5,-58.5
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-16.5
       parent: 2
-  - uid: 9416
+  - uid: 9367
     components:
     - type: Transform
-      pos: 64.5,-57.5
+      pos: 34.5,-20.5
       parent: 2
-  - uid: 9669
+  - uid: 9369
     components:
     - type: Transform
-      pos: 63.5,-53.5
+      pos: 49.5,-27.5
+      parent: 2
+  - uid: 9386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-19.5
+      parent: 2
+  - uid: 9413
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 2
+  - uid: 9870
+    components:
+    - type: Transform
+      pos: 47.5,-42.5
       parent: 2
   - uid: 9959
     components:
@@ -113467,31 +118880,6 @@ entities:
     - type: Transform
       pos: 51.5,-11.5
       parent: 2
-  - uid: 10288
-    components:
-    - type: Transform
-      pos: 64.5,-56.5
-      parent: 2
-  - uid: 10299
-    components:
-    - type: Transform
-      pos: 56.5,-55.5
-      parent: 2
-  - uid: 10304
-    components:
-    - type: Transform
-      pos: 54.5,-53.5
-      parent: 2
-  - uid: 10310
-    components:
-    - type: Transform
-      pos: 73.5,-45.5
-      parent: 2
-  - uid: 10313
-    components:
-    - type: Transform
-      pos: 73.5,-44.5
-      parent: 2
   - uid: 10321
     components:
     - type: Transform
@@ -113502,10 +118890,27 @@ entities:
     - type: Transform
       pos: -50.5,-48.5
       parent: 2
-  - uid: 10674
+  - uid: 10658
     components:
     - type: Transform
-      pos: 56.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-75.5
+      parent: 2
+  - uid: 10659
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-75.5
+      parent: 2
+  - uid: 10714
+    components:
+    - type: Transform
+      pos: 74.5,-42.5
+      parent: 2
+  - uid: 10723
+    components:
+    - type: Transform
+      pos: 74.5,-43.5
       parent: 2
   - uid: 10747
     components:
@@ -113517,10 +118922,17 @@ entities:
     - type: Transform
       pos: 66.5,-22.5
       parent: 2
-  - uid: 10766
+  - uid: 10783
     components:
     - type: Transform
-      pos: 73.5,-49.5
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-41.5
+      parent: 2
+  - uid: 10784
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,-53.5
       parent: 2
   - uid: 10807
     components:
@@ -113557,11 +118969,6 @@ entities:
     - type: Transform
       pos: -11.5,-17.5
       parent: 2
-  - uid: 11460
-    components:
-    - type: Transform
-      pos: 78.5,-56.5
-      parent: 2
   - uid: 11462
     components:
     - type: Transform
@@ -113572,11 +118979,6 @@ entities:
     - type: Transform
       pos: -15.5,-15.5
       parent: 2
-  - uid: 11467
-    components:
-    - type: Transform
-      pos: 88.5,-46.5
-      parent: 2
   - uid: 11471
     components:
     - type: Transform
@@ -113597,36 +118999,61 @@ entities:
     - type: Transform
       pos: 50.5,-57.5
       parent: 2
-  - uid: 11842
+  - uid: 11689
     components:
     - type: Transform
-      pos: 88.5,-45.5
-      parent: 2
-  - uid: 11846
-    components:
-    - type: Transform
-      pos: 56.5,-31.5
+      pos: 71.5,-56.5
       parent: 2
   - uid: 11853
     components:
     - type: Transform
       pos: -8.5,-26.5
       parent: 2
-  - uid: 11909
+  - uid: 11945
     components:
     - type: Transform
-      pos: 49.5,-38.5
+      pos: 44.5,-73.5
+      parent: 2
+  - uid: 11981
+    components:
+    - type: Transform
+      pos: 49.5,-32.5
       parent: 2
   - uid: 12709
     components:
     - type: Transform
       pos: -24.5,-15.5
       parent: 2
+  - uid: 12799
+    components:
+    - type: Transform
+      pos: 47.5,-74.5
+      parent: 2
   - uid: 12889
     components:
     - type: Transform
       pos: -23.5,-19.5
       parent: 2
+  - uid: 12929
+    components:
+    - type: Transform
+      pos: 47.5,-41.5
+      parent: 2
+  - uid: 12950
+    components:
+    - type: Transform
+      pos: 49.5,-33.5
+      parent: 2
+  - uid: 12994
+    components:
+    - type: Transform
+      pos: 73.5,-39.5
+      parent: 2
+  - uid: 13254
+    components:
+    - type: Transform
+      pos: 73.5,-38.5
+      parent: 2
   - uid: 13393
     components:
     - type: Transform
@@ -113682,15 +119109,10 @@ entities:
     - type: Transform
       pos: 56.5,-46.5
       parent: 2
-  - uid: 13912
+  - uid: 13932
     components:
     - type: Transform
-      pos: 63.5,-61.5
-      parent: 2
-  - uid: 13913
-    components:
-    - type: Transform
-      pos: 71.5,-57.5
+      pos: 72.5,-37.5
       parent: 2
   - uid: 14010
     components:
@@ -113712,11 +119134,6 @@ entities:
     - type: Transform
       pos: 76.5,-17.5
       parent: 2
-  - uid: 14144
-    components:
-    - type: Transform
-      pos: 78.5,-57.5
-      parent: 2
   - uid: 14157
     components:
     - type: Transform
@@ -113727,16 +119144,6 @@ entities:
     - type: Transform
       pos: -16.5,-72.5
       parent: 2
-  - uid: 14242
-    components:
-    - type: Transform
-      pos: 49.5,-37.5
-      parent: 2
-  - uid: 14250
-    components:
-    - type: Transform
-      pos: 68.5,-54.5
-      parent: 2
   - uid: 14255
     components:
     - type: Transform
@@ -113747,41 +119154,16 @@ entities:
     - type: Transform
       pos: 54.5,-64.5
       parent: 2
-  - uid: 14327
-    components:
-    - type: Transform
-      pos: 60.5,-61.5
-      parent: 2
-  - uid: 14328
-    components:
-    - type: Transform
-      pos: 59.5,-61.5
-      parent: 2
   - uid: 14337
     components:
     - type: Transform
       pos: 56.5,-61.5
       parent: 2
-  - uid: 14348
-    components:
-    - type: Transform
-      pos: 64.5,-60.5
-      parent: 2
-  - uid: 14355
-    components:
-    - type: Transform
-      pos: 64.5,-61.5
-      parent: 2
   - uid: 14388
     components:
     - type: Transform
       pos: 48.5,-54.5
       parent: 2
-  - uid: 14406
-    components:
-    - type: Transform
-      pos: 49.5,-36.5
-      parent: 2
   - uid: 14409
     components:
     - type: Transform
@@ -113830,22 +119212,29 @@ entities:
   - uid: 15125
     components:
     - type: Transform
-      pos: 48.5,-36.5
+      pos: 67.5,-55.5
       parent: 2
-  - uid: 15126
+  - uid: 15167
     components:
     - type: Transform
-      pos: 47.5,-36.5
+      pos: 58.5,-77.5
       parent: 2
-  - uid: 15127
+  - uid: 15168
     components:
     - type: Transform
-      pos: 47.5,-37.5
+      pos: 59.5,-78.5
       parent: 2
-  - uid: 15233
+  - uid: 15195
     components:
     - type: Transform
-      pos: 88.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-42.5
+      parent: 2
+  - uid: 15196
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-42.5
       parent: 2
   - uid: 15272
     components:
@@ -113887,21 +119276,11 @@ entities:
     - type: Transform
       pos: -43.5,-68.5
       parent: 2
-  - uid: 16370
-    components:
-    - type: Transform
-      pos: 57.5,-25.5
-      parent: 2
   - uid: 16371
     components:
     - type: Transform
       pos: 60.5,-25.5
       parent: 2
-  - uid: 16420
-    components:
-    - type: Transform
-      pos: 71.5,-36.5
-      parent: 2
   - uid: 16446
     components:
     - type: Transform
@@ -114052,31 +119431,11 @@ entities:
     - type: Transform
       pos: 73.5,-53.5
       parent: 2
-  - uid: 17265
-    components:
-    - type: Transform
-      pos: 73.5,-48.5
-      parent: 2
   - uid: 17281
     components:
     - type: Transform
       pos: 35.5,-80.5
       parent: 2
-  - uid: 17286
-    components:
-    - type: Transform
-      pos: 72.5,-40.5
-      parent: 2
-  - uid: 17287
-    components:
-    - type: Transform
-      pos: 71.5,-35.5
-      parent: 2
-  - uid: 17288
-    components:
-    - type: Transform
-      pos: 71.5,-40.5
-      parent: 2
   - uid: 17292
     components:
     - type: Transform
@@ -114087,11 +119446,6 @@ entities:
     - type: Transform
       pos: 71.5,-33.5
       parent: 2
-  - uid: 17340
-    components:
-    - type: Transform
-      pos: 56.5,-39.5
-      parent: 2
   - uid: 17341
     components:
     - type: Transform
@@ -114112,10 +119466,10 @@ entities:
     - type: Transform
       pos: -24.5,-89.5
       parent: 2
-  - uid: 17599
+  - uid: 17635
     components:
     - type: Transform
-      pos: 46.5,-73.5
+      pos: 20.5,-69.5
       parent: 2
   - uid: 17636
     components:
@@ -114132,11 +119486,6 @@ entities:
     - type: Transform
       pos: 30.5,-69.5
       parent: 2
-  - uid: 17658
-    components:
-    - type: Transform
-      pos: 45.5,-73.5
-      parent: 2
   - uid: 17690
     components:
     - type: Transform
@@ -114152,11 +119501,6 @@ entities:
     - type: Transform
       pos: 62.5,-18.5
       parent: 2
-  - uid: 17899
-    components:
-    - type: Transform
-      pos: 48.5,-72.5
-      parent: 2
   - uid: 17904
     components:
     - type: Transform
@@ -114177,16 +119521,6 @@ entities:
     - type: Transform
       pos: 41.5,-19.5
       parent: 2
-  - uid: 18005
-    components:
-    - type: Transform
-      pos: 82.5,-47.5
-      parent: 2
-  - uid: 18006
-    components:
-    - type: Transform
-      pos: 81.5,-47.5
-      parent: 2
   - uid: 18194
     components:
     - type: Transform
@@ -114207,6 +119541,11 @@ entities:
     - type: Transform
       pos: -10.5,-87.5
       parent: 2
+  - uid: 18342
+    components:
+    - type: Transform
+      pos: 46.5,-74.5
+      parent: 2
   - uid: 18393
     components:
     - type: Transform
@@ -114217,11 +119556,6 @@ entities:
     - type: Transform
       pos: -22.5,-89.5
       parent: 2
-  - uid: 18474
-    components:
-    - type: Transform
-      pos: 81.5,-43.5
-      parent: 2
   - uid: 18489
     components:
     - type: Transform
@@ -114893,10 +120227,11 @@ entities:
     - type: Transform
       pos: -14.5,-22.5
       parent: 2
-  - uid: 167
+  - uid: 164
     components:
     - type: Transform
-      pos: -41.5,-63.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-32.5
       parent: 2
   - uid: 170
     components:
@@ -114923,6 +120258,12 @@ entities:
     - type: Transform
       pos: -30.5,-25.5
       parent: 2
+  - uid: 197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-25.5
+      parent: 2
   - uid: 198
     components:
     - type: Transform
@@ -114938,6 +120279,11 @@ entities:
     - type: Transform
       pos: -47.5,-61.5
       parent: 2
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 53.5,-48.5
+      parent: 2
   - uid: 226
     components:
     - type: Transform
@@ -114978,11 +120324,6 @@ entities:
     - type: Transform
       pos: -9.5,-23.5
       parent: 2
-  - uid: 294
-    components:
-    - type: Transform
-      pos: 22.5,-16.5
-      parent: 2
   - uid: 337
     components:
     - type: Transform
@@ -115093,31 +120434,6 @@ entities:
     - type: Transform
       pos: 3.5,-23.5
       parent: 2
-  - uid: 451
-    components:
-    - type: Transform
-      pos: 22.5,-15.5
-      parent: 2
-  - uid: 452
-    components:
-    - type: Transform
-      pos: 22.5,-17.5
-      parent: 2
-  - uid: 453
-    components:
-    - type: Transform
-      pos: 22.5,-18.5
-      parent: 2
-  - uid: 455
-    components:
-    - type: Transform
-      pos: 22.5,-20.5
-      parent: 2
-  - uid: 456
-    components:
-    - type: Transform
-      pos: 22.5,-21.5
-      parent: 2
   - uid: 465
     components:
     - type: Transform
@@ -115308,15 +120624,15 @@ entities:
     - type: Transform
       pos: 17.5,-51.5
       parent: 2
-  - uid: 919
+  - uid: 885
     components:
     - type: Transform
-      pos: 26.5,-24.5
+      pos: 76.5,-60.5
       parent: 2
-  - uid: 920
+  - uid: 887
     components:
     - type: Transform
-      pos: 26.5,-25.5
+      pos: 72.5,-66.5
       parent: 2
   - uid: 925
     components:
@@ -115808,11 +121124,6 @@ entities:
     - type: Transform
       pos: 3.5,-61.5
       parent: 2
-  - uid: 1095
-    components:
-    - type: Transform
-      pos: 3.5,-59.5
-      parent: 2
   - uid: 1097
     components:
     - type: Transform
@@ -115838,11 +121149,6 @@ entities:
     - type: Transform
       pos: 5.5,-60.5
       parent: 2
-  - uid: 1104
-    components:
-    - type: Transform
-      pos: 5.5,-59.5
-      parent: 2
   - uid: 1105
     components:
     - type: Transform
@@ -116073,6 +121379,11 @@ entities:
     - type: Transform
       pos: -22.5,-43.5
       parent: 2
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 59.5,-65.5
+      parent: 2
   - uid: 1199
     components:
     - type: Transform
@@ -116424,6 +121735,11 @@ entities:
     - type: Transform
       pos: -55.5,-25.5
       parent: 2
+  - uid: 1546
+    components:
+    - type: Transform
+      pos: 46.5,-50.5
+      parent: 2
   - uid: 1548
     components:
     - type: Transform
@@ -116499,6 +121815,12 @@ entities:
     - type: Transform
       pos: -30.5,-50.5
       parent: 2
+  - uid: 1807
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-48.5
+      parent: 2
   - uid: 1872
     components:
     - type: Transform
@@ -116509,6 +121831,12 @@ entities:
     - type: Transform
       pos: -36.5,-62.5
       parent: 2
+  - uid: 1878
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-36.5
+      parent: 2
   - uid: 1887
     components:
     - type: Transform
@@ -116629,65 +121957,29 @@ entities:
     - type: Transform
       pos: -43.5,-62.5
       parent: 2
-  - uid: 1976
-    components:
-    - type: Transform
-      pos: 48.5,-49.5
-      parent: 2
-  - uid: 1997
-    components:
-    - type: Transform
-      pos: -37.5,-73.5
-      parent: 2
-  - uid: 1998
-    components:
-    - type: Transform
-      pos: -37.5,-74.5
-      parent: 2
   - uid: 1999
     components:
     - type: Transform
-      pos: -37.5,-75.5
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-36.5
       parent: 2
   - uid: 2000
     components:
     - type: Transform
-      pos: -37.5,-77.5
+      rot: 1.5707963267948966 rad
+      pos: 72.5,-32.5
       parent: 2
   - uid: 2001
     components:
     - type: Transform
-      pos: -37.5,-78.5
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-32.5
       parent: 2
   - uid: 2002
     components:
     - type: Transform
-      pos: -38.5,-78.5
-      parent: 2
-  - uid: 2005
-    components:
-    - type: Transform
-      pos: -40.5,-78.5
-      parent: 2
-  - uid: 2006
-    components:
-    - type: Transform
-      pos: -41.5,-78.5
-      parent: 2
-  - uid: 2007
-    components:
-    - type: Transform
-      pos: -42.5,-78.5
-      parent: 2
-  - uid: 2008
-    components:
-    - type: Transform
-      pos: -42.5,-77.5
-      parent: 2
-  - uid: 2009
-    components:
-    - type: Transform
-      pos: -42.5,-76.5
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-50.5
       parent: 2
   - uid: 2103
     components:
@@ -116724,11 +122016,6 @@ entities:
     - type: Transform
       pos: -45.5,-66.5
       parent: 2
-  - uid: 2158
-    components:
-    - type: Transform
-      pos: 58.5,-73.5
-      parent: 2
   - uid: 2170
     components:
     - type: Transform
@@ -116744,16 +122031,6 @@ entities:
     - type: Transform
       pos: 7.5,-63.5
       parent: 2
-  - uid: 2228
-    components:
-    - type: Transform
-      pos: 58.5,-66.5
-      parent: 2
-  - uid: 2246
-    components:
-    - type: Transform
-      pos: 57.5,-67.5
-      parent: 2
   - uid: 2250
     components:
     - type: Transform
@@ -116769,16 +122046,17 @@ entities:
     - type: Transform
       pos: -4.5,-71.5
       parent: 2
-  - uid: 2269
-    components:
-    - type: Transform
-      pos: 57.5,-66.5
-      parent: 2
   - uid: 2291
     components:
     - type: Transform
       pos: -55.5,-64.5
       parent: 2
+  - uid: 2302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-19.5
+      parent: 2
   - uid: 2380
     components:
     - type: Transform
@@ -116844,11 +122122,6 @@ entities:
     - type: Transform
       pos: 4.5,-74.5
       parent: 2
-  - uid: 2407
-    components:
-    - type: Transform
-      pos: 5.5,-72.5
-      parent: 2
   - uid: 2408
     components:
     - type: Transform
@@ -117059,11 +122332,6 @@ entities:
     - type: Transform
       pos: -31.5,-26.5
       parent: 2
-  - uid: 2951
-    components:
-    - type: Transform
-      pos: 74.5,-56.5
-      parent: 2
   - uid: 2952
     components:
     - type: Transform
@@ -117104,16 +122372,26 @@ entities:
     - type: Transform
       pos: 36.5,-77.5
       parent: 2
-  - uid: 2960
+  - uid: 3012
     components:
     - type: Transform
-      pos: 37.5,-77.5
+      pos: 23.5,-14.5
+      parent: 2
+  - uid: 3029
+    components:
+    - type: Transform
+      pos: 23.5,-15.5
       parent: 2
   - uid: 3034
     components:
     - type: Transform
       pos: 74.5,-24.5
       parent: 2
+  - uid: 3090
+    components:
+    - type: Transform
+      pos: 65.5,-62.5
+      parent: 2
   - uid: 3108
     components:
     - type: Transform
@@ -117124,161 +122402,26 @@ entities:
     - type: Transform
       pos: -43.5,-64.5
       parent: 2
-  - uid: 3127
-    components:
-    - type: Transform
-      pos: -12.5,-55.5
-      parent: 2
   - uid: 3141
     components:
     - type: Transform
       pos: 78.5,-71.5
       parent: 2
-  - uid: 3142
-    components:
-    - type: Transform
-      pos: 78.5,-70.5
-      parent: 2
-  - uid: 3143
-    components:
-    - type: Transform
-      pos: 78.5,-69.5
-      parent: 2
-  - uid: 3144
-    components:
-    - type: Transform
-      pos: 78.5,-68.5
-      parent: 2
-  - uid: 3145
-    components:
-    - type: Transform
-      pos: 77.5,-68.5
-      parent: 2
-  - uid: 3146
-    components:
-    - type: Transform
-      pos: 76.5,-68.5
-      parent: 2
-  - uid: 3147
-    components:
-    - type: Transform
-      pos: 75.5,-68.5
-      parent: 2
-  - uid: 3148
-    components:
-    - type: Transform
-      pos: 76.5,-70.5
-      parent: 2
-  - uid: 3149
-    components:
-    - type: Transform
-      pos: 75.5,-70.5
-      parent: 2
-  - uid: 3150
-    components:
-    - type: Transform
-      pos: 74.5,-70.5
-      parent: 2
-  - uid: 3151
-    components:
-    - type: Transform
-      pos: 73.5,-70.5
-      parent: 2
-  - uid: 3152
-    components:
-    - type: Transform
-      pos: 72.5,-70.5
-      parent: 2
-  - uid: 3153
-    components:
-    - type: Transform
-      pos: 71.5,-70.5
-      parent: 2
-  - uid: 3154
-    components:
-    - type: Transform
-      pos: 70.5,-70.5
-      parent: 2
-  - uid: 3155
-    components:
-    - type: Transform
-      pos: 69.5,-70.5
-      parent: 2
   - uid: 3156
     components:
     - type: Transform
       pos: 68.5,-70.5
       parent: 2
-  - uid: 3157
-    components:
-    - type: Transform
-      pos: 73.5,-69.5
-      parent: 2
-  - uid: 3158
-    components:
-    - type: Transform
-      pos: 72.5,-66.5
-      parent: 2
-  - uid: 3159
-    components:
-    - type: Transform
-      pos: 73.5,-66.5
-      parent: 2
-  - uid: 3160
-    components:
-    - type: Transform
-      pos: 74.5,-66.5
-      parent: 2
-  - uid: 3161
-    components:
-    - type: Transform
-      pos: 75.5,-66.5
-      parent: 2
-  - uid: 3165
-    components:
-    - type: Transform
-      pos: 73.5,-67.5
-      parent: 2
-  - uid: 3166
-    components:
-    - type: Transform
-      pos: 70.5,-66.5
-      parent: 2
   - uid: 3167
     components:
     - type: Transform
       pos: 69.5,-66.5
       parent: 2
-  - uid: 3168
-    components:
-    - type: Transform
-      pos: 68.5,-66.5
-      parent: 2
-  - uid: 3169
-    components:
-    - type: Transform
-      pos: 68.5,-69.5
-      parent: 2
-  - uid: 3170
-    components:
-    - type: Transform
-      pos: 68.5,-68.5
-      parent: 2
-  - uid: 3171
-    components:
-    - type: Transform
-      pos: 68.5,-67.5
-      parent: 2
   - uid: 3173
     components:
     - type: Transform
       pos: 6.5,-62.5
       parent: 2
-  - uid: 3175
-    components:
-    - type: Transform
-      pos: 68.5,-65.5
-      parent: 2
   - uid: 3176
     components:
     - type: Transform
@@ -117289,45 +122432,10 @@ entities:
     - type: Transform
       pos: 0.5,-71.5
       parent: 2
-  - uid: 3178
-    components:
-    - type: Transform
-      pos: 67.5,-64.5
-      parent: 2
-  - uid: 3179
-    components:
-    - type: Transform
-      pos: 67.5,-63.5
-      parent: 2
-  - uid: 3180
-    components:
-    - type: Transform
-      pos: 67.5,-62.5
-      parent: 2
   - uid: 3181
     components:
     - type: Transform
-      pos: 67.5,-61.5
-      parent: 2
-  - uid: 3187
-    components:
-    - type: Transform
-      pos: 68.5,-59.5
-      parent: 2
-  - uid: 3188
-    components:
-    - type: Transform
-      pos: 69.5,-59.5
-      parent: 2
-  - uid: 3190
-    components:
-    - type: Transform
-      pos: 70.5,-59.5
-      parent: 2
-  - uid: 3193
-    components:
-    - type: Transform
-      pos: 71.5,-60.5
+      pos: 56.5,-66.5
       parent: 2
   - uid: 3195
     components:
@@ -117339,61 +122447,55 @@ entities:
     - type: Transform
       pos: 73.5,-60.5
       parent: 2
-  - uid: 3197
-    components:
-    - type: Transform
-      pos: 75.5,-60.5
-      parent: 2
   - uid: 3198
     components:
     - type: Transform
       pos: 76.5,-59.5
       parent: 2
-  - uid: 3199
+  - uid: 3202
     components:
     - type: Transform
-      pos: 76.5,-60.5
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-28.5
       parent: 2
   - uid: 3203
     components:
     - type: Transform
       pos: 77.5,-60.5
       parent: 2
-  - uid: 3204
+  - uid: 3206
     components:
     - type: Transform
-      pos: 77.5,-61.5
+      pos: 24.5,-17.5
       parent: 2
-  - uid: 3285
+  - uid: 3209
+    components:
+    - type: MetaData
+      name: Visitor Docks APC
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 2
+  - uid: 3234
     components:
     - type: Transform
-      pos: 73.5,-37.5
+      pos: 77.5,-34.5
       parent: 2
   - uid: 3298
     components:
     - type: Transform
       pos: 74.5,-57.5
       parent: 2
-  - uid: 3299
-    components:
-    - type: Transform
-      pos: 75.5,-57.5
-      parent: 2
-  - uid: 3300
-    components:
-    - type: Transform
-      pos: 76.5,-57.5
-      parent: 2
-  - uid: 3362
-    components:
-    - type: Transform
-      pos: 63.5,-65.5
-      parent: 2
   - uid: 3376
     components:
     - type: Transform
       pos: -42.5,-64.5
       parent: 2
+  - uid: 3380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 68.5,-59.5
+      parent: 2
   - uid: 3416
     components:
     - type: Transform
@@ -117404,10 +122506,54 @@ entities:
     - type: Transform
       pos: 77.5,-50.5
       parent: 2
-  - uid: 3418
+  - uid: 3428
     components:
     - type: Transform
-      pos: 75.5,-50.5
+      pos: 67.5,-67.5
+      parent: 2
+  - uid: 3442
+    components:
+    - type: Transform
+      pos: 46.5,-37.5
+      parent: 2
+  - uid: 3454
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 2
+  - uid: 3457
+    components:
+    - type: Transform
+      pos: 55.5,-55.5
+      parent: 2
+  - uid: 3458
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-35.5
+      parent: 2
+  - uid: 3464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-25.5
+      parent: 2
+  - uid: 3466
+    components:
+    - type: Transform
+      pos: 54.5,-46.5
+      parent: 2
+  - uid: 3474
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-25.5
+      parent: 2
+  - uid: 3515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-54.5
       parent: 2
   - uid: 3533
     components:
@@ -117419,36 +122565,6 @@ entities:
     - type: Transform
       pos: 35.5,-46.5
       parent: 2
-  - uid: 3606
-    components:
-    - type: Transform
-      pos: 48.5,-48.5
-      parent: 2
-  - uid: 3607
-    components:
-    - type: Transform
-      pos: 49.5,-48.5
-      parent: 2
-  - uid: 3608
-    components:
-    - type: Transform
-      pos: 50.5,-48.5
-      parent: 2
-  - uid: 3609
-    components:
-    - type: Transform
-      pos: 51.5,-48.5
-      parent: 2
-  - uid: 3613
-    components:
-    - type: Transform
-      pos: 54.5,-47.5
-      parent: 2
-  - uid: 3661
-    components:
-    - type: Transform
-      pos: 27.5,-30.5
-      parent: 2
   - uid: 3662
     components:
     - type: Transform
@@ -117484,75 +122600,10 @@ entities:
     - type: Transform
       pos: 3.5,-22.5
       parent: 2
-  - uid: 3677
-    components:
-    - type: Transform
-      pos: 37.5,-30.5
-      parent: 2
-  - uid: 3678
-    components:
-    - type: Transform
-      pos: 29.5,-32.5
-      parent: 2
-  - uid: 3692
-    components:
-    - type: Transform
-      pos: 37.5,-34.5
-      parent: 2
   - uid: 3693
     components:
     - type: Transform
-      pos: 37.5,-33.5
-      parent: 2
-  - uid: 3694
-    components:
-    - type: Transform
-      pos: 37.5,-32.5
-      parent: 2
-  - uid: 3695
-    components:
-    - type: Transform
-      pos: 29.5,-30.5
-      parent: 2
-  - uid: 3696
-    components:
-    - type: Transform
-      pos: 30.5,-30.5
-      parent: 2
-  - uid: 3698
-    components:
-    - type: Transform
-      pos: 31.5,-30.5
-      parent: 2
-  - uid: 3699
-    components:
-    - type: Transform
-      pos: 32.5,-30.5
-      parent: 2
-  - uid: 3700
-    components:
-    - type: Transform
-      pos: 33.5,-30.5
-      parent: 2
-  - uid: 3701
-    components:
-    - type: Transform
-      pos: 34.5,-30.5
-      parent: 2
-  - uid: 3702
-    components:
-    - type: Transform
-      pos: 35.5,-30.5
-      parent: 2
-  - uid: 3703
-    components:
-    - type: Transform
-      pos: 36.5,-30.5
-      parent: 2
-  - uid: 3704
-    components:
-    - type: Transform
-      pos: 36.5,-28.5
+      pos: 51.5,-25.5
       parent: 2
   - uid: 3705
     components:
@@ -117564,155 +122615,52 @@ entities:
     - type: Transform
       pos: 36.5,-29.5
       parent: 2
-  - uid: 3707
-    components:
-    - type: Transform
-      pos: 37.5,-27.5
-      parent: 2
   - uid: 3708
     components:
     - type: Transform
-      pos: 38.5,-27.5
+      pos: 77.5,-68.5
       parent: 2
   - uid: 3709
     components:
     - type: Transform
-      pos: 39.5,-27.5
-      parent: 2
-  - uid: 3710
-    components:
-    - type: Transform
-      pos: 40.5,-27.5
+      pos: 76.5,-68.5
       parent: 2
   - uid: 3711
     components:
     - type: Transform
-      pos: 41.5,-27.5
+      pos: 58.5,-66.5
       parent: 2
-  - uid: 3713
+  - uid: 3723
     components:
     - type: Transform
-      pos: 50.5,-31.5
-      parent: 2
-  - uid: 3715
-    components:
-    - type: Transform
-      pos: 41.5,-31.5
-      parent: 2
-  - uid: 3716
-    components:
-    - type: Transform
-      pos: 39.5,-30.5
-      parent: 2
-  - uid: 3717
-    components:
-    - type: Transform
-      pos: 39.5,-31.5
-      parent: 2
-  - uid: 3718
-    components:
-    - type: Transform
-      pos: 39.5,-32.5
-      parent: 2
-  - uid: 3720
-    components:
-    - type: Transform
-      pos: 43.5,-30.5
-      parent: 2
-  - uid: 3721
-    components:
-    - type: Transform
-      pos: 43.5,-31.5
-      parent: 2
-  - uid: 3722
-    components:
-    - type: Transform
-      pos: 43.5,-32.5
-      parent: 2
-  - uid: 3724
-    components:
-    - type: Transform
-      pos: 41.5,-33.5
-      parent: 2
-  - uid: 3725
-    components:
-    - type: Transform
-      pos: 39.5,-34.5
-      parent: 2
-  - uid: 3726
-    components:
-    - type: Transform
-      pos: 40.5,-34.5
+      pos: 42.5,-28.5
       parent: 2
   - uid: 3727
     components:
     - type: Transform
-      pos: 41.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-27.5
       parent: 2
   - uid: 3728
     components:
     - type: Transform
-      pos: 42.5,-34.5
-      parent: 2
-  - uid: 3729
-    components:
-    - type: Transform
-      pos: 43.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-28.5
       parent: 2
   - uid: 3730
     components:
     - type: Transform
       pos: 44.5,-34.5
       parent: 2
-  - uid: 3731
-    components:
-    - type: Transform
-      pos: 45.5,-34.5
-      parent: 2
   - uid: 3732
     components:
     - type: Transform
       pos: 46.5,-34.5
       parent: 2
-  - uid: 3733
-    components:
-    - type: Transform
-      pos: 47.5,-34.5
-      parent: 2
-  - uid: 3734
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
-  - uid: 3735
-    components:
-    - type: Transform
-      pos: 45.5,-33.5
-      parent: 2
-  - uid: 3736
-    components:
-    - type: Transform
-      pos: 45.5,-32.5
-      parent: 2
-  - uid: 3737
-    components:
-    - type: Transform
-      pos: 45.5,-35.5
-      parent: 2
   - uid: 3738
     components:
     - type: Transform
-      pos: 45.5,-36.5
-      parent: 2
-  - uid: 3739
-    components:
-    - type: Transform
-      pos: 41.5,-35.5
-      parent: 2
-  - uid: 3740
-    components:
-    - type: Transform
-      pos: 41.5,-36.5
+      pos: 65.5,-63.5
       parent: 2
   - uid: 3743
     components:
@@ -117729,21 +122677,6 @@ entities:
     - type: Transform
       pos: 36.5,-39.5
       parent: 2
-  - uid: 3746
-    components:
-    - type: Transform
-      pos: 39.5,-36.5
-      parent: 2
-  - uid: 3747
-    components:
-    - type: Transform
-      pos: 39.5,-37.5
-      parent: 2
-  - uid: 3748
-    components:
-    - type: Transform
-      pos: 39.5,-38.5
-      parent: 2
   - uid: 3749
     components:
     - type: Transform
@@ -117764,26 +122697,6 @@ entities:
     - type: Transform
       pos: 41.5,-39.5
       parent: 2
-  - uid: 3753
-    components:
-    - type: Transform
-      pos: 42.5,-39.5
-      parent: 2
-  - uid: 3754
-    components:
-    - type: Transform
-      pos: 43.5,-36.5
-      parent: 2
-  - uid: 3755
-    components:
-    - type: Transform
-      pos: 43.5,-37.5
-      parent: 2
-  - uid: 3756
-    components:
-    - type: Transform
-      pos: 43.5,-38.5
-      parent: 2
   - uid: 3757
     components:
     - type: Transform
@@ -117804,416 +122717,36 @@ entities:
     - type: Transform
       pos: 46.5,-39.5
       parent: 2
-  - uid: 3761
-    components:
-    - type: Transform
-      pos: 47.5,-39.5
-      parent: 2
-  - uid: 3762
-    components:
-    - type: Transform
-      pos: 48.5,-39.5
-      parent: 2
-  - uid: 3769
-    components:
-    - type: Transform
-      pos: 49.5,-39.5
-      parent: 2
-  - uid: 3770
-    components:
-    - type: Transform
-      pos: 49.5,-40.5
-      parent: 2
-  - uid: 3771
-    components:
-    - type: Transform
-      pos: 49.5,-41.5
-      parent: 2
-  - uid: 3772
-    components:
-    - type: Transform
-      pos: 49.5,-42.5
-      parent: 2
-  - uid: 3773
-    components:
-    - type: Transform
-      pos: 49.5,-43.5
-      parent: 2
-  - uid: 3774
-    components:
-    - type: Transform
-      pos: 50.5,-43.5
-      parent: 2
-  - uid: 3775
-    components:
-    - type: Transform
-      pos: 53.5,-43.5
-      parent: 2
-  - uid: 3780
-    components:
-    - type: Transform
-      pos: 54.5,-39.5
-      parent: 2
-  - uid: 3781
-    components:
-    - type: Transform
-      pos: 53.5,-39.5
-      parent: 2
-  - uid: 3782
-    components:
-    - type: Transform
-      pos: 52.5,-39.5
-      parent: 2
-  - uid: 3783
-    components:
-    - type: Transform
-      pos: 51.5,-39.5
-      parent: 2
-  - uid: 3784
-    components:
-    - type: Transform
-      pos: 51.5,-38.5
-      parent: 2
-  - uid: 3785
-    components:
-    - type: Transform
-      pos: 51.5,-37.5
-      parent: 2
-  - uid: 3786
-    components:
-    - type: Transform
-      pos: 51.5,-36.5
-      parent: 2
-  - uid: 3787
-    components:
-    - type: Transform
-      pos: 51.5,-35.5
-      parent: 2
-  - uid: 3788
-    components:
-    - type: Transform
-      pos: 51.5,-34.5
-      parent: 2
-  - uid: 3789
-    components:
-    - type: Transform
-      pos: 51.5,-33.5
-      parent: 2
   - uid: 3790
     components:
     - type: Transform
-      pos: 51.5,-32.5
+      pos: 33.5,-31.5
       parent: 2
   - uid: 3791
     components:
     - type: Transform
-      pos: 51.5,-31.5
-      parent: 2
-  - uid: 3794
-    components:
-    - type: Transform
-      pos: 53.5,-35.5
-      parent: 2
-  - uid: 3795
-    components:
-    - type: Transform
-      pos: 54.5,-35.5
-      parent: 2
-  - uid: 3796
-    components:
-    - type: Transform
-      pos: 53.5,-33.5
-      parent: 2
-  - uid: 3797
-    components:
-    - type: Transform
-      pos: 54.5,-33.5
-      parent: 2
-  - uid: 3798
-    components:
-    - type: Transform
-      pos: 55.5,-33.5
-      parent: 2
-  - uid: 3799
-    components:
-    - type: Transform
-      pos: 53.5,-37.5
-      parent: 2
-  - uid: 3800
-    components:
-    - type: Transform
-      pos: 54.5,-37.5
-      parent: 2
-  - uid: 3801
-    components:
-    - type: Transform
-      pos: 55.5,-37.5
-      parent: 2
-  - uid: 3802
-    components:
-    - type: Transform
-      pos: 52.5,-31.5
-      parent: 2
-  - uid: 3803
-    components:
-    - type: Transform
-      pos: 53.5,-31.5
-      parent: 2
-  - uid: 3804
-    components:
-    - type: Transform
-      pos: 54.5,-31.5
+      pos: 29.5,-31.5
       parent: 2
   - uid: 3805
     components:
     - type: Transform
-      pos: 54.5,-30.5
+      pos: 30.5,-31.5
       parent: 2
   - uid: 3806
     components:
     - type: Transform
-      pos: 54.5,-29.5
-      parent: 2
-  - uid: 3807
-    components:
-    - type: Transform
-      pos: 54.5,-28.5
-      parent: 2
-  - uid: 3808
-    components:
-    - type: Transform
-      pos: 53.5,-28.5
-      parent: 2
-  - uid: 3809
-    components:
-    - type: Transform
-      pos: 53.5,-27.5
-      parent: 2
-  - uid: 3814
-    components:
-    - type: Transform
-      pos: 49.5,-28.5
-      parent: 2
-  - uid: 3815
-    components:
-    - type: Transform
-      pos: 42.5,-27.5
-      parent: 2
-  - uid: 3817
-    components:
-    - type: Transform
-      pos: 43.5,-27.5
-      parent: 2
-  - uid: 3820
-    components:
-    - type: Transform
-      pos: 42.5,-31.5
-      parent: 2
-  - uid: 3821
-    components:
-    - type: Transform
-      pos: 46.5,-30.5
-      parent: 2
-  - uid: 3822
-    components:
-    - type: Transform
-      pos: 45.5,-30.5
-      parent: 2
-  - uid: 3823
-    components:
-    - type: Transform
-      pos: 45.5,-29.5
-      parent: 2
-  - uid: 3824
-    components:
-    - type: Transform
-      pos: 45.5,-28.5
-      parent: 2
-  - uid: 3825
-    components:
-    - type: Transform
-      pos: 45.5,-27.5
-      parent: 2
-  - uid: 3826
-    components:
-    - type: Transform
-      pos: 45.5,-26.5
-      parent: 2
-  - uid: 3827
-    components:
-    - type: Transform
-      pos: 45.5,-24.5
-      parent: 2
-  - uid: 3828
-    components:
-    - type: Transform
-      pos: 46.5,-24.5
-      parent: 2
-  - uid: 3830
-    components:
-    - type: Transform
-      pos: 47.5,-25.5
-      parent: 2
-  - uid: 3837
-    components:
-    - type: Transform
-      pos: 51.5,-25.5
-      parent: 2
-  - uid: 3838
-    components:
-    - type: Transform
-      pos: 52.5,-25.5
-      parent: 2
-  - uid: 3839
-    components:
-    - type: Transform
-      pos: 53.5,-25.5
-      parent: 2
-  - uid: 3840
-    components:
-    - type: Transform
-      pos: 54.5,-25.5
-      parent: 2
-  - uid: 3841
-    components:
-    - type: Transform
-      pos: 55.5,-25.5
+      pos: 35.5,-31.5
       parent: 2
   - uid: 3842
     components:
     - type: Transform
       pos: 47.5,-30.5
       parent: 2
-  - uid: 3846
-    components:
-    - type: Transform
-      pos: 43.5,-24.5
-      parent: 2
-  - uid: 3847
-    components:
-    - type: Transform
-      pos: 42.5,-25.5
-      parent: 2
-  - uid: 3848
-    components:
-    - type: Transform
-      pos: 41.5,-25.5
-      parent: 2
-  - uid: 3849
-    components:
-    - type: Transform
-      pos: 40.5,-25.5
-      parent: 2
-  - uid: 3850
-    components:
-    - type: Transform
-      pos: 39.5,-25.5
-      parent: 2
-  - uid: 3851
-    components:
-    - type: Transform
-      pos: 38.5,-25.5
-      parent: 2
-  - uid: 3852
-    components:
-    - type: Transform
-      pos: 37.5,-25.5
-      parent: 2
-  - uid: 3853
-    components:
-    - type: Transform
-      pos: 27.5,-24.5
-      parent: 2
-  - uid: 3854
-    components:
-    - type: Transform
-      pos: 29.5,-24.5
-      parent: 2
-  - uid: 3855
-    components:
-    - type: Transform
-      pos: 30.5,-24.5
-      parent: 2
-  - uid: 3856
-    components:
-    - type: Transform
-      pos: 31.5,-24.5
-      parent: 2
-  - uid: 3857
-    components:
-    - type: Transform
-      pos: 32.5,-24.5
-      parent: 2
-  - uid: 3858
-    components:
-    - type: Transform
-      pos: 33.5,-24.5
-      parent: 2
-  - uid: 3859
-    components:
-    - type: Transform
-      pos: 34.5,-24.5
-      parent: 2
-  - uid: 3860
-    components:
-    - type: Transform
-      pos: 35.5,-24.5
-      parent: 2
-  - uid: 3861
-    components:
-    - type: Transform
-      pos: 36.5,-24.5
-      parent: 2
   - uid: 3862
     components:
     - type: Transform
       pos: 36.5,-25.5
       parent: 2
-  - uid: 3863
-    components:
-    - type: Transform
-      pos: 48.5,-46.5
-      parent: 2
-  - uid: 3864
-    components:
-    - type: Transform
-      pos: 49.5,-46.5
-      parent: 2
-  - uid: 3865
-    components:
-    - type: Transform
-      pos: 49.5,-45.5
-      parent: 2
-  - uid: 3866
-    components:
-    - type: Transform
-      pos: 50.5,-45.5
-      parent: 2
-  - uid: 3867
-    components:
-    - type: Transform
-      pos: 53.5,-45.5
-      parent: 2
-  - uid: 3868
-    components:
-    - type: Transform
-      pos: 54.5,-45.5
-      parent: 2
-  - uid: 3869
-    components:
-    - type: Transform
-      pos: 55.5,-45.5
-      parent: 2
-  - uid: 3882
-    components:
-    - type: Transform
-      pos: 40.5,-31.5
-      parent: 2
-  - uid: 3898
-    components:
-    - type: Transform
-      pos: 72.5,-30.5
-      parent: 2
   - uid: 3899
     components:
     - type: Transform
@@ -118224,71 +122757,16 @@ entities:
     - type: Transform
       pos: 74.5,-30.5
       parent: 2
-  - uid: 3901
-    components:
-    - type: Transform
-      pos: 74.5,-31.5
-      parent: 2
-  - uid: 3902
-    components:
-    - type: Transform
-      pos: 74.5,-32.5
-      parent: 2
-  - uid: 3903
-    components:
-    - type: Transform
-      pos: 74.5,-33.5
-      parent: 2
-  - uid: 3904
-    components:
-    - type: Transform
-      pos: 75.5,-33.5
-      parent: 2
-  - uid: 3905
-    components:
-    - type: Transform
-      pos: 76.5,-33.5
-      parent: 2
   - uid: 3906
     components:
     - type: Transform
       pos: 77.5,-33.5
       parent: 2
-  - uid: 3907
-    components:
-    - type: Transform
-      pos: 78.5,-33.5
-      parent: 2
-  - uid: 3908
-    components:
-    - type: Transform
-      pos: 77.5,-34.5
-      parent: 2
-  - uid: 3910
-    components:
-    - type: Transform
-      pos: 73.5,-36.5
-      parent: 2
-  - uid: 3922
-    components:
-    - type: Transform
-      pos: 78.5,-30.5
-      parent: 2
   - uid: 3923
     components:
     - type: Transform
       pos: 77.5,-30.5
       parent: 2
-  - uid: 3924
-    components:
-    - type: Transform
-      pos: 77.5,-31.5
-      parent: 2
-  - uid: 3925
-    components:
-    - type: Transform
-      pos: 76.5,-31.5
-      parent: 2
   - uid: 3943
     components:
     - type: Transform
@@ -118304,11 +122782,6 @@ entities:
     - type: Transform
       pos: 71.5,-25.5
       parent: 2
-  - uid: 3950
-    components:
-    - type: Transform
-      pos: 71.5,-28.5
-      parent: 2
   - uid: 3951
     components:
     - type: Transform
@@ -118332,12 +122805,7 @@ entities:
   - uid: 3962
     components:
     - type: Transform
-      pos: 78.5,-25.5
-      parent: 2
-  - uid: 3963
-    components:
-    - type: Transform
-      pos: 79.5,-25.5
+      pos: 45.5,-45.5
       parent: 2
   - uid: 3964
     components:
@@ -118372,13 +122840,36 @@ entities:
   - uid: 4081
     components:
     - type: Transform
-      pos: 75.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-35.5
+      parent: 2
+  - uid: 4137
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-35.5
+      parent: 2
+  - uid: 4138
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-35.5
+      parent: 2
+  - uid: 4168
+    components:
+    - type: Transform
+      pos: 78.5,-67.5
       parent: 2
   - uid: 4179
     components:
     - type: Transform
       pos: -64.5,-26.5
       parent: 2
+  - uid: 4185
+    components:
+    - type: Transform
+      pos: 71.5,-69.5
+      parent: 2
   - uid: 4263
     components:
     - type: Transform
@@ -118404,6 +122895,11 @@ entities:
     - type: Transform
       pos: 7.5,-77.5
       parent: 2
+  - uid: 4492
+    components:
+    - type: Transform
+      pos: 42.5,-31.5
+      parent: 2
   - uid: 4541
     components:
     - type: Transform
@@ -118562,7 +123058,8 @@ entities:
   - uid: 4603
     components:
     - type: Transform
-      pos: 46.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: 43.5,-35.5
       parent: 2
   - uid: 4604
     components:
@@ -118594,26 +123091,6 @@ entities:
     - type: Transform
       pos: 45.5,-40.5
       parent: 2
-  - uid: 4623
-    components:
-    - type: Transform
-      pos: 45.5,-41.5
-      parent: 2
-  - uid: 4636
-    components:
-    - type: Transform
-      pos: 45.5,-42.5
-      parent: 2
-  - uid: 4637
-    components:
-    - type: Transform
-      pos: 45.5,-44.5
-      parent: 2
-  - uid: 4638
-    components:
-    - type: Transform
-      pos: 45.5,-45.5
-      parent: 2
   - uid: 4705
     components:
     - type: Transform
@@ -118634,26 +123111,6 @@ entities:
     - type: Transform
       pos: -60.5,-25.5
       parent: 2
-  - uid: 4919
-    components:
-    - type: Transform
-      pos: 48.5,-26.5
-      parent: 2
-  - uid: 4920
-    components:
-    - type: Transform
-      pos: 50.5,-26.5
-      parent: 2
-  - uid: 4925
-    components:
-    - type: Transform
-      pos: 49.5,-26.5
-      parent: 2
-  - uid: 4926
-    components:
-    - type: Transform
-      pos: 51.5,-26.5
-      parent: 2
   - uid: 5002
     components:
     - type: Transform
@@ -118674,35 +123131,41 @@ entities:
     - type: Transform
       pos: 9.5,-76.5
       parent: 2
-  - uid: 5110
+  - uid: 5254
     components:
     - type: Transform
-      pos: 22.5,-19.5
-      parent: 2
-  - uid: 5142
-    components:
-    - type: Transform
-      pos: 21.5,-25.5
-      parent: 2
-  - uid: 5202
-    components:
-    - type: Transform
-      pos: 21.5,-24.5
+      rot: 3.141592653589793 rad
+      pos: 40.5,-35.5
       parent: 2
   - uid: 5303
     components:
     - type: Transform
       pos: 47.5,-28.5
       parent: 2
-  - uid: 5304
+  - uid: 5316
     components:
     - type: Transform
-      pos: 48.5,-28.5
+      pos: 78.5,-68.5
       parent: 2
-  - uid: 5305
+  - uid: 5317
     components:
     - type: Transform
-      pos: 46.5,-28.5
+      pos: 68.5,-69.5
+      parent: 2
+  - uid: 5328
+    components:
+    - type: Transform
+      pos: 47.5,-49.5
+      parent: 2
+  - uid: 5330
+    components:
+    - type: Transform
+      pos: 47.5,-48.5
+      parent: 2
+  - uid: 5392
+    components:
+    - type: Transform
+      pos: 71.5,-66.5
       parent: 2
   - uid: 5393
     components:
@@ -118714,30 +123177,34 @@ entities:
     - type: Transform
       pos: 7.5,-76.5
       parent: 2
-  - uid: 5731
+  - uid: 5433
     components:
     - type: Transform
-      pos: 58.5,-65.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-73.5
+      parent: 2
+  - uid: 5444
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-21.5
+      parent: 2
+  - uid: 5730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-72.5
       parent: 2
   - uid: 5782
     components:
     - type: Transform
       pos: 7.5,-79.5
       parent: 2
-  - uid: 5812
+  - uid: 5896
     components:
     - type: Transform
-      pos: 68.5,-64.5
-      parent: 2
-  - uid: 5834
-    components:
-    - type: Transform
-      pos: 68.5,-60.5
-      parent: 2
-  - uid: 6012
-    components:
-    - type: Transform
-      pos: 36.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-35.5
       parent: 2
   - uid: 6015
     components:
@@ -118759,6 +123226,11 @@ entities:
     - type: Transform
       pos: -32.5,-22.5
       parent: 2
+  - uid: 6047
+    components:
+    - type: Transform
+      pos: 36.5,-31.5
+      parent: 2
   - uid: 6059
     components:
     - type: Transform
@@ -118774,10 +123246,15 @@ entities:
     - type: Transform
       pos: -31.5,-27.5
       parent: 2
+  - uid: 6098
+    components:
+    - type: Transform
+      pos: 34.5,-31.5
+      parent: 2
   - uid: 6117
     components:
     - type: Transform
-      pos: 62.5,-65.5
+      pos: 47.5,-45.5
       parent: 2
   - uid: 6119
     components:
@@ -118787,7 +123264,28 @@ entities:
   - uid: 6124
     components:
     - type: Transform
-      pos: 60.5,-64.5
+      pos: 49.5,-46.5
+      parent: 2
+  - uid: 6128
+    components:
+    - type: Transform
+      pos: 60.5,-63.5
+      parent: 2
+  - uid: 6132
+    components:
+    - type: Transform
+      pos: 66.5,-70.5
+      parent: 2
+  - uid: 6136
+    components:
+    - type: Transform
+      pos: 63.5,-63.5
+      parent: 2
+  - uid: 6230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-33.5
       parent: 2
   - uid: 6250
     components:
@@ -118795,30 +123293,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-17.5
       parent: 2
-  - uid: 6270
+  - uid: 6268
     components:
     - type: Transform
-      pos: 73.5,-34.5
-      parent: 2
-  - uid: 6272
-    components:
-    - type: Transform
-      pos: 74.5,-36.5
-      parent: 2
-  - uid: 6277
-    components:
-    - type: Transform
-      pos: 76.5,-37.5
-      parent: 2
-  - uid: 6279
-    components:
-    - type: Transform
-      pos: 75.5,-37.5
-      parent: 2
-  - uid: 6288
-    components:
-    - type: Transform
-      pos: 78.5,-37.5
+      pos: 74.5,-34.5
       parent: 2
   - uid: 6296
     components:
@@ -118835,60 +123313,159 @@ entities:
     - type: Transform
       pos: 78.5,-29.5
       parent: 2
-  - uid: 6299
+  - uid: 6368
     components:
     - type: Transform
-      pos: 78.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-31.5
       parent: 2
-  - uid: 6629
+  - uid: 6371
     components:
     - type: Transform
-      pos: 50.5,-28.5
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-27.5
+      parent: 2
+  - uid: 6375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-32.5
+      parent: 2
+  - uid: 6376
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-31.5
+      parent: 2
+  - uid: 6377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-38.5
+      parent: 2
+  - uid: 6378
+    components:
+    - type: Transform
+      pos: 76.5,-69.5
+      parent: 2
+  - uid: 6383
+    components:
+    - type: Transform
+      pos: 67.5,-61.5
+      parent: 2
+  - uid: 6385
+    components:
+    - type: Transform
+      pos: 72.5,-63.5
+      parent: 2
+  - uid: 6391
+    components:
+    - type: Transform
+      pos: 36.5,-26.5
+      parent: 2
+  - uid: 6392
+    components:
+    - type: Transform
+      pos: 40.5,-29.5
+      parent: 2
+  - uid: 6393
+    components:
+    - type: Transform
+      pos: 41.5,-29.5
+      parent: 2
+  - uid: 6394
+    components:
+    - type: Transform
+      pos: 39.5,-29.5
+      parent: 2
+  - uid: 6395
+    components:
+    - type: Transform
+      pos: 38.5,-29.5
+      parent: 2
+  - uid: 6399
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-25.5
+      parent: 2
+  - uid: 6612
+    components:
+    - type: Transform
+      pos: 60.5,-65.5
+      parent: 2
+  - uid: 6657
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-20.5
       parent: 2
   - uid: 7006
     components:
     - type: Transform
       pos: 35.5,-40.5
       parent: 2
-  - uid: 7113
+  - uid: 7048
     components:
     - type: Transform
-      pos: 77.5,-35.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-21.5
+      parent: 2
+  - uid: 7097
+    components:
+    - type: Transform
+      pos: 3.5,-60.5
       parent: 2
   - uid: 7115
     components:
     - type: Transform
       pos: 76.5,-28.5
       parent: 2
-  - uid: 7130
+  - uid: 7124
     components:
     - type: Transform
-      pos: 55.5,-47.5
+      pos: 35.5,-25.5
+      parent: 2
+  - uid: 7141
+    components:
+    - type: Transform
+      pos: 46.5,-36.5
       parent: 2
   - uid: 7144
     components:
     - type: Transform
-      pos: 61.5,-64.5
+      pos: 78.5,-61.5
       parent: 2
   - uid: 7147
     components:
     - type: Transform
       pos: 44.5,-77.5
       parent: 2
-  - uid: 7186
+  - uid: 7164
     components:
     - type: Transform
-      pos: 61.5,-73.5
+      rot: 1.5707963267948966 rad
+      pos: 47.5,-26.5
       parent: 2
   - uid: 7188
     components:
     - type: Transform
       pos: 79.5,-24.5
       parent: 2
+  - uid: 7192
+    components:
+    - type: Transform
+      pos: 55.5,-54.5
+      parent: 2
+  - uid: 7196
+    components:
+    - type: Transform
+      pos: 53.5,-47.5
+      parent: 2
   - uid: 7233
     components:
     - type: Transform
-      pos: 52.5,-28.5
+      pos: 31.5,-31.5
       parent: 2
   - uid: 7290
     components:
@@ -118900,76 +123477,435 @@ entities:
     - type: Transform
       pos: -15.5,-41.5
       parent: 2
-  - uid: 7997
+  - uid: 7340
     components:
     - type: Transform
-      pos: 58.5,-64.5
+      pos: 26.5,-26.5
+      parent: 2
+  - uid: 7410
+    components:
+    - type: Transform
+      pos: 78.5,-66.5
+      parent: 2
+  - uid: 7414
+    components:
+    - type: Transform
+      pos: 78.5,-64.5
+      parent: 2
+  - uid: 7419
+    components:
+    - type: Transform
+      pos: 78.5,-65.5
+      parent: 2
+  - uid: 7537
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-14.5
+      parent: 2
+  - uid: 7567
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-36.5
+      parent: 2
+  - uid: 7578
+    components:
+    - type: Transform
+      pos: 34.5,-25.5
+      parent: 2
+  - uid: 7581
+    components:
+    - type: Transform
+      pos: 46.5,-38.5
+      parent: 2
+  - uid: 7583
+    components:
+    - type: Transform
+      pos: 33.5,-25.5
+      parent: 2
+  - uid: 7584
+    components:
+    - type: Transform
+      pos: 32.5,-25.5
+      parent: 2
+  - uid: 7603
+    components:
+    - type: Transform
+      pos: 37.5,-29.5
+      parent: 2
+  - uid: 7610
+    components:
+    - type: Transform
+      pos: 76.5,-37.5
+      parent: 2
+  - uid: 7613
+    components:
+    - type: Transform
+      pos: 78.5,-32.5
+      parent: 2
+  - uid: 7617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-41.5
+      parent: 2
+  - uid: 7705
+    components:
+    - type: Transform
+      pos: 62.5,-62.5
+      parent: 2
+  - uid: 7725
+    components:
+    - type: Transform
+      pos: 72.5,-61.5
+      parent: 2
+  - uid: 7726
+    components:
+    - type: Transform
+      pos: 41.5,-28.5
+      parent: 2
+  - uid: 7730
+    components:
+    - type: Transform
+      pos: 66.5,-61.5
+      parent: 2
+  - uid: 7733
+    components:
+    - type: Transform
+      pos: 53.5,-53.5
+      parent: 2
+  - uid: 7734
+    components:
+    - type: Transform
+      pos: 53.5,-52.5
+      parent: 2
+  - uid: 7736
+    components:
+    - type: Transform
+      pos: 53.5,-50.5
+      parent: 2
+  - uid: 7740
+    components:
+    - type: Transform
+      pos: 53.5,-49.5
+      parent: 2
+  - uid: 7762
+    components:
+    - type: Transform
+      pos: 65.5,-61.5
+      parent: 2
+  - uid: 7784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-20.5
+      parent: 2
+  - uid: 7785
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-18.5
+      parent: 2
+  - uid: 7793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-26.5
+      parent: 2
+  - uid: 7797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-25.5
+      parent: 2
+  - uid: 7909
+    components:
+    - type: Transform
+      pos: 79.5,-27.5
+      parent: 2
+  - uid: 7948
+    components:
+    - type: Transform
+      pos: 76.5,-55.5
+      parent: 2
+  - uid: 8036
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-35.5
       parent: 2
   - uid: 8042
     components:
     - type: Transform
-      pos: 53.5,-41.5
+      pos: 66.5,-67.5
+      parent: 2
+  - uid: 8043
+    components:
+    - type: Transform
+      pos: 49.5,-45.5
+      parent: 2
+  - uid: 8115
+    components:
+    - type: Transform
+      pos: 56.5,-55.5
+      parent: 2
+  - uid: 8124
+    components:
+    - type: Transform
+      pos: 54.5,-53.5
+      parent: 2
+  - uid: 8129
+    components:
+    - type: Transform
+      pos: 57.5,-56.5
+      parent: 2
+  - uid: 8131
+    components:
+    - type: Transform
+      pos: 57.5,-55.5
       parent: 2
   - uid: 8343
     components:
     - type: Transform
       pos: -6.5,-70.5
       parent: 2
-  - uid: 8629
+  - uid: 8384
     components:
     - type: Transform
-      pos: 51.5,-28.5
+      pos: 68.5,-67.5
+      parent: 2
+  - uid: 8386
+    components:
+    - type: Transform
+      pos: 68.5,-58.5
+      parent: 2
+  - uid: 8392
+    components:
+    - type: Transform
+      pos: 70.5,-58.5
+      parent: 2
+  - uid: 8394
+    components:
+    - type: Transform
+      pos: 39.5,-35.5
+      parent: 2
+  - uid: 8395
+    components:
+    - type: Transform
+      pos: 39.5,-38.5
+      parent: 2
+  - uid: 8419
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-41.5
+      parent: 2
+  - uid: 8423
+    components:
+    - type: Transform
+      pos: 69.5,-58.5
+      parent: 2
+  - uid: 8448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-71.5
+      parent: 2
+  - uid: 8454
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-71.5
+      parent: 2
+  - uid: 8512
+    components:
+    - type: Transform
+      pos: 70.5,-61.5
+      parent: 2
+  - uid: 8513
+    components:
+    - type: Transform
+      pos: 70.5,-60.5
+      parent: 2
+  - uid: 8514
+    components:
+    - type: Transform
+      pos: 70.5,-59.5
+      parent: 2
+  - uid: 8630
+    components:
+    - type: Transform
+      pos: 54.5,-47.5
       parent: 2
   - uid: 8704
     components:
     - type: Transform
       pos: -31.5,-54.5
       parent: 2
-  - uid: 9311
+  - uid: 8813
     components:
     - type: Transform
-      pos: 63.5,-62.5
-      parent: 2
-  - uid: 9317
-    components:
-    - type: Transform
-      pos: 58.5,-72.5
-      parent: 2
-  - uid: 9322
-    components:
-    - type: Transform
-      pos: 57.5,-72.5
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-25.5
       parent: 2
   - uid: 9328
     components:
     - type: Transform
       pos: 65.5,-64.5
       parent: 2
-  - uid: 9329
+  - uid: 9342
     components:
     - type: Transform
-      pos: 65.5,-65.5
+      pos: 61.5,-61.5
       parent: 2
-  - uid: 10393
+  - uid: 9345
     components:
     - type: Transform
-      pos: 52.5,-48.5
+      pos: 60.5,-61.5
       parent: 2
-  - uid: 10415
+  - uid: 9349
     components:
     - type: Transform
-      pos: 74.5,-50.5
+      pos: 70.5,-25.5
+      parent: 2
+  - uid: 9359
+    components:
+    - type: Transform
+      pos: 58.5,-61.5
+      parent: 2
+  - uid: 9360
+    components:
+    - type: Transform
+      pos: 58.5,-58.5
+      parent: 2
+  - uid: 9372
+    components:
+    - type: Transform
+      pos: 57.5,-61.5
+      parent: 2
+  - uid: 9373
+    components:
+    - type: Transform
+      pos: 59.5,-61.5
+      parent: 2
+  - uid: 9408
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-25.5
+      parent: 2
+  - uid: 9411
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-25.5
+      parent: 2
+  - uid: 9420
+    components:
+    - type: Transform
+      pos: 32.5,-31.5
+      parent: 2
+  - uid: 9635
+    components:
+    - type: Transform
+      pos: 63.5,-57.5
+      parent: 2
+  - uid: 9636
+    components:
+    - type: Transform
+      pos: 63.5,-59.5
+      parent: 2
+  - uid: 9637
+    components:
+    - type: Transform
+      pos: 63.5,-58.5
+      parent: 2
+  - uid: 9638
+    components:
+    - type: Transform
+      pos: 64.5,-57.5
+      parent: 2
+  - uid: 9643
+    components:
+    - type: Transform
+      pos: 57.5,-58.5
+      parent: 2
+  - uid: 9666
+    components:
+    - type: Transform
+      pos: 62.5,-58.5
+      parent: 2
+  - uid: 9672
+    components:
+    - type: Transform
+      pos: 61.5,-58.5
+      parent: 2
+  - uid: 9673
+    components:
+    - type: Transform
+      pos: 59.5,-58.5
+      parent: 2
+  - uid: 10291
+    components:
+    - type: Transform
+      pos: 73.5,-59.5
+      parent: 2
+  - uid: 10334
+    components:
+    - type: Transform
+      pos: 72.5,-62.5
+      parent: 2
+  - uid: 10425
+    components:
+    - type: Transform
+      pos: 63.5,-62.5
+      parent: 2
+  - uid: 10426
+    components:
+    - type: Transform
+      pos: 60.5,-62.5
+      parent: 2
+  - uid: 10436
+    components:
+    - type: Transform
+      pos: 65.5,-66.5
+      parent: 2
+  - uid: 10448
+    components:
+    - type: Transform
+      pos: 78.5,-55.5
+      parent: 2
+  - uid: 10503
+    components:
+    - type: Transform
+      pos: 76.5,-56.5
+      parent: 2
+  - uid: 10707
+    components:
+    - type: Transform
+      pos: 78.5,-63.5
+      parent: 2
+  - uid: 10717
+    components:
+    - type: Transform
+      pos: 75.5,-55.5
+      parent: 2
+  - uid: 10790
+    components:
+    - type: Transform
+      pos: 49.5,-42.5
+      parent: 2
+  - uid: 10804
+    components:
+    - type: Transform
+      pos: 52.5,-42.5
       parent: 2
   - uid: 10887
     components:
     - type: Transform
       pos: -31.5,-16.5
       parent: 2
-  - uid: 11261
-    components:
-    - type: Transform
-      pos: 77.5,-40.5
-      parent: 2
   - uid: 11428
     components:
     - type: Transform
@@ -118980,45 +123916,257 @@ entities:
     - type: Transform
       pos: 52.5,-75.5
       parent: 2
-  - uid: 11696
+  - uid: 11842
     components:
     - type: Transform
-      pos: 67.5,-60.5
+      pos: 27.5,-26.5
       parent: 2
-  - uid: 11937
+  - uid: 11843
     components:
     - type: Transform
-      pos: 65.5,-67.5
+      pos: 27.5,-25.5
+      parent: 2
+  - uid: 11854
+    components:
+    - type: Transform
+      pos: 74.5,-55.5
+      parent: 2
+  - uid: 11856
+    components:
+    - type: Transform
+      pos: 75.5,-69.5
+      parent: 2
+  - uid: 11857
+    components:
+    - type: Transform
+      pos: 74.5,-69.5
+      parent: 2
+  - uid: 11863
+    components:
+    - type: Transform
+      pos: 73.5,-69.5
+      parent: 2
+  - uid: 11864
+    components:
+    - type: Transform
+      pos: 71.5,-68.5
+      parent: 2
+  - uid: 11868
+    components:
+    - type: Transform
+      pos: 72.5,-65.5
+      parent: 2
+  - uid: 11886
+    components:
+    - type: Transform
+      pos: 68.5,-68.5
+      parent: 2
+  - uid: 11887
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-67.5
+      parent: 2
+  - uid: 11890
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-63.5
+      parent: 2
+  - uid: 11891
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-61.5
+      parent: 2
+  - uid: 11892
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-65.5
+      parent: 2
+  - uid: 11893
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-64.5
+      parent: 2
+  - uid: 11895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 68.5,-60.5
+      parent: 2
+  - uid: 11898
+    components:
+    - type: Transform
+      pos: 75.5,-59.5
+      parent: 2
+  - uid: 11900
+    components:
+    - type: Transform
+      pos: 78.5,-60.5
+      parent: 2
+  - uid: 11904
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-66.5
+      parent: 2
+  - uid: 11906
+    components:
+    - type: Transform
+      pos: 49.5,-49.5
+      parent: 2
+  - uid: 11907
+    components:
+    - type: Transform
+      pos: 48.5,-49.5
+      parent: 2
+  - uid: 11912
+    components:
+    - type: Transform
+      pos: 36.5,-30.5
+      parent: 2
+  - uid: 12408
+    components:
+    - type: Transform
+      pos: 6.5,-72.5
       parent: 2
   - uid: 12473
     components:
     - type: Transform
       pos: -7.5,-46.5
       parent: 2
-  - uid: 12972
+  - uid: 12747
     components:
     - type: Transform
-      pos: 43.5,-28.5
+      pos: -37.5,-74.5
+      parent: 2
+  - uid: 12801
+    components:
+    - type: Transform
+      pos: 44.5,-31.5
+      parent: 2
+  - uid: 12841
+    components:
+    - type: Transform
+      pos: 46.5,-31.5
+      parent: 2
+  - uid: 12957
+    components:
+    - type: Transform
+      pos: 44.5,-30.5
+      parent: 2
+  - uid: 12959
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-28.5
+      parent: 2
+  - uid: 12961
+    components:
+    - type: Transform
+      pos: 44.5,-29.5
       parent: 2
   - uid: 12973
     components:
     - type: Transform
-      pos: 43.5,-29.5
+      pos: 42.5,-25.5
+      parent: 2
+  - uid: 12974
+    components:
+    - type: Transform
+      pos: 37.5,-26.5
       parent: 2
   - uid: 12975
     components:
     - type: Transform
-      pos: 47.5,-31.5
+      pos: 41.5,-26.5
+      parent: 2
+  - uid: 12976
+    components:
+    - type: Transform
+      pos: 40.5,-26.5
+      parent: 2
+  - uid: 12977
+    components:
+    - type: Transform
+      pos: 39.5,-26.5
+      parent: 2
+  - uid: 12978
+    components:
+    - type: Transform
+      pos: 38.5,-26.5
+      parent: 2
+  - uid: 12981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-31.5
+      parent: 2
+  - uid: 12983
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-31.5
       parent: 2
   - uid: 12990
     components:
     - type: Transform
-      pos: 48.5,-31.5
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-31.5
+      parent: 2
+  - uid: 12991
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-30.5
+      parent: 2
+  - uid: 12993
+    components:
+    - type: Transform
+      pos: 76.5,-32.5
+      parent: 2
+  - uid: 13650
+    components:
+    - type: Transform
+      pos: 75.5,-32.5
+      parent: 2
+  - uid: 13838
+    components:
+    - type: Transform
+      pos: 47.5,-47.5
+      parent: 2
+  - uid: 13850
+    components:
+    - type: Transform
+      pos: 45.5,-42.5
+      parent: 2
+  - uid: 13856
+    components:
+    - type: Transform
+      pos: 45.5,-44.5
+      parent: 2
+  - uid: 13858
+    components:
+    - type: Transform
+      pos: 45.5,-43.5
+      parent: 2
+  - uid: 13859
+    components:
+    - type: Transform
+      pos: 45.5,-41.5
       parent: 2
   - uid: 13873
     components:
     - type: Transform
-      pos: 48.5,-50.5
+      pos: 47.5,-27.5
+      parent: 2
+  - uid: 13874
+    components:
+    - type: Transform
+      pos: 45.5,-25.5
       parent: 2
   - uid: 13876
     components:
@@ -119043,32 +124191,71 @@ entities:
   - uid: 13908
     components:
     - type: Transform
-      pos: 62.5,-73.5
+      rot: 3.141592653589793 rad
+      pos: 68.5,-61.5
+      parent: 2
+  - uid: 13909
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-33.5
+      parent: 2
+  - uid: 14046
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-38.5
+      parent: 2
+  - uid: 14093
+    components:
+    - type: Transform
+      pos: 77.5,-32.5
       parent: 2
   - uid: 14104
     components:
     - type: Transform
       pos: 4.5,-64.5
       parent: 2
-  - uid: 14200
+  - uid: 14144
     components:
     - type: Transform
-      pos: 53.5,-42.5
+      pos: 50.5,-42.5
       parent: 2
   - uid: 14246
     components:
     - type: Transform
       pos: 80.5,-24.5
       parent: 2
+  - uid: 14256
+    components:
+    - type: Transform
+      pos: 49.5,-44.5
+      parent: 2
   - uid: 14259
     components:
     - type: Transform
       pos: 49.5,-54.5
       parent: 2
-  - uid: 14266
+  - uid: 14296
     components:
     - type: Transform
-      pos: 63.5,-66.5
+      pos: 49.5,-43.5
+      parent: 2
+  - uid: 14323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-62.5
+      parent: 2
+  - uid: 14329
+    components:
+    - type: Transform
+      pos: 65.5,-67.5
+      parent: 2
+  - uid: 14330
+    components:
+    - type: Transform
+      pos: 50.5,-25.5
       parent: 2
   - uid: 14405
     components:
@@ -119085,11 +124272,6 @@ entities:
     - type: Transform
       pos: 2.5,-71.5
       parent: 2
-  - uid: 14622
-    components:
-    - type: Transform
-      pos: 21.5,-15.5
-      parent: 2
   - uid: 14686
     components:
     - type: Transform
@@ -119105,11 +124287,6 @@ entities:
     - type: Transform
       pos: 52.5,-74.5
       parent: 2
-  - uid: 14731
-    components:
-    - type: Transform
-      pos: 54.5,-43.5
-      parent: 2
   - uid: 14740
     components:
     - type: Transform
@@ -119145,11 +124322,31 @@ entities:
     - type: Transform
       pos: -1.5,-71.5
       parent: 2
+  - uid: 14919
+    components:
+    - type: Transform
+      pos: 73.5,-34.5
+      parent: 2
   - uid: 15101
     components:
     - type: Transform
       pos: 1.5,-71.5
       parent: 2
+  - uid: 15126
+    components:
+    - type: Transform
+      pos: 78.5,-62.5
+      parent: 2
+  - uid: 15160
+    components:
+    - type: Transform
+      pos: 73.5,-70.5
+      parent: 2
+  - uid: 15161
+    components:
+    - type: Transform
+      pos: 71.5,-67.5
+      parent: 2
   - uid: 15235
     components:
     - type: Transform
@@ -119170,11 +124367,6 @@ entities:
     - type: Transform
       pos: 77.5,-24.5
       parent: 2
-  - uid: 15433
-    components:
-    - type: Transform
-      pos: 68.5,-58.5
-      parent: 2
   - uid: 15612
     components:
     - type: Transform
@@ -119185,16 +124377,6 @@ entities:
     - type: Transform
       pos: 11.5,-74.5
       parent: 2
-  - uid: 16021
-    components:
-    - type: Transform
-      pos: 76.5,-39.5
-      parent: 2
-  - uid: 16022
-    components:
-    - type: Transform
-      pos: 76.5,-40.5
-      parent: 2
   - uid: 16023
     components:
     - type: Transform
@@ -119220,46 +124402,17 @@ entities:
     - type: Transform
       pos: 47.5,-50.5
       parent: 2
-  - uid: 16269
+  - uid: 16264
     components:
     - type: Transform
-      pos: 53.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: 59.5,-60.5
       parent: 2
   - uid: 16300
     components:
     - type: Transform
       pos: 11.5,-76.5
       parent: 2
-  - uid: 16568
-    components:
-    - type: Transform
-      pos: 57.5,-71.5
-      parent: 2
-  - uid: 16585
-    components:
-    - type: Transform
-      pos: 57.5,-69.5
-      parent: 2
-  - uid: 16586
-    components:
-    - type: Transform
-      pos: 57.5,-68.5
-      parent: 2
-  - uid: 16587
-    components:
-    - type: Transform
-      pos: 62.5,-72.5
-      parent: 2
-  - uid: 16588
-    components:
-    - type: Transform
-      pos: 60.5,-74.5
-      parent: 2
-  - uid: 16589
-    components:
-    - type: Transform
-      pos: 60.5,-73.5
-      parent: 2
   - uid: 16604
     components:
     - type: Transform
@@ -119280,31 +124433,11 @@ entities:
     - type: Transform
       pos: 63.5,-72.5
       parent: 2
-  - uid: 16640
-    components:
-    - type: Transform
-      pos: 65.5,-71.5
-      parent: 2
-  - uid: 16641
-    components:
-    - type: Transform
-      pos: 64.5,-71.5
-      parent: 2
   - uid: 16642
     components:
     - type: Transform
       pos: 63.5,-71.5
       parent: 2
-  - uid: 16643
-    components:
-    - type: Transform
-      pos: 64.5,-68.5
-      parent: 2
-  - uid: 16644
-    components:
-    - type: Transform
-      pos: 65.5,-68.5
-      parent: 2
   - uid: 16645
     components:
     - type: Transform
@@ -119325,16 +124458,6 @@ entities:
     - type: Transform
       pos: 63.5,-70.5
       parent: 2
-  - uid: 16809
-    components:
-    - type: Transform
-      pos: 65.5,-69.5
-      parent: 2
-  - uid: 16989
-    components:
-    - type: Transform
-      pos: 21.5,-26.5
-      parent: 2
   - uid: 16990
     components:
     - type: Transform
@@ -119355,6 +124478,18 @@ entities:
     - type: Transform
       pos: 32.5,-36.5
       parent: 2
+  - uid: 17117
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-76.5
+      parent: 2
+  - uid: 17121
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,-76.5
+      parent: 2
   - uid: 17165
     components:
     - type: Transform
@@ -119380,11 +124515,6 @@ entities:
     - type: Transform
       pos: 26.5,-28.5
       parent: 2
-  - uid: 17283
-    components:
-    - type: Transform
-      pos: 26.5,-26.5
-      parent: 2
   - uid: 17377
     components:
     - type: Transform
@@ -119420,26 +124550,6 @@ entities:
     - type: Transform
       pos: 34.5,-33.5
       parent: 2
-  - uid: 17894
-    components:
-    - type: Transform
-      pos: 64.5,-67.5
-      parent: 2
-  - uid: 17906
-    components:
-    - type: Transform
-      pos: 58.5,-74.5
-      parent: 2
-  - uid: 17944
-    components:
-    - type: Transform
-      pos: 53.5,-48.5
-      parent: 2
-  - uid: 17962
-    components:
-    - type: Transform
-      pos: 54.5,-48.5
-      parent: 2
   - uid: 17969
     components:
     - type: Transform
@@ -119450,11 +124560,6 @@ entities:
     - type: Transform
       pos: 33.5,-34.5
       parent: 2
-  - uid: 18506
-    components:
-    - type: Transform
-      pos: 30.5,-32.5
-      parent: 2
 - proto: WardrobeCargoFilled
   entities:
   - uid: 6961
@@ -119486,6 +124591,11 @@ entities:
     - type: Transform
       pos: 66.5,-27.5
       parent: 2
+  - uid: 8231
+    components:
+    - type: Transform
+      pos: 67.5,-27.5
+      parent: 2
   - uid: 18043
     components:
     - type: Transform
@@ -119493,10 +124603,10 @@ entities:
       parent: 2
 - proto: WardrobeSalvageFilled
   entities:
-  - uid: 6918
+  - uid: 17523
     components:
     - type: Transform
-      pos: 54.5,-97.5
+      pos: 55.5,-97.5
       parent: 2
 - proto: WarningCO2
   entities:
@@ -119551,21 +124661,11 @@ entities:
     - type: Transform
       pos: -30.5,-70.5
       parent: 2
-  - uid: 4177
-    components:
-    - type: Transform
-      pos: 51.5,-54.5
-      parent: 2
   - uid: 5527
     components:
     - type: Transform
       pos: -46.4889,-48.14321
       parent: 2
-  - uid: 6275
-    components:
-    - type: Transform
-      pos: 21.5,-17.5
-      parent: 2
   - uid: 6649
     components:
     - type: Transform
@@ -119576,32 +124676,32 @@ entities:
     - type: Transform
       pos: -9.5,-18.5
       parent: 2
-  - uid: 7740
+  - uid: 7777
     components:
     - type: Transform
-      pos: 67.5,-40.5
+      pos: 23.5,-18.5
       parent: 2
-  - uid: 17956
+  - uid: 8564
     components:
     - type: Transform
-      pos: 33.5,-20.5
+      pos: 61.5,-31.5
+      parent: 2
+  - uid: 8864
+    components:
+    - type: Transform
+      pos: 51.5,-54.5
       parent: 2
 - proto: WaterTankFull
   entities:
-  - uid: 3379
-    components:
-    - type: Transform
-      pos: 55.5,-66.5
-      parent: 2
   - uid: 3764
     components:
     - type: Transform
       pos: 36.5,-37.5
       parent: 2
-  - uid: 7726
+  - uid: 5325
     components:
     - type: Transform
-      pos: 76.5,-34.5
+      pos: 78.5,-33.5
       parent: 2
   - uid: 8214
     components:
@@ -119613,6 +124713,16 @@ entities:
     - type: Transform
       pos: 10.5,0.5
       parent: 2
+  - uid: 15440
+    components:
+    - type: Transform
+      pos: 64.5,-55.5
+      parent: 2
+  - uid: 15597
+    components:
+    - type: Transform
+      pos: 6.5,-76.5
+      parent: 2
   - uid: 16978
     components:
     - type: Transform
@@ -119644,6 +124754,21 @@ entities:
       parent: 2
 - proto: WeaponCapacitorRecharger
   entities:
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 65.5,-32.5
+      parent: 2
+  - uid: 3518
+    components:
+    - type: Transform
+      pos: 69.5,-41.5
+      parent: 2
+  - uid: 3524
+    components:
+    - type: Transform
+      pos: 56.5,-39.5
+      parent: 2
   - uid: 5586
     components:
     - type: Transform
@@ -119659,29 +124784,12 @@ entities:
     - type: Transform
       pos: 13.5,-63.5
       parent: 2
-  - uid: 10392
-    components:
-    - type: Transform
-      pos: 65.5,-34.5
-      parent: 2
-  - uid: 14262
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-46.5
-      parent: 2
   - uid: 14729
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 60.5,-26.5
       parent: 2
-  - uid: 15520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-39.5
-      parent: 2
   - uid: 18255
     components:
     - type: Transform
@@ -119694,47 +124802,44 @@ entities:
       parent: 2
 - proto: WeaponEnergyTurretAI
   entities:
-  - uid: 18735
+  - uid: 7576
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 92.5,-41.5
+      pos: 94.5,-49.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 19418
-  - uid: 18736
+      - 10829
+  - uid: 10842
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 92.5,-49.5
+      pos: 94.5,-41.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 19418
+      - 10829
 - proto: WeaponEnergyTurretAIControlPanel
   entities:
-  - uid: 19418
+  - uid: 10829
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 93.5,-44.5
+      pos: 95.5,-44.5
       parent: 2
     - type: DeviceList
       devices:
-      - 18735
-      - 18736
+      - 10842
+      - 7576
 - proto: WeaponEnergyTurretCommand
   entities:
-  - uid: 18790
+  - uid: 7140
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 84.5,-45.5
+      pos: 82.5,-45.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18788
+      - 15244
   - uid: 19396
     components:
     - type: Transform
@@ -119745,15 +124850,15 @@ entities:
       - 19397
 - proto: WeaponEnergyTurretCommandControlPanel
   entities:
-  - uid: 18788
+  - uid: 15244
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 73.5,-45.5
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-43.5
       parent: 2
     - type: DeviceList
       devices:
-      - 18790
+      - 7140
   - uid: 19397
     components:
     - type: Transform
@@ -119765,70 +124870,62 @@ entities:
       - 19396
 - proto: WeaponEnergyTurretSecurity
   entities:
-  - uid: 12729
+  - uid: 3073
     components:
     - type: Transform
-      pos: 62.5,-55.5
+      pos: 62.5,-47.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 14760
+      - 1426
 - proto: WeaponEnergyTurretSecurityControlPanel
   entities:
-  - uid: 14760
+  - uid: 1426
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 62.5,-53.5
+      pos: 62.5,-45.5
       parent: 2
     - type: DeviceList
       devices:
-      - 12729
+      - 3073
 - proto: WeaponRifleFoam
   entities:
   - uid: 7959
     components:
     - type: Transform
-      pos: 64.55189,-69.8399
+      pos: 69.50519,-59.497322
       parent: 2
   - uid: 14307
     components:
     - type: Transform
-      pos: 64.48334,-69.54418
+      pos: 69.5538,-59.358437
       parent: 2
 - proto: WeaponSubMachineGunDrozd
   entities:
   - uid: 15876
     components:
     - type: Transform
-      pos: 68.45742,-31.538942
+      pos: 69.531204,-32.545918
       parent: 2
 - proto: WeaponSubMachineGunWt550
   entities:
   - uid: 10243
     components:
     - type: Transform
-      pos: 65.52122,-45.31295
+      pos: 64.538445,-50.39843
       parent: 2
 - proto: WeaponTurretXeno
   entities:
-  - uid: 5419
+  - uid: 12956
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-27.5
+      pos: 37.5,-27.5
       parent: 2
-  - uid: 6268
+  - uid: 12958
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-35.5
-      parent: 2
-  - uid: 12914
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-42.5
+      pos: 46.5,-30.5
       parent: 2
 - proto: WeaponWaterPistol
   entities:
@@ -119839,6 +124936,11 @@ entities:
       parent: 2
 - proto: Welder
   entities:
+  - uid: 15458
+    components:
+    - type: Transform
+      pos: 67.73903,-68.491745
+      parent: 2
   - uid: 19253
     components:
     - type: Transform
@@ -119846,11 +124948,6 @@ entities:
       parent: 2
 - proto: WelderIndustrial
   entities:
-  - uid: 3765
-    components:
-    - type: Transform
-      pos: 53.37124,-29.397728
-      parent: 2
   - uid: 8007
     components:
     - type: Transform
@@ -119859,7 +124956,7 @@ entities:
   - uid: 9285
     components:
     - type: Transform
-      pos: 27.5,-13.5
+      pos: 28.519037,-13.301477
       parent: 2
 - proto: WeldingFuelTank
   entities:
@@ -119868,28 +124965,43 @@ entities:
     - type: Transform
       pos: -16.5,-49.5
       parent: 2
-  - uid: 11714
-    components:
-    - type: Transform
-      pos: 67.5,-59.5
-      parent: 2
 - proto: WeldingFuelTankFull
   entities:
-  - uid: 5368
+  - uid: 746
     components:
     - type: Transform
-      pos: 50.5,-32.5
+      pos: 38.5,-78.5
       parent: 2
-  - uid: 7725
+  - uid: 5889
     components:
     - type: Transform
-      pos: 75.5,-34.5
+      pos: 54.5,-68.5
+      parent: 2
+  - uid: 7862
+    components:
+    - type: Transform
+      pos: 76.5,-33.5
       parent: 2
   - uid: 8212
     components:
     - type: Transform
       pos: -41.5,-28.5
       parent: 2
+  - uid: 8383
+    components:
+    - type: Transform
+      pos: 61.5,-62.5
+      parent: 2
+  - uid: 8456
+    components:
+    - type: Transform
+      pos: 38.5,-36.5
+      parent: 2
+  - uid: 12748
+    components:
+    - type: Transform
+      pos: -37.5,-73.5
+      parent: 2
   - uid: 13569
     components:
     - type: Transform
@@ -119900,16 +125012,16 @@ entities:
     - type: Transform
       pos: 10.5,-5.5
       parent: 2
+  - uid: 15438
+    components:
+    - type: Transform
+      pos: 65.5,-55.5
+      parent: 2
   - uid: 16390
     components:
     - type: Transform
       pos: 21.5,-63.5
       parent: 2
-  - uid: 19384
-    components:
-    - type: Transform
-      pos: 46.5,-72.5
-      parent: 2
 - proto: WheatBushel
   entities:
   - uid: 6220
@@ -119917,6 +125029,13 @@ entities:
     - type: Transform
       pos: 1.5116462,-46.527744
       parent: 2
+- proto: WhoopieCushion
+  entities:
+  - uid: 5367
+    components:
+    - type: Transform
+      pos: 46.5,-41.5
+      parent: 2
 - proto: Windoor
   entities:
   - uid: 6205
@@ -119931,6 +125050,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-57.5
       parent: 2
+  - uid: 7262
+    components:
+    - type: Transform
+      pos: 58.5,-40.5
+      parent: 2
   - uid: 7671
     components:
     - type: Transform
@@ -119954,6 +125078,11 @@ entities:
     - type: Transform
       pos: 79.5,-22.5
       parent: 2
+  - uid: 7768
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 2
   - uid: 8011
     components:
     - type: Transform
@@ -119966,20 +125095,32 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-69.5
       parent: 2
-  - uid: 8634
+  - uid: 8577
     components:
     - type: Transform
-      pos: 60.5,-47.5
+      pos: 59.5,-40.5
       parent: 2
-  - uid: 9367
+  - uid: 8617
     components:
     - type: Transform
-      pos: 58.5,-47.5
+      pos: 32.5,-16.5
       parent: 2
-  - uid: 10670
+  - uid: 9213
     components:
     - type: Transform
-      pos: 59.5,-47.5
+      pos: 57.5,-40.5
+      parent: 2
+  - uid: 9894
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-42.5
+      parent: 2
+  - uid: 9895
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-43.5
       parent: 2
   - uid: 11761
     components:
@@ -119992,13 +125133,13 @@ entities:
     - type: Transform
       pos: 40.5,-18.5
       parent: 2
-- proto: WindoorBarKitchenLocked
-  entities:
-  - uid: 6343
+  - uid: 16631
     components:
     - type: Transform
-      pos: 40.5,-46.5
+      pos: -38.5,-76.5
       parent: 2
+- proto: WindoorBarKitchenLocked
+  entities:
   - uid: 7018
     components:
     - type: Transform
@@ -120017,17 +125158,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 38.5,-42.5
       parent: 2
-  - uid: 9575
-    components:
-    - type: Transform
-      pos: 39.5,-46.5
-      parent: 2
   - uid: 18763
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 38.5,-45.5
       parent: 2
+  - uid: 19747
+    components:
+    - type: Transform
+      pos: 39.5,-46.5
+      parent: 2
 - proto: WindoorCargoLocked
   entities:
   - uid: 3041
@@ -120110,59 +125251,69 @@ entities:
       parent: 2
 - proto: WindoorSecureArmoryLocked
   entities:
-  - uid: 514
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-58.5
-      parent: 2
-  - uid: 4874
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-47.5
-      parent: 2
-  - uid: 9221
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-42.5
-      parent: 2
-  - uid: 9225
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-47.5
-      parent: 2
-  - uid: 9229
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-47.5
-      parent: 2
-  - uid: 9366
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-43.5
-      parent: 2
-  - uid: 11939
+  - uid: 1211
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 58.5,-58.5
+      pos: 58.5,-49.5
       parent: 2
-  - uid: 11941
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-57.5
-      parent: 2
-  - uid: 16877
+  - uid: 1451
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 62.5,-57.5
+      pos: 62.5,-49.5
+      parent: 2
+  - uid: 4100
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-50.5
+      parent: 2
+  - uid: 4204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-50.5
+      parent: 2
+  - uid: 4710
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
+  - uid: 4913
+    components:
+    - type: Transform
+      pos: 57.5,-35.5
+      parent: 2
+  - uid: 6165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-40.5
+      parent: 2
+  - uid: 6261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-40.5
+      parent: 2
+  - uid: 9217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-40.5
+      parent: 2
+  - uid: 9896
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-42.5
+      parent: 2
+  - uid: 9897
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-43.5
       parent: 2
 - proto: WindoorSecureAtmosphericsLocked
   entities:
@@ -120180,18 +125331,6 @@ entities:
       parent: 2
 - proto: WindoorSecureCommandLocked
   entities:
-  - uid: 7455
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,-49.5
-      parent: 2
-  - uid: 7456
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,-41.5
-      parent: 2
   - uid: 13568
     components:
     - type: Transform
@@ -120312,22 +125451,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-27.5
       parent: 2
-  - uid: 2829
+  - uid: 5422
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
+      pos: 32.5,-16.5
+      parent: 2
+  - uid: 7796
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-16.5
+      parent: 2
+  - uid: 8691
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-15.5
+      parent: 2
+  - uid: 9483
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 19.5,-25.5
       parent: 2
-  - uid: 3012
-    components:
-    - type: Transform
-      pos: 28.5,-17.5
-      parent: 2
-  - uid: 3527
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
-      parent: 2
   - uid: 13977
     components:
     - type: Transform
@@ -120345,11 +125492,17 @@ entities:
       parent: 2
 - proto: WindoorSecureSecurityLocked
   entities:
-  - uid: 3073
+  - uid: 3579
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-38.5
+      pos: 57.5,-28.5
+      parent: 2
+  - uid: 4086
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-29.5
       parent: 2
   - uid: 4205
     components:
@@ -120357,6 +125510,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 41.5,-21.5
       parent: 2
+  - uid: 4377
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-35.5
+      parent: 2
   - uid: 5960
     components:
     - type: Transform
@@ -120375,17 +125534,35 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-12.5
       parent: 2
+  - uid: 6097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-27.5
+      parent: 2
   - uid: 6123
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 57.5,-21.5
       parent: 2
-  - uid: 7305
+  - uid: 7067
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-43.5
+      pos: 57.5,-28.5
+      parent: 2
+  - uid: 7208
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-35.5
+      parent: 2
+  - uid: 7952
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-27.5
       parent: 2
   - uid: 8414
     components:
@@ -120393,17 +125570,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 61.5,-27.5
       parent: 2
-  - uid: 10319
+  - uid: 19647
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-42.5
-      parent: 2
-  - uid: 13843
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-20.5
+      pos: 61.5,-27.5
       parent: 2
 - proto: WindoorSecureServiceLocked
   entities:
@@ -120419,6 +125590,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-21.5
       parent: 2
+- proto: WindoorTheatreLocked
+  entities:
+  - uid: 19533
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-37.5
+      parent: 2
+  - uid: 19534
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-38.5
+      parent: 2
 - proto: Window
   entities:
   - uid: 5232
@@ -120459,22 +125644,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-57.5
       parent: 2
-  - uid: 5866
+  - uid: 8058
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -40.5,-76.5
-      parent: 2
-  - uid: 6355
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-47.5
-      parent: 2
-  - uid: 8373
-    components:
-    - type: Transform
-      pos: -41.5,-75.5
+      rot: 3.141592653589793 rad
+      pos: -40.5,-78.5
       parent: 2
   - uid: 9244
     components:
@@ -120482,12 +125656,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-57.5
       parent: 2
-  - uid: 16631
+  - uid: 12744
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-77.5
+      parent: 2
+  - uid: 17102
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -41.5,-77.5
       parent: 2
+  - uid: 19748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-47.5
+      parent: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 6162
@@ -120501,46 +125687,41 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-50.5
       parent: 2
-  - uid: 11685
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 296
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.5,-11.5
+      pos: 76.5,-62.5
       parent: 2
-  - uid: 17908
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,-11.5
-      parent: 2
-- proto: WindowReinforcedDirectional
-  entities:
   - uid: 457
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,-31.5
       parent: 2
-  - uid: 1063
-    components:
-    - type: Transform
-      pos: 61.5,-70.5
-      parent: 2
   - uid: 1790
     components:
     - type: Transform
       pos: -19.5,-60.5
       parent: 2
-  - uid: 3068
+  - uid: 2223
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-37.5
+      pos: 62.5,-48.5
       parent: 2
-  - uid: 4356
+  - uid: 3353
     components:
     - type: Transform
-      pos: 62.5,-56.5
+      rot: 3.141592653589793 rad
+      pos: 76.5,-62.5
+      parent: 2
+  - uid: 4610
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-31.5
       parent: 2
   - uid: 4866
     components:
@@ -120552,6 +125733,12 @@ entities:
     - type: Transform
       pos: 30.5,-72.5
       parent: 2
+  - uid: 5944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-32.5
+      parent: 2
   - uid: 6703
     components:
     - type: Transform
@@ -120574,16 +125761,27 @@ entities:
     - type: Transform
       pos: 33.5,-72.5
       parent: 2
-  - uid: 8194
+  - uid: 8826
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-70.5
+      pos: 51.5,-28.5
       parent: 2
-  - uid: 9904
+  - uid: 9092
     components:
     - type: Transform
-      pos: 19.5,-24.5
+      pos: 58.5,-48.5
+      parent: 2
+  - uid: 9304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-14.5
+      parent: 2
+  - uid: 9341
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
       parent: 2
   - uid: 10554
     components:
@@ -120591,11 +125789,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,-35.5
       parent: 2
-  - uid: 13850
+  - uid: 11869
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-67.5
+      pos: 76.5,-66.5
+      parent: 2
+  - uid: 11880
+    components:
+    - type: Transform
+      pos: 76.5,-66.5
       parent: 2
   - uid: 13991
     components:
@@ -120603,29 +125806,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-15.5
       parent: 2
-  - uid: 14256
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-67.5
-      parent: 2
-  - uid: 15123
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-21.5
-      parent: 2
-  - uid: 15384
-    components:
-    - type: Transform
-      pos: -47.5,-37.5
-      parent: 2
-  - uid: 15385
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -47.5,-39.5
-      parent: 2
   - uid: 16394
     components:
     - type: Transform
@@ -120653,15 +125833,40 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 30.5,-72.5
       parent: 2
-  - uid: 18271
+  - uid: 19483
     components:
     - type: Transform
-      pos: 58.5,-56.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-36.5
       parent: 2
-  - uid: 18300
+  - uid: 19484
     components:
     - type: Transform
-      pos: 58.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-34.5
+      parent: 2
+  - uid: 19485
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-37.5
+      parent: 2
+  - uid: 19486
+    components:
+    - type: Transform
+      pos: -9.5,-33.5
+      parent: 2
+  - uid: 19488
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-35.5
+      parent: 2
+  - uid: 19535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-39.5
       parent: 2
 - proto: Wirecutter
   entities:
@@ -120687,6 +125892,11 @@ entities:
     - type: Transform
       pos: -25.38417,-22.375149
       parent: 2
+  - uid: 11844
+    components:
+    - type: Transform
+      pos: 62.47169,-65.33372
+      parent: 2
   - uid: 14572
     components:
     - type: Transform
@@ -120700,7 +125910,7 @@ entities:
   - uid: 18303
     components:
     - type: Transform
-      pos: -15.501174,-18.454052
+      pos: -13.546322,-21.423643
       parent: 2
   - uid: 18373
     components:
@@ -120712,6 +125922,18 @@ entities:
     - type: Transform
       pos: -19.471653,-51.518547
       parent: 2
+  - uid: 20008
+    components:
+    - type: Transform
+      parent: 20005
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 20020
+    components:
+    - type: Transform
+      pos: 57.496265,-59.48495
+      parent: 2
 - proto: XenoResinWindow
   entities:
   - uid: 223
@@ -120774,6 +125996,29 @@ entities:
     - type: Transform
       pos: 0.5,-37.5
       parent: 2
+  - uid: 798
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-14.5
+      parent: 2
+  - uid: 822
+    components:
+    - type: Transform
+      pos: 75.5,-72.5
+      parent: 2
+  - uid: 860
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-12.5
+      parent: 2
+  - uid: 861
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-13.5
+      parent: 2
   - uid: 902
     components:
     - type: Transform
@@ -120809,16 +126054,6 @@ entities:
     - type: Transform
       pos: -1.5,-40.5
       parent: 2
-  - uid: 1446
-    components:
-    - type: Transform
-      pos: 26.5,-15.5
-      parent: 2
-  - uid: 1447
-    components:
-    - type: Transform
-      pos: 26.5,-16.5
-      parent: 2
   - uid: 1568
     components:
     - type: Transform
@@ -120844,11 +126079,6 @@ entities:
     - type: Transform
       pos: 81.5,-59.5
       parent: 2
-  - uid: 1823
-    components:
-    - type: Transform
-      pos: 80.5,-59.5
-      parent: 2
   - uid: 1827
     components:
     - type: Transform
@@ -121199,16 +126429,6 @@ entities:
     - type: Transform
       pos: 73.5,-57.5
       parent: 2
-  - uid: 3333
-    components:
-    - type: Transform
-      pos: 67.5,-58.5
-      parent: 2
-  - uid: 3334
-    components:
-    - type: Transform
-      pos: 71.5,-56.5
-      parent: 2
   - uid: 3439
     components:
     - type: Transform
@@ -121314,6 +126534,11 @@ entities:
     - type: Transform
       pos: -51.5,-59.5
       parent: 2
+  - uid: 3947
+    components:
+    - type: Transform
+      pos: -40.5,-63.5
+      parent: 2
   - uid: 4012
     components:
     - type: Transform
@@ -121359,36 +126584,6 @@ entities:
     - type: Transform
       pos: 45.5,-78.5
       parent: 2
-  - uid: 4137
-    components:
-    - type: Transform
-      pos: 78.5,-65.5
-      parent: 2
-  - uid: 4138
-    components:
-    - type: Transform
-      pos: 78.5,-63.5
-      parent: 2
-  - uid: 4139
-    components:
-    - type: Transform
-      pos: 78.5,-64.5
-      parent: 2
-  - uid: 4147
-    components:
-    - type: Transform
-      pos: 76.5,-63.5
-      parent: 2
-  - uid: 4160
-    components:
-    - type: Transform
-      pos: 76.5,-65.5
-      parent: 2
-  - uid: 4168
-    components:
-    - type: Transform
-      pos: 76.5,-64.5
-      parent: 2
   - uid: 4195
     components:
     - type: Transform
@@ -121464,6 +126659,11 @@ entities:
     - type: Transform
       pos: 45.5,-55.5
       parent: 2
+  - uid: 4378
+    components:
+    - type: Transform
+      pos: 83.5,-45.5
+      parent: 2
   - uid: 4382
     components:
     - type: Transform
@@ -121534,11 +126734,6 @@ entities:
     - type: Transform
       pos: 18.5,-47.5
       parent: 2
-  - uid: 4399
-    components:
-    - type: Transform
-      pos: -13.5,-75.5
-      parent: 2
   - uid: 4403
     components:
     - type: Transform
@@ -121569,11 +126764,6 @@ entities:
     - type: Transform
       pos: -13.5,-77.5
       parent: 2
-  - uid: 4419
-    components:
-    - type: Transform
-      pos: -12.5,-75.5
-      parent: 2
   - uid: 4420
     components:
     - type: Transform
@@ -121589,21 +126779,6 @@ entities:
     - type: Transform
       pos: 19.5,-47.5
       parent: 2
-  - uid: 4425
-    components:
-    - type: Transform
-      pos: 26.5,-20.5
-      parent: 2
-  - uid: 4426
-    components:
-    - type: Transform
-      pos: 26.5,-19.5
-      parent: 2
-  - uid: 4428
-    components:
-    - type: Transform
-      pos: 31.5,-13.5
-      parent: 2
   - uid: 4429
     components:
     - type: Transform
@@ -121614,6 +126789,11 @@ entities:
     - type: Transform
       pos: -14.5,-10.5
       parent: 2
+  - uid: 4433
+    components:
+    - type: Transform
+      pos: 73.5,-72.5
+      parent: 2
   - uid: 4439
     components:
     - type: Transform
@@ -122124,6 +127304,11 @@ entities:
     - type: Transform
       pos: -48.5,-34.5
       parent: 2
+  - uid: 5332
+    components:
+    - type: Transform
+      pos: 82.5,-41.5
+      parent: 2
   - uid: 5375
     components:
     - type: Transform
@@ -122134,21 +127319,11 @@ entities:
     - type: Transform
       pos: -47.5,-34.5
       parent: 2
-  - uid: 5429
-    components:
-    - type: Transform
-      pos: 56.5,-35.5
-      parent: 2
   - uid: 5431
     components:
     - type: Transform
       pos: 16.5,-71.5
       parent: 2
-  - uid: 5433
-    components:
-    - type: Transform
-      pos: 81.5,-45.5
-      parent: 2
   - uid: 5434
     components:
     - type: Transform
@@ -122169,11 +127344,6 @@ entities:
     - type: Transform
       pos: 39.5,-16.5
       parent: 2
-  - uid: 5440
-    components:
-    - type: Transform
-      pos: 37.5,-16.5
-      parent: 2
   - uid: 5441
     components:
     - type: Transform
@@ -122189,16 +127359,6 @@ entities:
     - type: Transform
       pos: 47.5,-12.5
       parent: 2
-  - uid: 5444
-    components:
-    - type: Transform
-      pos: 37.5,-17.5
-      parent: 2
-  - uid: 5445
-    components:
-    - type: Transform
-      pos: 37.5,-14.5
-      parent: 2
   - uid: 5446
     components:
     - type: Transform
@@ -122349,6 +127509,16 @@ entities:
     - type: Transform
       pos: 45.5,-57.5
       parent: 2
+  - uid: 6104
+    components:
+    - type: Transform
+      pos: 80.5,-49.5
+      parent: 2
+  - uid: 6106
+    components:
+    - type: Transform
+      pos: 82.5,-42.5
+      parent: 2
   - uid: 6114
     components:
     - type: Transform
@@ -122364,6 +127534,16 @@ entities:
     - type: Transform
       pos: 33.5,-60.5
       parent: 2
+  - uid: 6386
+    components:
+    - type: Transform
+      pos: 82.5,-49.5
+      parent: 2
+  - uid: 6387
+    components:
+    - type: Transform
+      pos: 82.5,-43.5
+      parent: 2
   - uid: 6598
     components:
     - type: Transform
@@ -122389,10 +127569,15 @@ entities:
     - type: Transform
       pos: 44.5,-58.5
       parent: 2
-  - uid: 7762
+  - uid: 7320
     components:
     - type: Transform
-      pos: 75.5,-72.5
+      pos: 82.5,-47.5
+      parent: 2
+  - uid: 7409
+    components:
+    - type: Transform
+      pos: 73.5,-73.5
       parent: 2
   - uid: 7764
     components:
@@ -122404,36 +127589,16 @@ entities:
     - type: Transform
       pos: 45.5,-12.5
       parent: 2
-  - uid: 7862
+  - uid: 7794
     components:
     - type: Transform
-      pos: 80.5,-42.5
-      parent: 2
-  - uid: 7909
-    components:
-    - type: Transform
-      pos: 81.5,-42.5
-      parent: 2
-  - uid: 7925
-    components:
-    - type: Transform
-      pos: 79.5,-42.5
-      parent: 2
-  - uid: 8029
-    components:
-    - type: Transform
-      pos: 80.5,-49.5
+      pos: 32.5,-13.5
       parent: 2
   - uid: 8063
     components:
     - type: Transform
       pos: 80.5,-41.5
       parent: 2
-  - uid: 8079
-    components:
-    - type: Transform
-      pos: 79.5,-48.5
-      parent: 2
   - uid: 8144
     components:
     - type: Transform
@@ -122449,16 +127614,6 @@ entities:
     - type: Transform
       pos: 50.5,-63.5
       parent: 2
-  - uid: 8221
-    components:
-    - type: Transform
-      pos: 73.5,-73.5
-      parent: 2
-  - uid: 8345
-    components:
-    - type: Transform
-      pos: 73.5,-72.5
-      parent: 2
   - uid: 8346
     components:
     - type: Transform
@@ -122469,75 +127624,85 @@ entities:
     - type: Transform
       pos: 16.5,-72.5
       parent: 2
-  - uid: 8371
+  - uid: 8422
     components:
     - type: Transform
-      pos: 80.5,-43.5
+      pos: 66.5,-59.5
       parent: 2
-  - uid: 8510
+  - uid: 8503
     components:
     - type: Transform
-      pos: 81.5,-48.5
-      parent: 2
-  - uid: 8511
-    components:
-    - type: Transform
-      pos: 80.5,-47.5
-      parent: 2
-  - uid: 8606
-    components:
-    - type: Transform
-      pos: 80.5,-48.5
+      pos: 69.5,-57.5
       parent: 2
   - uid: 9294
     components:
     - type: Transform
       pos: 51.5,-53.5
       parent: 2
-  - uid: 9305
+  - uid: 9329
     components:
     - type: Transform
-      pos: 58.5,-77.5
+      pos: 81.5,-42.5
+      parent: 2
+  - uid: 9337
+    components:
+    - type: Transform
+      pos: 28.5,-15.5
+      parent: 2
+  - uid: 9354
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 2
+  - uid: 9446
+    components:
+    - type: Transform
+      pos: 83.5,-42.5
       parent: 2
   - uid: 9695
     components:
     - type: Transform
-      pos: 53.5,-53.5
+      pos: 80.5,-59.5
       parent: 2
-  - uid: 10236
+  - uid: 9847
     components:
     - type: Transform
-      pos: 58.5,-25.5
+      pos: 65.5,-59.5
       parent: 2
   - uid: 10305
     components:
     - type: Transform
       pos: 52.5,-53.5
       parent: 2
+  - uid: 10516
+    components:
+    - type: Transform
+      pos: 81.5,-49.5
+      parent: 2
+  - uid: 10721
+    components:
+    - type: Transform
+      pos: 81.5,-41.5
+      parent: 2
+  - uid: 10752
+    components:
+    - type: Transform
+      pos: 81.5,-40.5
+      parent: 2
   - uid: 10889
     components:
     - type: Transform
       pos: -17.5,-73.5
       parent: 2
-  - uid: 11665
-    components:
-    - type: Transform
-      pos: 56.5,-41.5
-      parent: 2
   - uid: 11872
     components:
     - type: Transform
       pos: 49.5,-62.5
       parent: 2
-  - uid: 12850
-    components:
-    - type: Transform
-      pos: 59.5,-22.5
-      parent: 2
   - uid: 12851
     components:
     - type: Transform
-      pos: 58.5,-22.5
+      pos: 59.5,-22.5
       parent: 2
   - uid: 13647
     components:
@@ -122564,16 +127729,31 @@ entities:
     - type: Transform
       pos: -20.5,-73.5
       parent: 2
+  - uid: 15156
+    components:
+    - type: Transform
+      pos: 83.5,-48.5
+      parent: 2
+  - uid: 15157
+    components:
+    - type: Transform
+      pos: 82.5,-48.5
+      parent: 2
+  - uid: 15164
+    components:
+    - type: Transform
+      pos: 81.5,-48.5
+      parent: 2
+  - uid: 15166
+    components:
+    - type: Transform
+      pos: 81.5,-50.5
+      parent: 2
   - uid: 15230
     components:
     - type: Transform
       pos: -19.5,-73.5
       parent: 2
-  - uid: 15434
-    components:
-    - type: Transform
-      pos: 58.5,-78.5
-      parent: 2
   - uid: 15960
     components:
     - type: Transform
@@ -122601,11 +127781,6 @@ entities:
     - type: Transform
       pos: -22.5,-53.5
       parent: 2
-  - uid: 17505
-    components:
-    - type: Transform
-      pos: 56.5,-29.5
-      parent: 2
   - uid: 17655
     components:
     - type: Transform
@@ -122616,15 +127791,10 @@ entities:
     - type: Transform
       pos: -18.5,-15.5
       parent: 2
-  - uid: 17702
+  - uid: 18416
     components:
     - type: Transform
-      pos: 59.5,-25.5
-      parent: 2
-  - uid: 17996
-    components:
-    - type: Transform
-      pos: 63.5,-63.5
+      pos: 58.5,-22.5
       parent: 2
   - uid: 18467
     components:
diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml
index f495de250f..737739ba9d 100644
--- a/Resources/Prototypes/Accents/full_replacements.yml
+++ b/Resources/Prototypes/Accents/full_replacements.yml
@@ -183,3 +183,27 @@
   - accent-words-tomato-3
   - accent-words-tomato-4
   - accent-words-tomato-5
+
+- type: accent
+  id: scurret
+  fullReplacements:
+  - accent-words-scurret-1
+  - accent-words-scurret-2
+  - accent-words-scurret-3
+  - accent-words-scurret-4
+  - accent-words-scurret-5
+  - accent-words-scurret-6
+  - accent-words-scurret-7
+  - accent-words-scurret-8
+  - accent-words-scurret-9
+  - accent-words-scurret-10
+  - accent-words-scurret-11
+  - accent-words-scurret-12
+  - accent-words-scurret-13
+  - accent-words-scurret-14
+  - accent-words-scurret-15
+  - accent-words-scurret-16
+  - accent-words-scurret-17
+  - accent-words-scurret-18
+  - accent-words-scurret-19
+  - accent-words-scurret-20
diff --git a/Resources/Prototypes/Actions/polymorph.yml b/Resources/Prototypes/Actions/polymorph.yml
index 2f931e29e2..343f6bdcf4 100644
--- a/Resources/Prototypes/Actions/polymorph.yml
+++ b/Resources/Prototypes/Actions/polymorph.yml
@@ -4,6 +4,8 @@
   name: Revert
   description: Revert back into your original form.
   components:
+  - type: ConfirmableAction
+    popup: revert-polymorph-action-popup
   - type: InstantAction
     event: !type:RevertPolymorphActionEvent
 
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index d3d51b1c90..ca47070d55 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -131,7 +131,7 @@
       state: gib
 
 - type: entity
-  parent: BaseAction
+  parent: BaseImplantAction
   id: ActionActivateFreedomImplant
   name: Break Free
   description: Activating your freedom implant will free you from any hand restraints
@@ -150,8 +150,6 @@
     icon:
       sprite: Actions/Implants/implants.rsi
       state: freedom
-  - type: InstantAction
-    event: !type:UseFreedomImplantEvent
 
 - type: entity
   parent: BaseAction
@@ -212,7 +210,7 @@
 # Sunrise-End
 
 - type: entity
-  parent: BaseAction
+  parent: BaseImplantAction
   id: ActionActivateScramImplant
   name: SCRAM!
   description: Randomly teleports you within a large distance.
@@ -231,11 +229,9 @@
     icon:
       sprite: Structures/Specific/anomaly.rsi
       state: anom4
-  - type: InstantAction
-    event: !type:UseScramImplantEvent
 
 - type: entity
-  parent: BaseAction
+  parent: BaseImplantAction
   id: ActionActivateDnaScramblerImplant
   name: Scramble DNA
   description:  Randomly changes your name and appearance.
@@ -255,8 +251,6 @@
     icon:
       sprite: Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi
       state: icon
-  - type: InstantAction
-    event: !type:UseDnaScramblerImplantEvent
 
 - type: entity
   parent: BaseAction
@@ -271,7 +265,7 @@
     event: !type:ToggleClothingEvent
 
 - type: entity
-  parent: BaseAction
+  parent: BaseMentalAction
   id: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
@@ -432,6 +426,7 @@
     iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
     itemIconStyle: NoItem
     useDelay: 1 # emote spam
+    checkCanInteract: false
 
 - type: entity
   parent: BaseAction
@@ -463,6 +458,20 @@
     useDelay: 1
     itemIconStyle: BigAction
 
+- type: entity
+  parent: BaseAction
+  id: ActionGravityJump
+  name: Jump
+  description: Activating the advanced propulsion system, you propel yourself a short distance in the direction of your gaze.
+  components:
+  - type: Action
+    useDelay: 8
+    icon:
+      sprite: Interface/Actions/jump.rsi
+      state: icon
+  - type: InstantAction
+    event: !type:GravityJumpEvent {}
+
 - type: entity
   parent: BaseToggleAction
   id: ActionToggleRootable
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index a358ebc694..8b65190e3b 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -30,6 +30,7 @@
     - alertType: Magboots
     - alertType: Rooted
     - alertType: Pacified
+    - alertType: Stealthy
 
 - type: entity
   id: AlertSpriteView
@@ -149,6 +150,15 @@
   name: alerts-stunned-name
   description: alerts-stunned-desc
 
+- type: alert
+  id: Knockdown
+  clickEvent: !type:KnockedDownAlertEvent
+  icons:
+  - sprite: /Textures/Interface/Alerts/stunnable.rsi
+    state: knocked-down
+  name: alerts-knockdown-name
+  description: alerts-knockdown-desc
+
 - type: alert
   id: Handcuffed
   clickEvent: !type:RemoveCuffsAlertEvent
@@ -309,7 +319,9 @@
   id: PilotingShuttle
   category: Piloting
   clickEvent: !type:StopPilotingAlertEvent
-  icons: [ /Textures/Interface/Alerts/piloting.png ]
+  icons:
+  - sprite: /Textures/Interface/Alerts/shuttle.rsi
+    state: piloting
   name: alerts-piloting-name
   description: alerts-piloting-desc
 
@@ -444,6 +456,19 @@
   name: alerts-pacified-name
   description: alerts-pacified-desc
 
+- type: alert
+  id: Stealthy
+  clickEvent: !type:ToggleThievingEvent
+  icons:
+  - sprite: /Textures/Interface/Alerts/stealthy.rsi
+    state: stealthy-off
+  - sprite: /Textures/Interface/Alerts/stealthy.rsi
+    state: stealthy-on
+  name: alerts-stealthy-name
+  description: alerts-stealthy-desc
+  minSeverity: 0
+  maxSeverity: 1
+
 - type: alert
   id: Adrenaline
   icons:
diff --git a/Resources/Prototypes/Alerts/revenant.yml b/Resources/Prototypes/Alerts/revenant.yml
index 38933df4fe..ab2b13905d 100644
--- a/Resources/Prototypes/Alerts/revenant.yml
+++ b/Resources/Prototypes/Alerts/revenant.yml
@@ -18,12 +18,15 @@
   id: AlertEssenceSpriteView
   categories: [ HideSpawnMenu ]
   components:
+  - type: GenericCounterAlert
+    centerGlyph: false
+    hideLeadingZeroes: false
   - type: Sprite
     sprite: /Textures/Interface/Alerts/essence_counter.rsi
     layers:
     - map: [ "enum.AlertVisualLayers.Base" ]
-    - map: [ "enum.RevenantVisualLayers.Digit1" ]
-    - map: [ "enum.RevenantVisualLayers.Digit2" ]
-      offset: 0.125, 0
-    - map: [ "enum.RevenantVisualLayers.Digit3" ]
+    - map: [ "1" ]
       offset: 0.25, 0
+    - map: [ "10" ]
+      offset: 0.125, 0
+    - map: [ "100" ]
diff --git a/Resources/Prototypes/Antag/changeling.yml b/Resources/Prototypes/Antag/changeling.yml
new file mode 100644
index 0000000000..b4c8b2e3dc
--- /dev/null
+++ b/Resources/Prototypes/Antag/changeling.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: MobHuman
+  id: MobLing
+  name: Urist McLing
+  suffix: Non-Antag
+  components:
+  - type: ChangelingDevour
+  - type: ChangelingIdentity
+  - type: ChangelingTransform
+  - type: ActionGrant
+    actions:
+    - ActionRetractableItemArmBlade # Temporary addition, will inevitably be a purchasable in the bio-store
+
+- type: entity
+  id: ActionChangelingDevour
+  name: "[color=red]Devour[/color]"
+  description: Consume the essence of your victims and subsume their identity and mind into your own.
+  components:
+  - type: Action
+    icon: { sprite : Interface/Actions/changeling.rsi, state: "devour" }
+    iconOn: { sprite : Interface/Actions/changeling.rsi, state: "devour_on" }
+    priority: 1
+  - type: TargetAction
+  - type: EntityTargetAction
+    event: !type:ChangelingDevourActionEvent
+
+- type: entity
+  id: ActionChangelingTransform
+  name: "[color=red]Transform[/color]"
+  description: Transform and assume the identities of those you have devoured.
+  components:
+  - type: Action
+    icon: { sprite : Interface/Actions/changeling.rsi, state: "transform" }
+  - type: InstantAction
+    event: !type:ChangelingTransformActionEvent
diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
index 3b00e1a223..6b64aa4c1d 100644
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
@@ -4,6 +4,12 @@
   name: ruminant stomach
   categories: [ HideSpawnMenu ]
   components:
+  - type: Stomach
+    specialDigestible:
+      tags:
+      - Ruminant
+      - Wheat
+      - BananaPeel
   - type: SolutionContainerManager
     solutions:
       stomach:
diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml
new file mode 100644
index 0000000000..234f950a03
--- /dev/null
+++ b/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml
@@ -0,0 +1,20 @@
+- type: body
+  id: MothershipCoreBody
+  name: "core"
+  root: torso
+  slots:
+    torso:
+      part: TorsoBorg
+      connections:
+      - right2hand
+      - right1hand
+      - left1hand
+      - left2hand
+    left1hand:
+      part: LeftArmBorg
+    left2hand:
+      part: LeftArmBorg
+    right1hand:
+      part: RightArmBorg
+    right2hand:
+      part: RightArmBorg
diff --git a/Resources/Prototypes/Body/Prototypes/a_ghost.yml b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
deleted file mode 100644
index 7d358a5762..0000000000
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: body
-  id: Aghost
-  name: "aghost"
-  root: torso
-  slots:
-    torso:
-      part: TorsoHuman
-      connections:
-      - right_arm
-      - left_arm
-    right_arm:
-      part: RightArmHuman
-      connections:
-      - right_hand
-    left_arm:
-      part: LeftArmHuman
-      connections:
-      - left_hand
-    right_hand:
-      part: RightHandHuman
-    left_hand:
-      part: LeftHandHuman
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 445e7d941b..7a8deb3151 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -218,6 +218,16 @@
   category: cargoproduct-category-name-fun
   group: market
 
+- type: cargoProduct
+  id: HydratedScurret
+  icon:
+    sprite: Structures/Wallmounts/posters.rsi
+    state: poster55_legit
+  product: CrateFunScurret
+  cost: 25000 # You will surely not regret buying this
+  category: cargoproduct-category-name-fun
+  group: market
+
 - type: cargoProduct
   id: FunCrateGambling
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 667b83ec3f..68b4b2dc58 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -151,7 +151,7 @@
 - type: cargoProduct
   id: LivestockParrot
   icon:
-    sprite: Mobs/Animals/parrot.rsi
+    sprite: Mobs/Animals/parrot/parrot.rsi
     state: parrot
   product: CrateNPCParrot
   cost: 3000
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index a0cc69e92b..9955e6df68 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -61,6 +61,18 @@
         amount: 2
 #     - id: SMGSuppressor
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledRifle
+  name: Estoc DMR bundle
+  description: "For medium-range sharpshooting, the Estoc DMR. Bundled with three magazines."
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleEstoc
+    - id: MagazineRifle
+      amount: 2
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledRevolver
@@ -124,7 +136,7 @@
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateAmmoFilled
   name: ammo bundle
-  description: "Reloading! Contains 4 magazines for the C-20r, 5 drums for the Bulldog, and 2 ammo boxes for the L6 SAW."
+  description: "Reloading! Contains 4 magazines for the C-20r, 5 drums for the Bulldog, 3 magazines for the Estoc DMR, and 2 ammo boxes for the L6 SAW."
   components:
   - type: StorageFill
     contents:
@@ -335,6 +347,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/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 1be9f21e63..f7778b4062 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -63,27 +63,6 @@
         amount: 4
 
 # Magnum
-- type: entity
-  name: box of SMG .45 magnum magazines
-  parent: BoxMagazine
-  id: BoxMagazineMagnumSubMachineGun
-  description: A box full of SMG .45 magnum magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumSubMachineGun
-        amount: 3
-
-- type: entity
-  name: box of SMG .45 magnum (practice) magazines
-  parent: BoxMagazine
-  id: BoxMagazineMagnumSubMachineGunPractice
-  description: A box full of SMG .45 magnum (practice) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumSubMachineGunPractice
-        amount: 3
 
 # Pistol
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index 2b3ab08ca2..048ab333cd 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -102,6 +102,7 @@
     layers:
       - state: box_medical
       - state: bodybags
+  - type: Storage
     whitelist:
       tags:
         - BodyBag
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 0b55a9858b..5b2a549d40 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -489,3 +489,22 @@
         amount: 1
         prob: 0.05
 
+- type: entity
+  name: hydrated scurret
+  description: Wait, what?
+  id: CrateFunScurret
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+    - id: MobEmotionalSupportScurret # How? Why?
+    - id: DrinkVodkaBottleFull
+    - id: DrinkWhiskeyBottleFull
+    - id: DrinkTequilaBottleFull # ...that explains it.
+    - id: DrinkShotGlass
+      amount: 2
+    - id: Spear # self defence
+    - id: ClothingHeadHatHardhatYellow
+    - id: ClothingNeckMantleQM
+    - id: ClothingHeadsetCargo
+
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index f6d7daf6a6..27e5937220 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -2,7 +2,7 @@
   id: CrateServiceJanitorialSupplies
   parent: CratePlastic
   name: janitorial supplies crate
-  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag.
+  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, wire brush, rag, and trash bag.
   components:
   - type: StorageFill
     contents:
@@ -20,6 +20,8 @@
       - id: Plunger
         amount: 2
       - id: BoxCleanerGrenades
+      - id: WireBrush
+        amount: 2
 
 - type: entity
   id: CrateServiceCleanerGrenades
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 4c164d0ff3..1ade7bd073 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -84,6 +84,7 @@
         amount: 2
       - id: FlashlightLantern
       - id: LightReplacer
+      - id: WireBrush
 
 - type: entity
   id: ClothingBeltMedicalFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index cbb601eba1..6dd3d817c0 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -50,7 +50,7 @@
     - id: ClothingHeadsetAltCommand
     #- id: ClothingOuterArmorCaptainCarapace # Sunrise-Edit
     - id: CommsComputerCircuitboard
-    - id: DoorRemoteCommand
+    - id: DoorRemoteCustom
     - id: MedalCase
     - id: NukeDisk
     - id: PinpointerNuclear
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index c2b7fce6c3..6682697133 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -3,152 +3,172 @@
   suffix: Filled, Hardsuit
   parent: LockerWarden
   components:
-  - type: StorageFill
-    contents:
-      - id: FlashlightSeclite
-      - id: WeaponDisabler
-      - id: ClothingBeltSecurityFilled
-      - id: Flash
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
-      - id: RubberStampWarden
-      - id: DoorRemoteArmory
-      - id: ClothingOuterHardsuitWarden
-      - id: HoloprojectorSecurity
-      - id: BookSpaceLaw
-      - id: ClothingBackpackElectropack
-        amount: 2
-      - id: RemoteSignaller
-        amount: 2
-      - id: HyperLinkBookCorporateLaw
-      - id: HandheldCriminalRecordsMonitor  # Sunrise-CriminalRecords
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillLockerWarden
+        - !type:NestedSelector
+          tableId: FillLockerWardenHarduit
 
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
   parent: LockerWarden
   components:
-  - type: StorageFill
-    contents:
-      - id: FlashlightSeclite
-      - id: WeaponDisabler
-      - id: ClothingHeadHatCapWardenAlt
-      - id: ClothingBeltSecurityFilled
-      - id: Flash
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
-      - id: ClothingOuterCoatWardenAlt
-      - id: RubberStampWarden
-      - id: DoorRemoteArmory
-      - id: HoloprojectorSecurity
-      - id: BookSpaceLaw
-      - id: ClothingBackpackElectropack
-        amount: 2
-      - id: RemoteSignaller
-        amount: 2
-      - id: Binoculars
-      - id: HyperLinkBookCorporateLaw
-      - id: HandheldCriminalRecordsMonitor  # Sunrise-CriminalRecords
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerWarden
+
+- type: entityTable
+  id: FillLockerWarden
+  table: !type:AllSelector
+    children:
+    - id: FlashlightSeclite
+    - id: WeaponDisabler
+    - id: ClothingBeltSecurityFilled
+    - id: Flash
+    - id: ClothingEyesGlassesSecurity
+    - id: ClothingHandsGlovesCombat
+    - id: ClothingShoesBootsJack
+    - id: ClothingOuterCoatWarden
+    - id: ClothingOuterWinterWarden
+    - id: RubberStampWarden
+    - id: DoorRemoteArmory
+    - id: HoloprojectorSecurity
+    - id: BookSpaceLaw
+    - id: ClothingBackpackElectropack
+      amount: 2
+    - id: RemoteSignaller
+      amount: 2
+    - id: NetworkConfigurator
+    - id: Binoculars
+    - id: HandheldCriminalRecordsMonitor  # Sunrise-CriminalRecords
+
+- type: entityTable
+  id: FillLockerWardenHarduit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitWarden
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
 
 - type: entity
   id: LockerSecurityFilled
   suffix: Filled
   parent: LockerSecurity
   components:
-  - type: StorageFill
-    contents:
-      - id: FlashlightSeclite
-        prob: 0.8
-      - id: WeaponDisabler
-      - id: ClothingUniformJumpsuitSecGrey
-        prob: 0.3
-      - id: ClothingHeadHelmetBasic
-      - id: ClothingOuterArmorBasic
-      - id: ClothingBeltSecurityFilled
-      - id: Flash
-        prob: 0.5
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetSecurity
-      - id: ClothingHandsGlovesColorBlack
-      - id: ClothingShoesBootsJack
-      - id: WeaponMeleeNeedle
-        prob: 0.1
-      - id: ClothingOuterCoatSecurityOvercoat
-        prob: 0.2
-      - id: HoloprojectorSecurity
-        prob: 0.6
-      - id: HyperLinkBookCorporateLaw # Sunrise-edit
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerSecurity
+
+- type: entityTable
+  id: FillLockerSecurity
+  table: !type:AllSelector
+    children:
+    - id: FlashlightSeclite
+      prob: 0.8
+    - id: WeaponDisabler
+    - id: ClothingUniformJumpsuitSecGrey
+      prob: 0.3
+    - id: ClothingHeadHelmetBasic
+    - id: ClothingOuterArmorBasic
+    - id: ClothingBeltSecurityFilled
+    - id: Flash
+      prob: 0.5
+    - id: ClothingEyesGlassesSecurity
+    - id: ClothingHeadsetSecurity
+    - id: ClothingHandsGlovesColorBlack
+    - id: ClothingShoesBootsJack
+    - id: WeaponMeleeNeedle
+      prob: 0.1
+    - id: HoloprojectorSecurity
+      prob: 0.6
+    - id: BookSpaceLaw
+      prob: 0.5
 
 - type: entity
   id: LockerBrigmedicFilled
   suffix: Brigmedic, Filled
   parent: LockerBrigmedic
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingEyesGlassesSecurity
-      - id: WeaponDisabler
-      - id: TrackingImplanter
-        amount: 2
-      - id: ClothingOuterHardsuitBrigmedicSunrise  # Sunrise-edit
-      - id: BoxSterileMask
-      - id: SecurityMedkit  # Sunrise-edit
-      - id: ClothingOuterCoatAMG
-      - id: ClothingUniformJumpsuitBrigmedic
-      - id: ClothingUniformJumpskirtBrigmedic
-      - id: ClothingUniformJumpskirtOfLife
-        prob: 0.1
-      - id: MedkitFilled
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBrigmedic
+
+- type: entityTable
+  id: FillLockerBrigmedic
+  table: !type:AllSelector
+    children:
+    - id: ClothingEyesGlassesSecurity
+    - id: WeaponDisabler
+    - id: TrackingImplanter
+      amount: 2
+    - id: ClothingOuterHardsuitBrigmedic
+    - id: BoxSterileMask
+    - id: ClothingHeadHatBeretBrigmedic
+    - id: ClothingOuterCoatAMG
+    - id: ClothingUniformJumpsuitBrigmedic
+    - id: ClothingUniformJumpskirtBrigmedic
+    - id: ClothingUniformJumpskirtOfLife
+      prob: 0.1
+    - id: SecurityMedkit  # Sunrise-edit
+    - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+      prob: 0.15
+    - id: ClothingHeadHelmetSecurityMedic
+    - id: ClothingOuterVestSecurityMedic
+      prob: 0.5
+    - id: ClothingOuterCoatLabSecurityMedic
+      prob: 0.5
+    - !type:GroupSelector
+      prob: 0.7
+      children:
       - id: MedkitCombatFilled
-        prob: 0.6
+        weight: 1.6
       - id: MedkitAdvancedFilled
-        prob: 0.4
       - id: MedkitOxygenFilled
-        prob: 0.3
+        weight: 0.8
       - id: MedkitBruteFilled
-        prob: 0.3
+        weight: 0.8
       - id: MedkitToxinFilled
-        prob: 0.3
+        weight: 0.8
       - id: MedkitBurnFilled
-        prob: 0.7
-      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
-        prob: 0.15
-      - id: ClothingHeadHelmetSecurityMedic
-      - id: ClothingOuterVestSecurityMedic
-        prob: 0.5
-      - id: ClothingOuterCoatLabSecurityMedic
-        prob: 0.5
+        weight: 1.8
 
 - type: entity
   id: LockerDetectiveFilled
   suffix: Filled
   parent: LockerDetective
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingEyesGlassesNoir
-      - id: ClothingHeadHatDetGadget
-      - id: ClothingNeckTieDet
-      - id: ClothingOuterVestDetective
-      - id: ClothingOuterCoatDetectiveLoadout
-      - id: FlippoEngravedLighter
-      - id: FlashlightSeclite
-      - id: ForensicScanner
-      - id: LogProbeCartridge
-      - id: BoxForensicPad
-      - id: DrinkDetFlask
-      - id: ClothingHandsGlovesForensic
-      - id: RubberStampDetective
-      - id: HoloprojectorSecurity
-      - id: BoxEvidenceMarkers
-      - id: HandLabeler
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerDetective
+
+- type: entityTable
+  id: FillLockerDetective
+  table: !type:AllSelector
+    children:
+    - id: ClothingEyesGlassesNoir
+    - id: ClothingHeadHatDetGadget
+    - id: ClothingNeckTieDet
+    - id: ClothingOuterVestDetective
+    - id: ClothingOuterCoatDetectiveLoadout
+    - id: FlippoEngravedLighter
+    - id: FlashlightSeclite
+    - id: ForensicScanner
+    - id: LogProbeCartridge
+    - id: BoxForensicPad
+    - id: DrinkDetFlask
+    - id: ClothingHandsGlovesForensic
+    - id: RubberStampDetective
+    - id: HoloprojectorSecurity
+    - id: BoxEvidenceMarkers
+    - id: HandLabeler
       - id: PortableSurveillanceCameraMonitor # Sunrise-edit
 
 - type: entity
@@ -156,22 +176,36 @@
   parent: ClosetBomb
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHelmetBombSuit
-      - id: ClothingOuterSuitBomb
-      - id: Wirecutter
-      - id: Screwdriver
-      - id: Multitool
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetBomb
+
+- type: entityTable
+  id: FillClosetBomb
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHelmetBombSuit
+    - id: ClothingOuterSuitBomb
+    - id: Wirecutter
+    - id: Screwdriver
+    - id: Multitool
+      prob: 0.5
 
 - type: entity
   parent: [GunSafeBaseSecure, BaseSecurityContraband]
   id: GunSafeDisabler
   name: disabler safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeDisabler
+
+- type: entityTable
+  id: FillGunSafeDisabler
+  table: !type:AllSelector
+    children:
     - id: WeaponDisabler
       amount: 5
 
@@ -180,8 +214,15 @@
   id: GunSafePistolMk58
   name: mk58 safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafePistolMk58
+
+- type: entityTable
+  id: FillGunSafePistolMk58
+  table: !type:AllSelector
+    children:
     - id: WeaponPistolMk58
       amount: 4
     - id: MagazinePistol
@@ -192,8 +233,15 @@
   id: GunSafeRifleLecter
   name: lecter safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeRifleLecter
+
+- type: entityTable
+  id: FillGunSafeRifleLecter
+  table: !type:AllSelector
+    children:
     - id: WeaponRifleLecter
       amount: 2
     - id: MagazineRifleFMJ
@@ -204,8 +252,15 @@
   id: GunSafeSubMachineGunDrozd
   name: drozd safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeSubMachineGunDrozd
+
+- type: entityTable
+  id: FillGunSafeSubMachineGunDrozd
+  table: !type:AllSelector
+    children:
     - id: WeaponSubMachineGunDrozd
       amount: 2
     - id: MagazinePistolSubMachineGun
@@ -216,8 +271,15 @@
   id: GunSafeShotgunEnforcer
   name: enforcer safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeShotgunEnforcer
+
+- type: entityTable
+  id: FillGunSafeShotgunEnforcer
+  table: !type:AllSelector
+    children:
     - id: SpeedLoaderMagnumBasic
       amount: 2
     - id: WeaponShotgunEnforcer
@@ -230,14 +292,21 @@
   id: GunSafeShotgunKammerer
   name: kammerer safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeShotgunKammerer
+
+- type: entityTable
+  id: FillGunSafeShotgunKammerer
+  table: !type:AllSelector
+    children:
     - id: SpeedLoaderMagnumBasic
       amount: 2
     - id: WeaponShotgunKammerer
       amount: 2
     - id: BoxLethalshot
-      amount: 2
+      amount: 4
 
 - type: entity
   id: GunSafeSubMachineGunWt550
@@ -245,8 +314,15 @@
   parent: [GunSafeBaseSecure, BaseSecurityContraband]
   name: wt550 safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeSubMachineGunWt550
+
+- type: entityTable
+  id: FillGunSafeSubMachineGunWt550
+  table: !type:AllSelector
+    children:
     - id: WeaponSubMachineGunWt550
       amount: 2
     - id: MagazinePistolSubMachineGunTopMounted
@@ -257,7 +333,14 @@
   id: GunSafeLaserCarbine
   name: laser safe
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeLaserCarbine
+
+- type: entityTable
+  id: FillGunSafeLaserCarbine
+  table: !type:AllSelector
+    children:
     - id: WeaponLaserCarbine
       amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 8c0d42c62d..7e05ded19b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -3,24 +3,28 @@
   suffix: Filled
   parent: LockerBooze
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterArmorBasicSlim
-      - id: WeaponShotgunDoubleBarreledRubber
-      - id: DrinkShaker
-      - id: ClothingEyesHudBeer
-      - id: HandLabeler
-        amount: 1
-      - id: DrinkBottleBeer
-        prob: 0.5
-      - id: DrinkBottleBeer
-        prob: 0.5
-      - id: DrinkBottleBeer
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBooze
+
+- type: entityTable
+  id: FillLockerBooze
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterArmorBasicSlim
+    - id: WeaponShotgunDoubleBarreledRubber
+    - id: DrinkShaker
+    - id: ClothingEyesHudBeer
+    - id: HandLabeler
+    - id: DrinkBottleBeer
+      amount: !type:BinomialNumberSelector
+        trials: 3
+    - !type:AllSelector
+      rolls: 2
+      children:
       - id: BoxBeanbag
-        amount: 2
       - id: RagItem
-        amount: 2
 
 #- type: entity
 #  id: LockerFormalFilled
@@ -32,102 +36,135 @@
   suffix: Filled
   parent: ClosetChef
   components:
-  - type: StorageFill
-    contents:
-      - id: VariantCubeBox
-      - id: BoxMousetrap
-        amount: 2
-      - id: SprayBottleWater
-      - id: ReagentContainerFlour
-        amount: 2
-      - id: FoodBoxCloth
-        amount: 1
-      - id: ReagentContainerSugar
-      - id: FoodCondimentPacketSalt
-        amount: 3
-      - id: FoodCondimentPacketPepper
-        amount: 3
-      - id: FoodCondimentBottleEnzyme
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetChef
+
+- type: entityTable
+  id: FillClosetChef
+  table: !type:AllSelector
+    children:
+    - id: VariantCubeBox
+    - id: SprayBottleWater
+    - id: FoodBoxCloth
+    - id: ReagentContainerSugar
+    - id: FoodCondimentBottleEnzyme
+    - id: DrinkSoyMilkCarton
+    - !type:AllSelector
+      rolls: 2
+      children:
+      - id: DrinkMilkCarton
       # really, milk should go in the fridge. Unfortunately saltern only has freezers.
       # yes, I'm using this as an excuse to not have to do extra work.
-      - id: DrinkMilkCarton
-        amount: 2
-      - id: DrinkSoyMilkCarton
+      - id: ReagentContainerFlour
+      - id: BoxMousetrap
+    - !type:AllSelector
+      rolls: 3
+      children:
+      - id: FoodCondimentPacketSalt
+      - id: FoodCondimentPacketPepper
 
 - type: entity
   id: ClosetJanitorFilled
   suffix: Filled
   parent: ClosetJanitor
   components:
-  - type: StorageFill
-    contents:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetJanitor
+
+- type: entityTable
+  id: FillClosetJanitor
+  table: !type:AllSelector
+    children:
+    - id: WetFloorSign
+      amount: 3
+    - id: LightReplacer
+    - id: BoxLightMixed
+    - id: Holoprojector
+    - !type:AllSelector
+      rolls: 2
+      children:
       - id: MopItem
-        amount: 2
       - id: BoxMousetrap
-        amount: 2
-      - id: WetFloorSign
-        amount: 3
       - id: TrashBag
-        amount: 2
-      - id: LightReplacer
-      - id: BoxLightMixed
-      - id: Holoprojector
       - id: SoapNT
-        amount: 2
       - id: FlashlightLantern
-        amount: 2
       - id: Plunger
-        amount: 2
+      - id: WireBrush
 
 - type: entity
   id: ClosetLegalFilled
   suffix: Filled
   parent: ClosetLegal
   components:
-  - type: StorageFill
-    contents:
-      - id: BriefcaseBrownFilled
-        prob: 0.80
-      - id: ClothingOuterRobesJudge
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetLegal
+
+- type: entityTable
+  id: FillClosetLegal
+  table: !type:AllSelector
+    children:
+    - id: BriefcaseBrownFilled
+      prob: 0.80
+    - id: ClothingOuterRobesJudge
 
 - type: entity
   id: LockerBotanistFilled
   suffix: Filled
   parent: LockerBotanist
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHandsGlovesLeather
-      - id: ClothingOuterApronBotanist
-      - id: ClothingHeadBandBotany
-      - id: ChemistryBottleRobustHarvest
-        prob: 0.3
-      - id: ClothingBeltPlant
-      - id: PlantBag ##Some maps don't have nutrivend
-      - id: PlantAnalyzer
-      - id: BoxMouthSwab
-      - id: Dropper
-      - id: HandLabeler
-      - id: ClothingUniformOveralls
-      - id: ClothingHeadHatTrucker
-        prob: 0.1
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBotanist
+
+- type: entityTable
+  id: FillLockerBotanist
+  table: !type:AllSelector
+    children:
+    - id: ClothingHandsGlovesLeather
+    - id: ClothingOuterApronBotanist
+    - id: ClothingHeadBandBotany
+    - id: ChemistryBottleRobustHarvest
+      prob: 0.3
+    - id: ClothingBeltPlant
+    - id: PlantBag ##Some maps don't have nutrivend
+    - id: BoxMouthSwab
+    - id: Dropper
+    - id: HandLabeler
+    - id: ClothingUniformOveralls
+    - id: ClothingHeadHatTrucker
+      prob: 0.1
+    - id: PlantAnalyzer
 
 - type: entity
   id: LockerBotanistLoot
   suffix: Loot
   parent: LockerBotanist
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformOveralls
-      - id: ClothingHeadHatTrucker
-        prob: 0.3
-      - id: GatfruitSeeds
-        prob: 0.1
-      - id: FlyAmanitaSeeds
-        prob: 0.5
-      - id: NettleSeeds
-        prob: 0.7
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerBotanistLoot
+
+- type: entityTable
+  id: FillLockerBotanistLoot
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformOveralls
+    - id: ClothingHeadHatTrucker
+      prob: 0.3
+    - id: GatfruitSeeds
+      prob: 0.1
+    - id: FlyAmanitaSeeds
+      prob: 0.5
+    - id: NettleSeeds
+      prob: 0.7
 
 - type: entity
   id: ClosetJanitorBombFilled
@@ -135,7 +172,14 @@
   suffix: DO NOT MAP, Filled
   categories: [ DoNotMap ]
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHelmetJanitorBombSuit
-      - id: ClothingOuterSuitJanitorBomb
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetJanitorBomb
+
+- type: entityTable
+  id: FillClosetJanitorBomb
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHelmetJanitorBombSuit
+    - id: ClothingOuterSuitJanitorBomb
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml b/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
index a35c5915ab..940072a335 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
@@ -5,11 +5,18 @@
   suffix: NTSRA voidsuit locker
   parent: LockerSyndicate
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHelmetAncient
-      - id: ClothingOuterHardsuitAncientEVA
-      - id: JetpackVoidFilled
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FilLockerOldAISat
+
+- type: entityTable
+  id: FilLockerOldAISat
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHelmetAncient
+    - id: ClothingOuterHardsuitAncientEVA
+    - id: JetpackVoidFilled
 
 #Syndicate ship armory stuff
 - type: entity
@@ -17,35 +24,49 @@
   parent: LockerSyndicate
   suffix: Basic ship gear, Random
   components:
-  - type: StorageFill
-    contents:
-      - id: CrowbarRed
-        prob: 0.6
-      - id: ClothingShoesBootsCombat
-        prob: 0.4
-      - id: ClothingUniformJumpsuitOperative
-        prob: 0.4
-      - id: ClothingHandsGlovesCombat
-        prob: 0.2
-      - id: ClothingBeltMilitaryWebbing
-        prob: 0.2
-        
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FilLockerSyndicateShipGearBasic
+
+- type: entityTable
+  id: FilLockerSyndicateShipGearBasic
+  table: !type:AllSelector
+    children:
+    - id: CrowbarRed
+      prob: 0.6
+    - id: ClothingShoesBootsCombat
+      prob: 0.4
+    - id: ClothingUniformJumpsuitOperative
+      prob: 0.4
+    - id: ClothingHandsGlovesCombat
+      prob: 0.2
+    - id: ClothingBeltMilitaryWebbing
+      prob: 0.2
+
 #Garunteed chameleon kit spawn, for the syndicate dropship
 - type: entity
   id: LockerSyndicateShipGearBasicChameleonKit
   parent: LockerSyndicateShipGearBasic
   suffix: Basic ship gear, Random, Chameleon Kit
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingBackpackChameleonFill
-      - id: CrowbarRed
-        prob: 0.6
-      - id: ClothingShoesBootsCombat
-        prob: 0.4
-      - id: ClothingUniformJumpsuitOperative
-        prob: 0.4
-      - id: ClothingHandsGlovesCombat
-        prob: 0.2
-      - id: ClothingBeltMilitaryWebbing
-        prob: 0.2
\ No newline at end of file
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FilLockerSyndicateShipGearBasicChameleonKit
+
+- type: entityTable
+  id: FilLockerSyndicateShipGearBasicChameleonKit
+  table: !type:AllSelector
+    children:
+    - id: ClothingBackpackChameleonFill
+    - id: CrowbarRed
+      prob: 0.6
+    - id: ClothingShoesBootsCombat
+      prob: 0.4
+    - id: ClothingUniformJumpsuitOperative
+      prob: 0.4
+    - id: ClothingHandsGlovesCombat
+      prob: 0.2
+    - id: ClothingBeltMilitaryWebbing
+      prob: 0.2
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 36061f2df7..2b2b82b759 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -5,12 +5,19 @@
   parent: SuitStorageBase
   suffix: EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVA
-        - id: ClothingHeadHelmetEVA
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVA
+
+- type: entityTable
+  id: FillSuitStorageEVA
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitEVA
+    - id: ClothingHeadHelmetEVA
+    - id: ClothingMaskBreath
 
 #Basic EVA (Big Ass Helmet)
 - type: entity
@@ -18,12 +25,19 @@
   parent: SuitStorageBase
   suffix: EVA, Large Helmet
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVA
-        - id: ClothingHeadHelmetEVALarge
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAAlternate
+
+- type: entityTable
+  id: FillSuitStorageEVAAlternate
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitEVA
+    - id: ClothingHeadHelmetEVALarge
+    - id: ClothingMaskBreath
 
 #Emergency EVA
 - type: entity
@@ -31,11 +45,18 @@
   parent: SuitStorageBase
   suffix: Emergency EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterSuitEmergency
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAEmergency
+
+- type: entityTable
+  id: FillSuitStorageEVAEmergency
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterSuitEmergency
+    - id: ClothingMaskBreath
 
 #Prisoner EVA
 - type: entity
@@ -43,12 +64,19 @@
   parent: SuitStorageBase
   suffix: Prisoner EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVAPrisoner
-        - id: ClothingHeadHelmetEVALarge
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAPrisoner
+
+- type: entityTable
+  id: FillSuitStorageEVAPrisoner
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitEVAPrisoner
+    - id: ClothingHeadHelmetEVALarge
+    - id: ClothingMaskBreath
 
 #Syndicate EVA
 - type: entity
@@ -56,12 +84,19 @@
   parent: SuitStorageBase
   suffix: Syndicate EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterEVASuitSyndicate
-        - id: ClothingHeadHelmetSyndicate
-        - id: ClothingMaskGasSyndicate
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVASyndicate
+
+- type: entityTable
+  id: FillSuitStorageEVASyndicate
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterEVASuitSyndicate
+    - id: ClothingHeadHelmetSyndicate
+    - id: ClothingMaskGasSyndicate
 
 #Pirate EVA
 - type: entity
@@ -69,12 +104,19 @@
   parent: SuitStorageBase
   suffix: Pirate EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitPirateEVA
-        - id: ClothingMaskGas
-        - id: ClothingShoesBootsMagPirate
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVAPirate
+
+- type: entityTable
+  id: FillSuitStorageEVAPirate
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitPirateEVA
+    - id: ClothingMaskGas
+    - id: ClothingShoesBootsMagPirate
 
 #NTSRA Voidsuit
 - type: entity
@@ -82,12 +124,19 @@
   parent: SuitStorageBase
   suffix: Ancient EVA
   components:
-  - type: StorageFill
-    contents:
-        - id: JetpackVoidFilled
-        - id: ClothingOuterHardsuitAncientEVA
-        - id: ClothingHeadHelmetAncient
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageEVANTSRA
+
+- type: entityTable
+  id: FillSuitStorageEVANTSRA
+  table: !type:AllSelector
+    children:
+    - id: JetpackVoidFilled
+    - id: ClothingOuterHardsuitAncientEVA
+    - id: ClothingHeadHelmetAncient
+    - id: ClothingMaskBreath
 
 #HARDSUITS
 #Engineering hardsuit
@@ -134,16 +183,21 @@
   parent: SuitStorageBase
   suffix: Security
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitSecurity
-        - id: ClothingMaskBreath
-        - id: ClothingShoesBootsMagSec  # Sunrise-edit
-          prob: 0.3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageSecurity
   - type: AccessReader
     access: [["Security"]]
 
+- type: entityTable
+  id: FillSuitStorageSecurity
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitSecurity
+    - id: ClothingMaskBreath
+
 #CE's hardsuit
 - type: entity
   id: SuitStorageCE
@@ -202,13 +256,10 @@
   parent: SuitStorageBase
   suffix: Warden
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitWarden
-        - id: ClothingMaskBreath
-        - id: ClothingShoesBootsMagSec  # Sunrise-edit
-          prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerWardenHarduit
   - type: AccessReader
     access: [["Armory"]]
 
@@ -250,12 +301,19 @@
   parent: SuitStorageBase
   suffix: Syndicate Hardsuit
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitSyndieBiocode # Sunrise-Edit
-        - id: ClothingShoesBootsMagSyndie
-        - id: ClothingMaskGasSyndicate
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageSyndie
+
+- type: entityTable
+  id: FillSuitStorageSyndie
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitSyndieBiocode # Sunrise-Edit
+    - id: ClothingShoesBootsMagSyndie
+    - id: ClothingMaskGasSyndicate
 
 #Pirate Captain's hardsuit
 - type: entity
@@ -263,12 +321,19 @@
   parent: SuitStorageBase
   suffix: Pirate Captain
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitPirateCap
-        - id: ClothingMaskGas
-        - id: ClothingShoesBootsMagPirate
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStoragePirateCap
+
+- type: entityTable
+  id: FillSuitStoragePirateCap
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitPirateCap
+    - id: ClothingMaskGas
+    - id: ClothingShoesBootsMagPirate
 
 #Wizard
 - type: entity
@@ -276,10 +341,17 @@
   parent: SuitStorageBase
   suffix: Wizard
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingMaskBreath
-        # TODO: Gone until reworked to have no space protection
-        #- id: ClothingOuterHardsuitWizard
-        #- id: JetpackVoidFilled
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSuitStorageWizard
+
+- type: entityTable
+  id: FillSuitStorageWizard
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
+    # TODO: Gone until reworked to have no space protection
+    #- id: ClothingOuterHardsuitWizard
+    #- id: JetpackVoidFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
index 4e885a08b2..d65469ccd2 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -3,60 +3,111 @@
   suffix: Filled
   parent: WardrobeGrey
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorGrey
-        amount: 2
-      - id: ClothingUniformJumpskirtColorGrey
-        amount: 2
-      - id: ClothingShoesColorBlack
-        amount: 3
-      - id: ClothingHeadHatGreysoft
-      - id: ClothingBackpackDuffel
-        prob: 0.5
-      - id: ClothingOuterCoatBomber
-        prob: 0.3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGrey
+
+- type: entity
+  id: ClosetWallWardrobeGreyFilled
+  suffix: Filled
+  parent: ClosetWallGrey
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGrey
+
+- type: entityTable
+  id: FillWardrobeGrey
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorGrey
+      amount: 2
+    - id: ClothingUniformJumpskirtColorGrey
+      amount: 2
+    - id: ClothingShoesColorBlack
+      amount: 3
+    - id: ClothingHeadHatGreysoft
+    - id: ClothingBackpackDuffel
+      prob: 0.5
+    - id: ClothingOuterCoatBomber
+      prob: 0.3
 
 - type: entity
   id: WardrobeMixedFilled
   suffix: Filled
   parent: WardrobeMixed
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingShoesColorBlack
-        amount: 1
-      - id: ClothingShoesColorBrown
-        amount: 1
-      - id: ClothingShoesColorWhite
-        amount: 1
-      - id: ClothingOuterCoatBomber
-        prob: 0.4
-      - id: ClothingOuterCoatGentle
-        prob: 0.3
-      - id: ClothingUniformRandomShorts
-        amount: 3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeMixed
+
+- type: entity
+  id: ClosetWallWardrobeMixedFilled
+  suffix: Filled
+  parent: ClosetWallMixed
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeMixed
+
+- type: entityTable
+  id: FillWardrobeMixed
+  table: !type:AllSelector
+    children:
+    - id: ClothingShoesColorBlack
+    - id: ClothingShoesColorBrown
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatBomber
+      prob: 0.4
+    - id: ClothingOuterCoatGentle
+      prob: 0.3
+    - id: ClothingUniformRandomShorts
+      amount: 3
+    - id: ClothingUniformRandomBra
+      amount: 5
+    - !type:AllSelector
+      rolls: 5
+      children:
       - id: ClothingUniformRandomArmless
-        amount: 5
+        prob: 0.8
       - id: ClothingUniformRandomStandard
-        amount: 5
-      - id: ClothingUniformRandomBra
-        amount: 5
+        prob: 0.8
       - id: ClothingUniformRandomShirt
-        amount: 4
+        prob: 0.8
 
 - type: entity
   id: WardrobeYellowFilled
   suffix: Filled
   parent: WardrobeYellow
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorYellow
-      - id: ClothingUniformJumpskirtColorYellow
-      - id: ClothingShoesColorOrange
-        amount: 2
-      - id: ClothingHeadBandGold
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeYellow
+
+- type: entity
+  id: ClosetWallWardrobeYellowFilled
+  suffix: Filled
+  parent: ClosetWallYellow
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeYellow
+
+- type: entityTable
+  id: FillWardrobeYellow
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorYellow
+    - id: ClothingUniformJumpskirtColorYellow
+    - id: ClothingShoesColorOrange
+      amount: 2
+    - id: ClothingHeadBandGold
 
 
 - type: entity
@@ -64,62 +115,147 @@
   suffix: Filled
   parent: WardrobeWhite
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorWhite
-      - id: ClothingUniformJumpskirtColorWhite
-      - id: ClothingShoesColorWhite
-        amount: 2
-      - id: ClothingHeadHatMimesoft
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeWhite
+
+- type: entity
+  id: ClosetWallWardrobeWhiteFilled
+  suffix: Filled
+  parent: ClosetWallWhite
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeWhite
+
+- type: entityTable
+  id: FillWardrobeWhite
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorWhite
+    - id: ClothingUniformJumpskirtColorWhite
+    - id: ClothingShoesColorWhite
+      amount: 2
+    - id: ClothingHeadHatMimesoft
 
 - type: entity
   id: WardrobeBlueFilled
   suffix: Filled
   parent: WardrobeBlue
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorBlue
-      - id: ClothingUniformJumpskirtColorBlue
-      - id: ClothingShoesColorBrown
-        amount: 2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlue
+
+- type: entity
+  id: ClosetWallWardrobeBlueFilled
+  suffix: Filled
+  parent: ClosetWallBlue
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlue
+
+- type: entityTable
+  id: FillWardrobeBlue
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorBlue
+    - id: ClothingUniformJumpskirtColorBlue
+    - id: ClothingShoesColorBrown
+      amount: 2
 
 - type: entity
   id: WardrobePinkFilled
   suffix: Filled
   parent: WardrobePink
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorPink
-      - id: ClothingUniformJumpskirtColorPink
-      - id: ClothingShoesColorBrown
-        amount: 2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePink
+
+- type: entity
+  id: ClosetWallWardrobePinkFilled
+  suffix: Filled
+  parent: ClosetWallPink
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePink
+
+- type: entityTable
+  id: FillWardrobePink
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorPink
+    - id: ClothingUniformJumpskirtColorPink
+    - id: ClothingShoesColorBrown
+      amount: 2
 
 - type: entity
   id: WardrobeBlackFilled
   suffix: Filled
   parent: WardrobeBlack
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorBlack
-      - id: ClothingUniformJumpskirtColorBlack
-      - id: ClothingShoesColorBlack
-        amount: 2
-      - id: ClothingHeadBandBlack
-      - id: ClothingHeadBandSkull
-        prob: 0.4
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlack
+
+- type: entity
+  id: ClosetWallWardrobeBlackFilled
+  suffix: Filled
+  parent: ClosetWallBlack
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBlack
+
+- type: entityTable
+  id: FillWardrobeBlack
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorBlack
+    - id: ClothingUniformJumpskirtColorBlack
+    - id: ClothingShoesColorBlack
+      amount: 2
+    - id: ClothingHeadBandBlack
+    - id: ClothingHeadBandSkull
+      prob: 0.4
 
 - type: entity
   id: WardrobeGreenFilled
   suffix: Filled
   parent: WardrobeGreen
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitColorGreen
-      - id: ClothingUniformJumpskirtColorGreen
-      - id: ClothingShoesColorBlack
-        amount: 2
-      - id: ClothingHeadBandGreen
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGreen
+
+- type: entity
+  id: ClosetWallWardrobeGreenFilled
+  suffix: Filled
+  parent: ClosetWallGreen
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGreen
+
+- type: entityTable
+  id: FillWardrobeGreen
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitColorGreen
+    - id: ClothingUniformJumpskirtColorGreen
+    - id: ClothingShoesColorBlack
+      amount: 2
+    - id: ClothingHeadBandGreen
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
index 49601980f3..dc944a803c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -1,18 +1,83 @@
- - type: entity
-   id: WardrobePrisonFilled
-   suffix: Filled
-   parent: WardrobePrison
-   description: "Contains a selection of nice orange clothes for people enjoying their stay in the brig."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitPrisoner
-         amount: 2
-       - id: ClothingUniformJumpskirtPrisoner
-         amount: 2
-       - id: ClothingShoesColorBlack
-         amount: 2
-       - id: ClothingMaskMuzzle
+- type: entity
+  id: WardrobePrisonFilled
+  suffix: Filled
+  parent: WardrobePrison
+  description: "Contains a selection of nice orange clothes for people enjoying their stay in the brig."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePrison
+
+- type: entity
+  id: ClosetWallWardrobePrisonFilled
+  suffix: Filled
+  parent: ClosetWallOrange
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobePrison
+
+- type: entityTable
+  id: FillWardrobePrison
+  table: !type:AllSelector
+    children:
+    - !type:AllSelector
+      rolls: 2
+      children:
+      - id: ClothingUniformJumpsuitPrisoner
+      - id: ClothingUniformJumpskirtPrisoner
+      - id: ClothingShoesColorBlack
+    - id: ClothingMaskMuzzle
+    - !type:GroupSelector
+      prob: 0.15
+      rolls: 2
+      children:
+      - id: FoodSnackBoritos
+      - id: FoodSnackCheesie
+      - id: FoodSnackChips
+      - id: FoodSnackRaisins
+      - id: FoodSnackMREBrownie
+      - id: FoodSnackChocolate
+      - id: FoodSnackChowMein
+    - !type:GroupSelector
+      prob: 0.25
+      children:
+      - id: BookRandomStory
+      - id: BookRandom
+    - !type:GroupSelector
+      prob: 0.15
+      children:
+      - id: Flare
+      - id: BarberScissors
+      - id: FlippoLighter
+      - id: trayScanner
+      - id: Wristwatch
+      - id: ClothingNeckBling
+      - id: ClothingMultipleHeadphones
+      - id: DiceBag
+      - id: PersonalAI
+      - id: CrayonBox
+      - id: HarmonicaInstrument
+      - id: ToyAmongPequeno
+      - id: WhoopieCushion
+      - id: Brutepack
+      - id: StrangePill
+      - id: Shiv
+    - !type:GroupSelector
+      prob: 0.1
+      children:
+      - id: CigPackBlack
+      - id: Joint
+      - id: Blunt
+      - id: PackPaperRolling
+      - id: Cigarette
+        amount: !type:RangeNumberSelector
+          range: 1, 4
+      - id: GroundCannabis
+        amount: !type:RangeNumberSelector
+          range: 1, 6
 
 #- type: entity
 #  id: WardrobePajamaFilled
@@ -20,202 +85,304 @@
 #  parent: WardrobeWhite
 #  name: pajama wardrobe
 
- - type: entity
-   id: WardrobeRoboticsFilled
-   suffix: Filled
-   parent: WardrobeRobotics
-   description: "You can build a robot out of this locker."
-   components:
-   - type: StorageFill
-     contents:
-     - id: ClothingOuterCoatRobo
-       amount: 2
-     - id: ClothingUniformJumpsuitRoboticist
-     - id: ClothingUniformJumpskirtRoboticist
-     - id: ClothingShoesColorBlack
-       amount: 2
-     - id: ClothingHandsGlovesFingerless
-       amount: 2
+- type: entity
+  id: WardrobeRoboticsFilled
+  suffix: Filled
+  parent: WardrobeRobotics
+  description: "You can build a robot out of this locker."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeRobotics
 
- - type: entity
-   id: WardrobeChemistryFilled
-   suffix: Filled
-   parent: WardrobeChemistry
-   description: "The sleek orange threads contained within make you much less likely to be thrown out of the chemistry lab."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitChemistry
-       - id: ClothingBackpackChemistry
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLabChem
-       - id: ClothingUniformJumpskirtChemistry
+- type: entityTable
+  id: FillWardrobeRobotics
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitRoboticist
+    - id: ClothingUniformJumpskirtRoboticist
+    - !type:AllSelector
+      rolls: 2
+      children:
+      - id: ClothingOuterCoatRobo
+      - id: ClothingShoesColorBlack
+      - id: ClothingHandsGlovesFingerless
 
- - type: entity
-   id: WardrobeGeneticsFilled
-   suffix: Filled
-   parent: WardrobeGenetics
-   description: "The sleek blue threads contained within make you much less likely to be thrown out of the genetics lab."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitGenetics
-       - id: ClothingBackpackGenetics
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLabGene
-       - id: ClothingUniformJumpskirtGenetics
+- type: entity
+  id: WardrobeChemistryFilled
+  suffix: Filled
+  parent: WardrobeChemistry
+  description: "The sleek orange threads contained within make you much less likely to be thrown out of the chemistry lab."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeChemistry
 
- - type: entity
-   id: WardrobeVirologyFilled
-   suffix: Filled
-   parent: WardrobeVirology
-   description: "The sleek green threads contained within make you much less likely to be thrown out of the virology lab."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitVirology
-       - id: ClothingBackpackVirology
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLabViro
-       - id: ClothingUniformJumpskirtVirology
+- type: entityTable
+  id: FillWardrobeChemistry
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitChemistry
+    - id: ClothingBackpackChemistry
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLabChem
+    - id: ClothingUniformJumpskirtChemistry
 
- - type: entity
-   id: WardrobeScienceFilled
-   suffix: Filled
-   parent: WardrobeScience
-   description: "You've read a couple pop science articles, now it's time for the real deal."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitScientist
-       - id: ClothingBackpackScience
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatRnd
-       - id: ClothingUniformJumpskirtScientist
-       - id: ClothingEyesGlasses
-         prob: 0.5
-       - id: CrowbarRed #The jojoke - hit video game Half-Life
-         prob: 0.1
+- type: entity
+  id: WardrobeGeneticsFilled
+  suffix: Filled
+  parent: WardrobeGenetics
+  description: "The sleek blue threads contained within make you much less likely to be thrown out of the genetics lab."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeGenetics
 
+- type: entityTable
+  id: FillWardrobeGenetics
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitGenetics
+    - id: ClothingBackpackGenetics
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLabGene
+    - id: ClothingUniformJumpskirtGenetics
 
- - type: entity
-   id: WardrobeBotanistFilled
-   suffix: Filled
-   parent: WardrobeBotanist
-   description: "Plant yourself among the plant men with these 100% natural plant-derived clothes."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitHydroponics
-       - id: ClothingBackpackHydroponics
-       - id: ClothingShoesColorBrown
-       - id: ClothingOuterApronBotanist
-       - id: ClothingUniformJumpskirtHydroponics
-       - id: ClothingUniformOveralls
-       - id: ClothingHeadHatTrucker #the hat itself is a subtle joke
-         prob: 0.15
-       - id: ClothingHandsGlovesLeather
-         prob: 0.5
+- type: entity
+  id: WardrobeVirologyFilled
+  suffix: Filled
+  parent: WardrobeVirology
+  description: "The sleek green threads contained within make you much less likely to be thrown out of the virology lab."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeVirology
 
- - type: entity
-   id: WardrobeMedicalDoctorFilled
-   suffix: Filled
-   parent: WardrobeMedicalDoctor
-   description: "We've all played doctor before, now practice medicine."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitMedicalDoctor
-       - id: ClothingBackpackMedical
-       - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLab
-       - id: ClothingUniformJumpskirtMedicalDoctor
-       - id: ClothingHandsGlovesLatex
-         prob: 0.4
-       - id: ClothingEyesGlasses
-         prob: 0.3
+- type: entityTable
+  id: FillWardrobeVirology
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitVirology
+    - id: ClothingBackpackVirology
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLabViro
+    - id: ClothingUniformJumpskirtVirology
 
- - type: entity
-   id: WardrobeChapelFilled
-   suffix: Filled
-   parent: WardrobeChapel
-   description: "You have to look presentable for your flock."
-   components:
-   - type: StorageFill
-     contents: # todo chaplain backpack
-       - id: ClothingUniformJumpsuitChaplain
-       - id: ClothingShoesColorBlack
-       - id: ClothingUniformJumpskirtChaplain
+- type: entity
+  id: WardrobeScienceFilled
+  suffix: Filled
+  parent: WardrobeScience
+  description: "You've read a couple pop science articles, now it's time for the real deal."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeScience
 
- - type: entity
-   id: WardrobeSecurityFilled
-   suffix: Filled
-   parent: WardrobeSecurity
-   description: "Cross the thin red line."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitSec
-       - id: ClothingBackpackSecurity
-       - id: ClothingShoesBootsJack
-       - id: ClothingEyesGlassesSunglasses
-       - id: ClothingHeadHelmetBasic
-       - id: ClothingOuterArmorBasic
-       - id: ClothingUniformJumpskirtSec
+- type: entityTable
+  id: FillWardrobeScience
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitScientist
+    - id: ClothingBackpackScience
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatRnd
+    - id: ClothingUniformJumpskirtScientist
+    - id: ClothingEyesGlasses
+      prob: 0.5
+    - id: CrowbarRed #The jojoke - hit video game Half-Life
+      prob: 0.1
 
- - type: entity
-   id: WardrobeCargoFilled
-   suffix: Filled
-   parent: WardrobeCargo
-   description: "This locker? Maybe 500 spesos. Brotherhood? Priceless."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingHeadHatCargosoft
-       - id: ClothingUniformJumpsuitCargo
-       - id: ClothingBackpack
-       - id: ClothingShoesColorBlack
-       - id: ClothingUniformJumpskirtCargo
-       - id: ClothingHandsGlovesFingerless
-       - id: AppraisalTool
+- type: entity
+  id: WardrobeBotanistFilled
+  suffix: Filled
+  parent: WardrobeBotanist
+  description: "Plant yourself among the plant men with these 100% natural plant-derived clothes."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeBotanist
 
- - type: entity
-   id: WardrobeSalvageFilled
-   suffix: Filled
-   parent: WardrobeSalvage
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingBackpack
-       - id: ClothingShoesBootsSalvage
-         amount: 2
-       - id: ClothingUniformJumpsuitSalvageSpecialist
-         amount: 2
+- type: entityTable
+  id: FillWardrobeBotanist
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitHydroponics
+    - id: ClothingBackpackHydroponics
+    - id: ClothingShoesColorBrown
+    - id: ClothingOuterApronBotanist
+    - id: ClothingUniformJumpskirtHydroponics
+    - id: ClothingUniformOveralls
+    - id: ClothingHeadHatTrucker #the hat itself is a subtle joke
+      prob: 0.15
+    - id: ClothingHandsGlovesLeather
+      prob: 0.5
 
- - type: entity
-   id: WardrobeAtmosphericsFilled
-   suffix: Filled
-   parent: WardrobeAtmospherics
-   description: "This locker contains a uniform for atmospheric technicians."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingUniformJumpsuitAtmos
-       - id: ClothingBackpackEngineering
-       - id: ClothingShoesColorWhite
-       - id: ClothingUniformJumpskirtAtmos
+- type: entity
+  id: WardrobeMedicalDoctorFilled
+  suffix: Filled
+  parent: WardrobeMedicalDoctor
+  description: "We've all played doctor before, now practice medicine."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeMedicalDoctor
 
- - type: entity
-   id: WardrobeEngineeringFilled
-   suffix: Filled
-   parent: WardrobeEngineering
-   description: "This locker contains a uniform for engineering or social engineering."
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingHeadHatHardhatYellow
-       - id: ClothingUniformJumpsuitEngineering
-       - id: ClothingBackpackEngineering
-       - id: ClothingShoesBootsWork
-       - id: ClothingOuterVestHazard
-       - id: ClothingUniformJumpskirtEngineering
+- type: entityTable
+  id: FillWardrobeMedicalDoctor
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitMedicalDoctor
+    - id: ClothingBackpackMedical
+    - id: ClothingShoesColorWhite
+    - id: ClothingOuterCoatLab
+    - id: ClothingUniformJumpskirtMedicalDoctor
+    - id: ClothingHandsGlovesLatex
+      prob: 0.4
+    - id: ClothingEyesGlasses
+      prob: 0.3
+
+- type: entity
+  id: WardrobeChapelFilled
+  suffix: Filled
+  parent: WardrobeChapel
+  description: "You have to look presentable for your flock."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeChapel
+
+- type: entityTable
+  id: FillWardrobeChapel
+  table: !type:AllSelector
+    children:
+    # todo chaplain backpack
+    - id: ClothingUniformJumpsuitChaplain
+    - id: ClothingShoesColorBlack
+    - id: ClothingUniformJumpskirtChaplain
+
+- type: entity
+  id: WardrobeSecurityFilled
+  suffix: Filled
+  parent: WardrobeSecurity
+  description: "Cross the thin red line."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeSecurity
+
+- type: entityTable
+  id: FillWardrobeSecurity
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitSec
+    - id: ClothingBackpackSecurity
+    - id: ClothingShoesBootsJack
+    - id: ClothingEyesGlassesSunglasses
+    - id: ClothingHeadHelmetBasic
+    - id: ClothingOuterArmorBasic
+    - id: ClothingUniformJumpskirtSec
+
+- type: entity
+  id: WardrobeCargoFilled
+  suffix: Filled
+  parent: WardrobeCargo
+  description: "This locker? Maybe 500 spesos. Brotherhood? Priceless."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeCargo
+
+- type: entityTable
+  id: FillWardrobeCargo
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHatCargosoft
+    - id: ClothingUniformJumpsuitCargo
+    - id: ClothingBackpack
+    - id: ClothingShoesColorBlack
+    - id: ClothingUniformJumpskirtCargo
+    - id: ClothingHandsGlovesFingerless
+    - id: AppraisalTool
+
+- type: entity
+  id: WardrobeSalvageFilled
+  suffix: Filled
+  parent: WardrobeSalvage
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeSalvage
+
+- type: entityTable
+  id: FillWardrobeSalvage
+  table: !type:AllSelector
+    children:
+    - id: ClothingBackpack
+    - id: ClothingShoesBootsSalvage
+      amount: 2
+    - id: ClothingUniformJumpsuitSalvageSpecialist
+      amount: 2
+
+- type: entity
+  id: WardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: WardrobeAtmospherics
+  description: "This locker contains a uniform for atmospheric technicians."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeAtmospherics
+
+- type: entity
+  id: ClosetWallWardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: ClosetWallAtmospherics
+  description: "This locker contains a uniform for atmospheric technicians."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeAtmospherics
+
+- type: entityTable
+  id: FillWardrobeAtmospherics
+  table: !type:AllSelector
+    children:
+    - id: ClothingUniformJumpsuitAtmos
+    - id: ClothingBackpackEngineering
+    - id: ClothingShoesColorWhite
+    - id: ClothingUniformJumpskirtAtmos
+
+- type: entity
+  id: WardrobeEngineeringFilled
+  suffix: Filled
+  parent: WardrobeEngineering
+  description: "This locker contains a uniform for engineering or social engineering."
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillWardrobeEngineering
+
+- type: entityTable
+  id: FillWardrobeEngineering
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadHatHardhatYellow
+    - id: ClothingUniformJumpsuitEngineering
+    - id: ClothingBackpackEngineering
+    - id: ClothingShoesBootsWork
+    - id: ClothingOuterVestHazard
+    - id: ClothingUniformJumpskirtEngineering
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index bcee0d596e..b48720a481 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -51,5 +51,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 f7af74d257..3e12176708 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -29,11 +29,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 f8227090e5..3e66198ce7 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
@@ -68,7 +67,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 0d675fe3df..f80214f133 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 ea4533e8c8..8cd7f5b72f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
@@ -8,6 +8,5 @@
     DrinkHotCoco: 5
   contrabandInventory:
     DrinkTeapot: 2
-    DrinkChamomileTincture: 5 # Sunrise-edit
-  emaggedInventory:
     DrinkNothing: 2
+    DrinkChamomileTincture: 5 # Sunrise-edit
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
index 972c0fca0e..a82fa2c610 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/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
index 9708373dbf..fe397ea8cf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -8,6 +8,7 @@
     FoodSnackPopcorn: 3
     FoodSnackEnergy: 3
     CigPackMixed: 2
+    DiscountDanLighter: 1
   contrabandInventory:
     FoodSnackDanDanNoodles: 3
     FoodBakedBunHoney: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
index fadd3a7d44..b4f25e936d 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 94d05e3629..304d2850ef 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 62c1d6ffcd..3c46c8bf88 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 712a0af993..f62acfe16e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -31,5 +31,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 eaf76ec0c2..9471bc20b3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -21,5 +21,4 @@
   contrabandInventory:
     ChemistryBottleUnstableMutagen: 1
     Joint: 1
-  emaggedInventory:
     ChemistryBottleLeft4Zed: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index 23d836b7c1..79ce6426dc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -35,7 +35,7 @@
     ClothingNeckScarfStripedTrans: 2
     ClothingHeadHatXmasCrown: 2
     BedsheetRainbow: 2
-    ClothingNeckHeadphones: 2
+    ClothingMultipleHeadphones: 2
     ClothingHeadHatFlowerWreath: 2
     ClothingUniformColorRainbow: 2
     ClothingUnderSocksCoder: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
index b48e876a58..f9b0620911 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/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index badf8db075..9132b53312 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -20,6 +20,7 @@
     RiotLaserShield: 2
     RiotBulletShield: 2
     RadioHandheldSecurity: 5
+    Bola: 6
   # security officers need to follow a diet regimen!
   contrabandInventory:
     WeaponMeleeNeedle: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index e159ada250..d8cb48067a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -45,6 +45,5 @@
     WhiteroseSeeds: 5 # Sunrise-add
     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 5523b80b81..ebe8e17eb0 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 5566ea7d0d..680be21b05 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 d76db2a38b..dc39da7c86 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 dac70985ab..ec6a626f51 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 839b03620d..1c69ce3101 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:
     SpaceMedipen: 3
     ClothingMaskBreath: 3
     EmergencyOxygenTankFilled: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
index 688706462b..a1add7c18b 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 c81ca1dbe8..8f9a53248e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -67,7 +67,6 @@
     ClothingHeadHatRichard: 1
     ToyFigurineBoxer: 1
     ToyFigurineMusician: 1
-  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 2bc0e28ab3..ded3c42bc2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -26,8 +26,6 @@
     ClothingHandsGlovesChristmas: 3
     ClothingHandsGlovesChristmasLong: 3
     #sunrise-end
-
   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 cc6fc2fb5d..7d5bab8a05 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -13,9 +13,9 @@
     FlashlightLantern: 5
     ClothingHandsGlovesColorYellowBudget: 3
     SprayPainter: 3
+    SprayPainterAmmo: 5
   # Some engineer forgot to take the multitool out the youtool when working on it, happens.
   contrabandInventory:
     Multitool: 1
-  emaggedInventory:
     ClothingHandsGlovesColorYellow: 1
     SyndicateJawsOfLife: 1 #Sunrise Edit
diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
index d6b1ac61f2..9418582b47 100644
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -3,7 +3,7 @@
   name: thief-backpack-category-chameleon-name
   description: thief-backpack-category-chameleon-description
   sprite:
-    sprite: /Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi
+    sprite: Objects/Devices/chameleon_projector.rsi
     state: icon
   content:
   - ClothingBackpackChameleonFill
@@ -16,8 +16,8 @@
   name: thief-backpack-category-tools-name
   description: thief-backpack-category-tools-description
   sprite:
-    sprite: Objects/Tools/jaws_of_life.rsi
-    state: jaws_pry
+    sprite: Objects/Weapons/Bombs/c4.rsi
+    state: icon
   content:
   - WelderIndustrialAdvanced
   - ClothingEyesGlassesMeson
@@ -82,8 +82,8 @@
   name: thief-backpack-category-communicator-name
   description: thief-backpack-category-communicator-description
   sprite:
-    sprite: Objects/Tools/spy_device.rsi
-    state: icon
+    sprite: Objects/Devices/communication.rsi
+    state: old-radio
   content:
   - EncryptionKeyStationMaster
   - CyberPen
@@ -96,8 +96,8 @@
   name: thief-backpack-category-smuggler-name
   description: thief-backpack-category-smuggler-description
   sprite:
-    sprite: Clothing/Neck/Cloaks/void.rsi
-    state: icon
+    sprite: Objects/Tools/fulton.rsi
+    state: extraction_pack
   content:
   - ScramImplanter # Sunrise-Edit
   - InvisibleCrate
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 476296aac5..1dbbbf0dd7 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -223,6 +223,20 @@
       - AssaultOpsUplink
   #Sunrise-end
 
+- type: listing
+  id: UplinkEstocBundle
+  name: uplink-estoc-bundle-name
+  description: uplink-estoc-bundle-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/estoc.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledRifle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 11
+  cost:
+    Telecrystal: 18
+  categories:
+  - UplinkWeaponry
+
 - type: listing
   id: UplinkBulldogBundle
   name: uplink-buldog-bundle-name
@@ -692,6 +706,17 @@
       - AssaultOpsUplink
   #Sunrise-end
 
+# For the Estoc
+- type: listing
+  id: UplinkEstocAmmo
+  name: uplink-estoc-ammo-name
+  description: uplink-estoc-ammo-desc
+  productEntity: MagazineRifle
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo
+
 # for the hristov
 - type: listing
   id: UplinkHristovAmmo
@@ -1797,20 +1822,6 @@
   categories:
   - UplinkWearables
 
-# TODO: Revert back to normal thieving gloves when clothes dyeing is added
-- type: listing
-  id: UplinkgClothingThievingGloves
-  name: uplink-clothing-chameleon-thieving-gloves-name
-  description: uplink-clothing-chameleon-thieving-gloves-desc
-  productEntity: ClothingHandsChameleonThief
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 3
-  cost:
-    Telecrystal: 5
-  categories:
-  - UplinkWearables
-
 - type: listing
   id: UplinkClothingOuterVestWeb
   name: uplink-clothing-outer-vest-web-name
@@ -2462,6 +2473,17 @@
     - Chef
     - Mime
 
+- type: listing
+  id: UplinkContrabandLighter
+  name: uplink-contraband-lighter-name
+  description: uplink-contraband-lighter-desc
+  icon: { sprite:  Objects/Tools/Lighters/syndielighter.rsi, state: icon}
+  productEntity: UplinkLighterBox
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
 - type: listing
   id: UplinkSmugglerSatchel
   name: uplink-smuggler-satchel-name
@@ -2475,6 +2497,24 @@
   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
diff --git a/Resources/Prototypes/Chat/notifications.yml b/Resources/Prototypes/Chat/notifications.yml
new file mode 100644
index 0000000000..c1aee755c6
--- /dev/null
+++ b/Resources/Prototypes/Chat/notifications.yml
@@ -0,0 +1,21 @@
+- type: chatNotification
+  id: IntellicardDownload
+  message: ai-consciousness-download-warning
+  color: Red
+  sound: /Audio/Misc/notice2.ogg
+  nextDelay: 8
+
+- type: chatNotification
+  id: TurretIsAttacking
+  message: station-ai-turret-component-is-attacking-warning
+  color: Orange
+  sound: /Audio/Misc/notice2.ogg
+  nextDelay: 14
+  notifyBySource: true
+
+- type: chatNotification
+  id: AiWireSnipped
+  message: ai-wire-snipped
+  color: Pink
+  nextDelay: 12
+  notifyBySource: true
diff --git a/Resources/Prototypes/Damage/examine_messages.yml b/Resources/Prototypes/Damage/examine_messages.yml
index 4523998094..91f838a436 100644
--- a/Resources/Prototypes/Damage/examine_messages.yml
+++ b/Resources/Prototypes/Damage/examine_messages.yml
@@ -1,9 +1,5 @@
-- type: examinableDamage
+- type: localizedDataset
   id: WindowMessages
-  messages:
-    - comp-window-damaged-1
-    - comp-window-damaged-2
-    - comp-window-damaged-3
-    - comp-window-damaged-4
-    - comp-window-damaged-5
-    - comp-window-damaged-6
+  values:
+    prefix: comp-window-damaged-
+    count: 6
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index aea5357fb6..a6d19967f4 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -145,6 +145,13 @@
   flatReductions:
     Blunt: 5
 
+- type: damageModifierSet
+  id: Card
+  coefficients:
+    Slash: 2.0
+    Piercing: 0.1 # Holes easily poked through, but do little to structural integrity 
+    Heat: 3.0
+
 - type: damageModifierSet
   id: Web # Very flammable, can be easily hacked and slashed, but shooting or hitting it is another story.
   coefficients:
diff --git a/Resources/Prototypes/Datasets/Names/golem.yml b/Resources/Prototypes/Datasets/Names/golem.yml
deleted file mode 100644
index 52ecc30c9b..0000000000
--- a/Resources/Prototypes/Datasets/Names/golem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: localizedDataset
-  id: NamesGolem
-  values:
-    prefix: names-golem-dataset-
-    count: 1336
diff --git a/Resources/Prototypes/Datasets/Names/scurret.yml b/Resources/Prototypes/Datasets/Names/scurret.yml
new file mode 100644
index 0000000000..9e23557b38
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/scurret.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesFirstScurret
+  values:
+    prefix: names-scurret-first-dataset-
+    count: 50
+
+- type: localizedDataset
+  id: NamesLastScurret
+  values:
+    prefix: names-scurret-last-dataset-
+    count: 50
diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml
index a5313fcc4e..66e2bee27d 100644
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -45,8 +45,8 @@
 
 - type: sinkPort
   id: Trigger
-  name: signal-port-name-trigger
-  description: signal-port-description-trigger
+  name: signal-port-name-trigger-receiver
+  description: signal-port-description-trigger-receiver
 
 - type: sinkPort
   id: Timer
diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml
index 4a460e722d..302679c4d9 100644
--- a/Resources/Prototypes/DeviceLinking/source_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/source_ports.yml
@@ -157,6 +157,12 @@
   name: signal-port-name-power-discharging
   description: signal-port-description-power-discharging
 
+- type: sourcePort
+  id: Trigger
+  name: signal-port-name-trigger-sender
+  description: signal-port-description-trigger-sender
+  defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ]
+
 - type: sourcePort
   id: ItemDetected
   name: signal-port-name-item-detected
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index e2f6e103dc..45c4cbcafd 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -340,9 +340,9 @@
     equipDelay: 5 # to avoid accidentally falling into the trap associated with SelfUnremovableClothing
   - type: SelfUnremovableClothing
   - type: ShockOnTrigger
+    targetContainer: true
     damage: 5
     duration: 3
-    cooldown: 4
   - type: TriggerOnSignal
   - type: DeviceLinkSink
     ports:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 527a349930..5fc59dc0f6 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -116,6 +116,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Back/Duffels/mime.rsi
+  - type: Storage
     storageOpenSound:
       collection: null
     storageInsertSound:
@@ -172,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/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index 2df60cc3cb..5d4b720a5f 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -178,3 +178,13 @@
     maxItemSize: Huge
     grid:
     - 0,0,19,9
+
+- type: entity
+  parent: ClothingBackpackSatchelHolding
+  id: ClothingBackpackSatchelAdmin
+  name: satchel of administration
+  suffix: Admin
+  description: If you are somehow seeing this, no you're not.
+  components:
+  - type: ExplosionResistance
+    damageCoefficient: 0
diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index e067c9bdcc..bc3bbc0cdc 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -81,6 +81,7 @@
     solution: tank
   - type: ExaminableSolution
     solution: tank
+    exactVolume: true
 
 - type: entity
   parent: ClothingBackpack
@@ -104,3 +105,25 @@
   - type: Construction
     graph: ClothingBagPet
     node: bagPet
+
+- type: entity
+  parent: Clothing
+  id: ClothingBackpackHarmpack
+  name: H.A.R.M.P.A.C.K.
+  description: Now you can reload, punch, and eat a snack - simultaneously.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Specific/harmpack.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+  - type: Clothing
+    slots: BACK
+  - type: ExtraHandsEquipment
+    hands:
+      # middle hands to prevent overlapping inhand sprites
+      # This can be changed once we have per-hand displacement maps
+      extra_hand_1:
+        location: Middle
+      extra_hand_2:
+        location: Middle
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 9ff47cc7e1..38876af781 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -29,7 +29,9 @@
     maxItemSize: Normal
     storageInsertSound: # Sunrise
       path: /Audio/Items/belt_equip.ogg
-    # TODO: Fill this out more.
+    # Don't add more than absolutely needed to this whitelist!
+    # Utility belts shouldn't just be free extra storage.
+    # This is only intended for basic engineering equipment.
     whitelist:
       tags:
         - Powerdrill
@@ -49,15 +51,18 @@
         - JawsOfLife
         - GPS
         - WeldingMask
-
-        - ImprovisedCrowbar # Sunrise-Add
+        - RemoteSignaller
+        # Sunrise-Start
+        - ImprovisedCrowbar
         - ImprovisedScrewdriver
         - ImprovisedWirecutter
         - ImprovisedWrench
         - ImprovisedMultitool
+        # Sunrise-End
       components:
         - StationMap
         - SprayPainter
+        - SprayPainterAmmo
         - NetworkConfigurator
         - RCD
         - RCDAmmo
@@ -156,6 +161,7 @@
       components:
         - StationMap
         - SprayPainter
+        - SprayPainterAmmo
         - NetworkConfigurator
         - RCD
         - RCDAmmo
@@ -298,6 +304,8 @@
         - WetFloorSign
         - HolosignProjector
         - Plunger
+        - GoldenPlunger
+        - WireBrush
       components:
         - LightReplacer
         - SmokeOnTrigger
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index ec870ced49..f8e20263c8 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -4,15 +4,15 @@
   name: gar glasses
   description: Go beyond impossible and kick reason to the curb!
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/gar.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/gar.rsi
-    - type: MeleeWeapon
-      attackRate: 1.5
-      damage:
-        types:
-          Blunt: 7
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+  - type: MeleeWeapon
+    attackRate: 1.5
+    damage:
+      types:
+        Blunt: 7
 
 - type: entity
   parent: ClothingEyesBase
@@ -20,18 +20,18 @@
   name: orange gar glasses
   description: Just who the hell do you think I am?!
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/gar.rsi
-      state: icon-alt
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/gar.rsi
-      equippedPrefix: alt
-    - type: Item
-      heldPrefix: alt
-    - type: MeleeWeapon
-      damage:
-        types:
-          Blunt: 10
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    state: icon-alt
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    equippedPrefix: alt
+  - type: Item
+    heldPrefix: alt
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 10
 
 - type: entity
   parent: ClothingEyesBase
@@ -39,18 +39,18 @@
   name: giga gar glasses
   description: We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/gar.rsi
-      state: icon-super
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/gar.rsi
-      equippedPrefix: super
-    - type: Item
-      heldPrefix: super
-    - type: MeleeWeapon
-      damage:
-        types:
-          Blunt: 10
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    state: icon-super
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    equippedPrefix: super
+  - type: Item
+    heldPrefix: super
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 10
 
 - type: entity
   parent: [ClothingEyesBase, BaseEngineeringContraband]
@@ -58,13 +58,17 @@
   name: engineering goggles #less confusion
   description: Green-tinted goggles using a proprietary polymer that provides protection from eye damage of all types.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/meson.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/meson.rsi
-    - type: EyeProtection
-    - type: IdentityBlocker
-      coverage: EYES
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/meson.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/meson.rsi
+  - type: EyeProtection
+  - type: IdentityBlocker
+    coverage: EYES
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -72,15 +76,15 @@
   name: glasses
   description: A pair of spectacular spectacles with prescription lenses.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/glasses.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/glasses.rsi
-    - type: VisionCorrection
-    - type: Tag
-      tags:
-        - HamsterWearable
-        - WhitelistChameleon
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/glasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/glasses.rsi
+  - type: VisionCorrection
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -88,13 +92,13 @@
   name: jensen glasses
   description: A pair of yellow tinted folding glasses. You never asked for these.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/jensen.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/jensen.rsi
-    - type: Tag
-      tags:
-        - WhitelistChameleon
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/jensen.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/jensen.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -102,15 +106,15 @@
   name: jamjar glasses
   description: These retro glasses remind you of a simpler time.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/jamjar.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/jamjar.rsi
-    - type: VisionCorrection
-    - type: Tag
-      tags:
-        - HamsterWearable
-        - WhitelistChameleon
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/jamjar.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/jamjar.rsi
+  - type: VisionCorrection
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -118,14 +122,14 @@
   name: outlaw glasses
   description: A must for every self-respecting undercover agent.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/outlawglasses.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/outlawglasses.rsi
-    - type: VisionCorrection
-    - type: IdentityBlocker
-    - type: StaticPrice
-      price: 500
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/outlawglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/outlawglasses.rsi
+  - type: VisionCorrection
+  - type: IdentityBlocker
+  - type: StaticPrice
+    price: 500
 
 - type: entity
   parent: ClothingEyesBase
@@ -133,16 +137,17 @@
   name: cheap sunglasses
   description: A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/sunglasses.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/sunglasses.rsi
-    - type: Tag
-      tags:
-        - HamsterWearable
-        - WhitelistChameleon
-    - type: IdentityBlocker
-      coverage: EYES
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - PetWearable
+    - WhitelistChameleon
+  - type: IdentityBlocker
+    coverage: EYES
 
 - type: entity
   parent: ClothingEyesGlassesCheapSunglasses
@@ -150,14 +155,15 @@
   name: sun glasses
   description: A pair of black sunglasses.
   components:
-    - type: FlashImmunity
-    - type: EyeProtection
-      protectionTime: 5
-    - type: Tag
-      tags:
-        - Sunglasses
-        - HamsterWearable
-        - WhitelistChameleon
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Tag
+    tags:
+    - Sunglasses
+    - PetWearable
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband]
@@ -165,27 +171,28 @@
   name: security glasses
   description: Upgraded sunglasses that provide flash immunity and a security HUD.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/secglasses.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/secglasses.rsi
-    - type: FlashImmunity
-    - type: EyeProtection
-      protectionTime: 5
-    - type: Construction
-      graph: GlassesSecHUD
-      node: glassesSec
-    - type: Tag
-      tags:
-        - HamsterWearable
-        - WhitelistChameleon
-    - type: GuideHelp
-      guides:
-        - Security
-        - Antagonists
-    - type: IdentityBlocker
-      coverage: EYES
-    - type: AddWantedStatus # Sunrise-edit
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Construction
+    graph: GlassesSecHUD
+    node: glassesSec
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - PetWearable
+    - WhitelistChameleon
+  - type: GuideHelp
+    guides:
+    - Security
+    - Antagonists
+  - type: IdentityBlocker
+    coverage: EYES
+  - type: AddWantedStatus # Sunrise-edit
 
 - type: entity
   parent: [ClothingEyesBase, BaseCommandContraband]
@@ -193,20 +200,21 @@
   name: administration glasses
   description: Upgraded sunglasses that provide flash immunity and show ID card status.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/commandglasses.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/commandglasses.rsi
-    - type: FlashImmunity
-    - type: EyeProtection
-      protectionTime: 5
-    - type: Tag
-      tags:
-        - HamsterWearable
-        - WhitelistChameleon
-    - type: IdentityBlocker
-      coverage: EYES
-    - type: ShowJobIcons
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/commandglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/commandglasses.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - PetWearable
+    - WhitelistChameleon
+  - type: IdentityBlocker
+    coverage: EYES
+  - type: ShowJobIcons
 
 - type: entity
   parent: ClothingEyesBase
@@ -214,15 +222,15 @@
   name: mercenary glasses
   description: Glasses made for combat, to protect the eyes from bright blinding flashes.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/mercglasses.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/mercglasses.rsi
-    - type: FlashImmunity
-    - type: EyeProtection
-      protectionTime: 5
-    - type: IdentityBlocker
-      coverage: EYES
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/mercglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/mercglasses.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: IdentityBlocker
+    coverage: EYES
 
 #Make a scanner category when these actually function and we get the trayson
 - type: entity
@@ -231,22 +239,26 @@
   name: optical thermal scanner
   description: Thermals in the shape of glasses.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/thermal.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/thermal.rsi
-    - type: GroupExamine
-    - type: IdentityBlocker
-      coverage: EYES
-    # Sunrise-Start
-    - type: ToggleClothing
-      action: ActionToggleThermalVision
-      disableOnUnequip: true
-      targetSlot: eyes
-    - type: ComponentToggler
-      parent: true
-      components:
-        - type: ThermalVision
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/thermal.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/thermal.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Heat: 0.95
+  - type: GroupExamine
+  - type: IdentityBlocker
+    coverage: EYES
+  # Sunrise-Start
+  - type: ToggleClothing
+    action: ActionToggleThermalVision
+    disableOnUnequip: true
+    targetSlot: eyes
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: ThermalVision
   # Sunrise-End
 
 - type: entity
@@ -262,6 +274,10 @@
     - type: SolutionScanner
     - type: IdentityBlocker
       coverage: EYES
+    - type: Tag
+      tags:
+      - PetWearable
+      - WhitelistChameleon
 
 - type: entity
   parent: [
@@ -274,36 +290,36 @@
   name: ninja visor
   description: An advanced visor protecting a ninja's eyes from flashing lights.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
-    - type: FlashImmunity
-    # Sunrise-Start
-    - type: ItemToggle
-      predictable: false
-      onUse: false
-      canActivateInhand: false
-      soundActivate:
-        path: /Audio/_Sunrise/Items/Goggles/activate.ogg
-      soundDeactivate:
-        path: /Audio/_Sunrise/Items/Goggles/deactivate.ogg
-      soundFailToActivate:
-        path: /Audio/Machines/button.ogg
-    - type: PowerCellSlot
-      cellSlotId: cell_slot
-    - type: ContainerContainer
-      containers:
-        cell_slot: !type:ContainerSlot
-    - type: ItemSlots
-      slots:
-        cell_slot:
-          name: power-cell-slot-component-slot-name-default
-          startingItem: PowerCellSmall
-    - type: ToggleCellDraw
-    - type: PowerCellDraw
-      drawRate: 3.5
-      useRate: 20
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
+  - type: FlashImmunity
+  # Sunrise-Start
+  - type: ItemToggle
+    predictable: false
+    onUse: false
+    canActivateInhand: false
+    soundActivate:
+      path: /Audio/_Sunrise/Items/Goggles/activate.ogg
+    soundDeactivate:
+      path: /Audio/_Sunrise/Items/Goggles/deactivate.ogg
+    soundFailToActivate:
+      path: /Audio/Machines/button.ogg
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellSmall
+  - type: ToggleCellDraw
+  - type: PowerCellDraw
+    drawRate: 3.5
+    useRate: 20
   # Sunrise-End
 
 - type: entity
@@ -312,17 +328,17 @@
   name: noir-tech glasses
   description: A pair of glasses that simulate what the world looked like before the invention of color.
   components:
-    - type: Sprite
-      sprite: Clothing/Eyes/Glasses/noir.rsi
-    - type: Clothing
-      sprite: Clothing/Eyes/Glasses/sunglasses.rsi
-    - type: IdentityBlocker
-      coverage: EYES
-    - type: FlashImmunity
-    - type: EyeProtection
-      protectionTime: 5
-    - type: NoirOverlay
-    - type: Tag
-      tags:
-        - HamsterWearable
-        - WhitelistChameleon
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/noir.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+  - type: IdentityBlocker
+    coverage: EYES
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: NoirOverlay
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 600efd6d7b..33c86de3a4 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -45,6 +45,7 @@
   - type: Tag
     tags:
     - HudMedical
+    - PetWearable
     - WhitelistChameleon
 
 - type: entity
@@ -60,6 +61,7 @@
   - type: Tag
     tags:
     - HudSecurity
+    - PetWearable
     - WhitelistChameleon
   - type: AddWantedStatus # Sunrise-edit
 
@@ -74,6 +76,10 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/command.rsi
   - type: ShowJobIcons
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -89,6 +95,10 @@
   - type: StealTarget
     stealGroup: ClothingEyesHudBeer
   - type: SolutionScanner
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingEyesBase
@@ -211,6 +221,10 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/synd.rsi
   - type: ShowSyndicateIcons
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband]
@@ -224,6 +238,10 @@
     sprite: Clothing/Eyes/Hud/syndagent.rsi
   - type: ShowSyndicateIcons
   - type: ShowHealthBars
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
   - type: SolutionScanner #Sunrise-edit
 
 - type: entity
@@ -241,6 +259,11 @@
     sprite: Clothing/Eyes/Hud/medpatch.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medpatch.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
+    - HudMedical
 
 - type: entity
   parent: [ClothingEyesEyepatchHudMedical, ClothingHeadEyeBaseFlipped]
@@ -257,6 +280,11 @@
     sprite: Clothing/Eyes/Hud/secpatch.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/secpatch.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - WhitelistChameleon
+    - HudSecurity
 
 - type: entity
   parent: [ClothingEyesEyepatchHudSecurity,  ClothingHeadEyeBaseFlipped]
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
index 8699f55d5a..e8d709e6f4 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: ClothingEyesBase
   id: ClothingEyesChameleon # no flash immunity, sorry
   name: sun glasses
@@ -6,7 +6,8 @@
   suffix: Chameleon
   components:
     - type: Tag
-      tags: [] # ignore "WhitelistChameleon" tag
+      tags: # intentionally no WhitelistChameleon tag
+      - PetWearable 
     - type: Sprite
       sprite: Clothing/Eyes/Glasses/sunglasses.rsi
     - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index dcd9ba11a1..d3dd8061e2 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -91,8 +91,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: PowerCellSlot
     cellSlotId: cell_slot
@@ -247,8 +247,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600 #lights drain 3/s but recharge of 2 makes this 1/s. Therefore 600 is 10 minutes of light.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 929d5549d6..9071ae986a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -14,6 +14,7 @@
     - HelmetEVA
     - FullCovered # INTERACTIONS
     - WhitelistChameleon
+    - CorgiWearable
 
 #Large EVA Helmet
 - type: entity
@@ -26,6 +27,11 @@
     sprite: Clothing/Head/Helmets/eva_large.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/eva_large.rsi
+  - type: Tag
+    tags:
+    - HelmetEVA
+    - WhitelistChameleon
+    - CorgiWearable
 
 #Syndicate EVA Helmet
 - type: entity
@@ -84,12 +90,16 @@
       - state: equipped-head-light
       head-vox:
       - state: equipped-head-light-vox
+      head-dog:
+      - state: equipped-head-light-dog
   - type: Clothing
     clothingVisuals:
       head:
       - state: equipped-head
       head-vox:
       - state: equipped-head-vox
+      head-dog:
+      - state: equipped-head-dog
   - type: TemperatureProtection
     heatingCoefficient: 0.1
     coolingCoefficient: 0.1
@@ -102,3 +112,8 @@
     radius: 5
     energy: 2
     color: "#00ffff"
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - HelmetEVA
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
index 31b1e0ed36..dbcb84ed1d 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -37,8 +37,8 @@
       id: blinking
       interpolate: Nearest
       maxDuration: 1.0
-      minValue: 0.1
-      maxValue: 2.0
+      startValue: 0.1
+      endValue: 2.0
       isLooped: true
   - type: ToggleableVisuals
     spriteLayer: light
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 3f183564a8..2622970f1e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -33,6 +33,9 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
     clothingVisuals:
       head:
@@ -43,6 +46,10 @@
       - 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: "#adffe6"
   - type: PressureProtection
@@ -53,6 +60,10 @@
     coolingCoefficient: 0.005
   - type: FireProtection
     reduction: 0.2
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: EyeProtection # Sunrise-Edit
   - type: FlashImmunity # Sunrise-Edit
 
@@ -65,13 +76,51 @@
   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
     highPressureMultiplier: 0.1
     lowPressureMultiplier: 1000
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: EyeProtection
   - type: FlashImmunity
 
@@ -102,6 +151,9 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
     clothingVisuals:
       head:
@@ -112,11 +164,19 @@
       - 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
     radius: 6
   - type: PressureProtection
     highPressureMultiplier: 0.72
     lowPressureMultiplier: 1000
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 #Salvage Hardsuit
 - type: entity
@@ -135,7 +195,12 @@
   - type: PointLight
     radius: 7
     energy: 3
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
+#Goliath Hardsuit
 - type: entity
   parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitGoliath
@@ -162,6 +227,9 @@
       head-vox:
       - state: equipped-head-light-vox
         shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
     clothingVisuals:
       head:
@@ -172,12 +240,21 @@
       - 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
     radius: 6
   - type: PressureProtection
     highPressureMultiplier: 0.72
     lowPressureMultiplier: 1000
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
+#Maxim Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitMaxim
@@ -223,6 +300,10 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: FlashImmunity # Sunrise-Edit
 
 #Brigmedic Hardsuit
@@ -291,6 +372,10 @@
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 #Chief Engineer's Hardsuit
 - type: entity
@@ -301,8 +386,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: "#e6aa5c" # Sunrise-Edit
   - type: PressureProtection
@@ -310,6 +429,10 @@
     lowPressureMultiplier: 1000
   - type: FireProtection
     reduction: 0.2
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: EyeProtection # Sunrise-Edit
   - type: FlashImmunity # Sunrise-Edit
 
@@ -329,6 +452,10 @@
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 #Research Director's Hardsuit
 - type: entity
@@ -346,6 +473,10 @@
   - type: PressureProtection
     highPressureMultiplier: 0.60
     lowPressureMultiplier: 1000
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 #Head of Security's hardsuit
 - type: entity
@@ -415,6 +546,10 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: HolidayVisuals
     holidays:
       festive:
@@ -488,6 +623,10 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: HolidayVisuals
     holidays:
       festive:
@@ -522,6 +661,10 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: HolidayVisuals
     holidays:
       festive:
@@ -556,6 +699,10 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 #Wizard Hardsuit
 - type: entity
@@ -580,6 +727,10 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 #Organic Space Suit
 - type: entity
@@ -622,7 +773,7 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
     clothingVisuals:
       head:
       - state: equipped-HELMET-light
@@ -796,6 +947,10 @@
       - state: equipped-head
       - state: equipped-head-unshaded
         shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
   - type: PointLight
     color: "#a4fef4"
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index b053917543..ee01d88753 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -2,7 +2,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeaverHat
   name: beaver hat
-  description: 'Gentlemen?'
+  description: "\"Gentlemen?\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beaver_hat.rsi
@@ -20,7 +20,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeret
   name: beret
-  description: A beret, an artists favorite headwear.
+  description: An artist's favorite headwear.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret.rsi
@@ -28,6 +28,8 @@
     sprite: Clothing/Head/Hats/beret.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -37,7 +39,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretFrench
   name: french beret
-  description: A French beret, "vive la France".
+  description: A French beret. "Vive la France!"
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_french.rsi
@@ -47,6 +49,8 @@
     accent: FrenchAccent
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - WhitelistChameleon
@@ -55,7 +59,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretSecurity
   name: security beret
-  description: A stylish clothing option for security officers.
+  description: A beret with the security department's insignia. For officers that are more inclined towards style than safety.
   components:
   - type: Sprite
     sprite: _Sunrise/Clothing/Head/Hats/beret_security.rsi #Sunrise-Edit
@@ -65,6 +69,8 @@
     tags:
     - ClothMade
     - Recyclable
+    - PetWearable
+    - CorgiWearable
     - HamsterWearable
     - WhitelistChameleon
 
@@ -72,7 +78,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatSecurityTrooper
   name: trooper hat
-  description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it.
+  description: A campaign hat for the Nanotrasen Troopers. It's supposed to come with a case, too...
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/security_trooper_hat.rsi
@@ -94,13 +100,15 @@
       sprite: Clothing/Head/Hats/casa.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/casa.rsi
-    # Sunrise-Start
     - type: Tag
       tags:
+      - PetWearable
+      - CorgiWearable
+      # Sunrise-Start
       - ClothMade
       - WhitelistChameleon
       - FullCovered
-    # Sunrise-End
+      # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
@@ -114,6 +122,8 @@
     sprite: Clothing/Head/Hats/beret_rnd.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -123,7 +133,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretEngineering
   name: engineering beret
-  description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
+  description: A beret with the engineering department's insignia. For engineers that are more inclined towards style than safety.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_engineering.rsi
@@ -131,6 +141,8 @@
     sprite: Clothing/Head/Hats/beret_engineering.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -140,7 +152,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretQM
   name: quartermaster's beret
-  description: A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style.
+  description: A beret with the cargo department's insignia.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_qm.rsi
@@ -148,6 +160,8 @@
     sprite: Clothing/Head/Hats/beret_qm.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -165,6 +179,8 @@
     sprite: Clothing/Head/Hats/beret_hos.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -174,12 +190,16 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretWarden
   name: warden's beret
-  description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
+  description: A corporate-blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_warden.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_warden.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -191,34 +211,46 @@
     sprite: Clothing/Head/Hats/beret_physician.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_physician.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretBrigmedic
   name: brigmedical beret
-  description: White beret, looks like a cream pie on the head.
+  description: A white beret for brigmedics.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_brigmedic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_brigmedic.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: [ ClothingHeadBase ]
   id: ClothingHeadHatBeretMerc
   name: mercenary beret
-  description: Olive beret, the badge depicts a jackal on a rock.
+  description: An olive beret with a badge depicting a jackal on a rock.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_merc.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_merc.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretCommand
   name: command beret
-  description: A beret with a Command insignia emblazoned on it. It has an aura of authority.
+  description: A beret with the Nanotrasen logo. It has an aura of authority.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_command.rsi
@@ -229,30 +261,34 @@
     - ClothMade
     - HamsterWearable
     - WhitelistChameleon
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBowlerHat
   name: bowler hat
-  description: Stylish bowler hat.
+  description: A stylish bowler hat.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/bowler_hat.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/bowler_hat.rsi
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: [ClothingHeadBase, BaseCommandContraband]
   id: ClothingHeadHatCaptain
   name: captain's hardhat
-  description: It's good being the king.
+  description: Feels good being the king.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/captain.rsi
@@ -260,6 +296,8 @@
     sprite: Clothing/Head/Hats/captain.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -292,25 +330,27 @@
   parent: [ ClothingHeadBase, BaseCentcommContraband ]
   id: ClothingHeadHatCentcom
   name: CentComm brand hat
-  description: "It's good to be the emperor."
+  description: Feels good being the king's boss.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/centcom.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/centcom.rsi
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatChef
   name: chef's hat
-  description: "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
+  description: A hat used by chefs to keep their hair out of your food. Judging by the food in the mess, they don't work.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/chefhat.rsi
@@ -332,6 +372,8 @@
         - ChefPilot
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -342,7 +384,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatFedoraBrown
   name: brown fedora
-  description: It's a brown fedora.
+  description: A brown fedora.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/brownfedora.rsi
@@ -350,6 +392,8 @@
     sprite: Clothing/Head/Hats/brownfedora.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -360,19 +404,21 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatFedoraGrey
   name: grey fedora
-  description: It's a grey fedora.
+  description: A grey fedora.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/greyfedora.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/greyfedora.rsi
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
@@ -384,12 +430,16 @@
     sprite: Clothing/Head/Hats/fez.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/fez.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: [ClothingHeadBase, BaseCommandContraband]
   id: ClothingHeadHatHopcap
   name: head of personnel's cap
-  description: A grand, stylish head of personnel's cap.
+  description: A stylish cap worn by the Head of Personnel. Shows paperwork who's in charge.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/hopcap.rsi
@@ -397,6 +447,8 @@
     sprite: Clothing/Head/Hats/hopcap.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -407,7 +459,7 @@
   parent: [ClothingHeadBase, BaseCommandContraband]
   id: ClothingHeadHatHoshat
   name: head of security cap
-  description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge.
+  description: A stylish cap worn by the Head of Security. Shows the officers who's in charge.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/hoshat.rsi
@@ -415,6 +467,8 @@
     sprite: Clothing/Head/Hats/hoshat.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -433,13 +487,15 @@
     sprite: Clothing/Head/Hats/outlawhat.rsi
   - type: StaticPrice
     price: 500
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
@@ -451,13 +507,15 @@
     sprite: Clothing/Head/Hats/witchhat.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/witchhat.rsi
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
@@ -469,24 +527,30 @@
     sprite: Clothing/Head/Hats/paper.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/paper.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatPirate
   name: pirate hat
-  description: 'Yo ho ho and a bottle of rum!'
+  description: "\"Yo ho ho and a bottle of rum!\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/pirate.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/pirate.rsi
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
@@ -514,12 +578,18 @@
   parent: ClothingHeadHatWizardBase
   id: ClothingHeadHatRedwizard
   name: red wizard hat
-  description: Strange-looking red hat-wear that most certainly belongs to a real magic user.
+  description: A strange-looking red hat that most certainly belongs to a powerful magic-user.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/redwizard.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/redwizard.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - ClothMade
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingHeadBase, BaseFoldable]
@@ -549,21 +619,21 @@
     - state: icon-nobeard
       map: [ "foldedLayer" ]
       visible: true
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
-
-
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatSombrero
   name: sombrero
-  description: "Perfectly for Space Mexico, si?"
+  description: "\"Perfect for Space Mexico, si?\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/sombrero.rsi
@@ -571,13 +641,15 @@
     sprite: Clothing/Head/Hats/sombrero.rsi
   - type: AddAccentClothing
     accent: SpanishAccent
-  # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
@@ -648,7 +720,6 @@
     - FullCovered
   # Sunrise-End
 
-
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatTophat
@@ -661,6 +732,8 @@
     sprite: Clothing/Head/Hats/tophat.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -670,7 +743,7 @@
   parent: [ClothingHeadBase, BaseFoldable]
   id: ClothingHeadHatUshanka
   name: ushanka
-  description: "Perfect for winter in Siberia, da?"
+  description: "\"Perfect for winter in Siberia, da?\""
   components:
   - type: Clothing
     sprite: Clothing/Head/Hats/ushanka.rsi
@@ -747,18 +820,24 @@
   parent: ClothingHeadHatWizardBase
   id: ClothingHeadHatVioletwizard
   name: violet wizard hat
-  description: "Strange-looking violet hat-wear that most certainly belongs to a real magic user."
+  description: A strange-looking violet hat that most certainly belongs to a powerful magic-user.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/violetwizard.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/violetwizard.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - ClothMade
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatWarden
   name: warden's cap
-  description: A police officer's Hat. This hat emphasizes that you are THE LAW
+  description: This hat emphasizes that you are THE LAW.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/warden.rsi
@@ -766,6 +845,10 @@
     sprite: Clothing/Head/Hats/warden.rsi
   - type: StealTarget
     stealGroup: ClothingHeadHatWarden
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -780,6 +863,8 @@
     sprite: Clothing/Head/Hats/witch.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - WhitelistChameleon
     - ClothMade
     - Recyclable
@@ -792,7 +877,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatWizardFake
   name: fake wizard hat
-  description: It has WIZZARD written across it in sequins. Comes with a cool beard.
+  description: It has "WIZZARD" written across it in garish sequins. Comes with a cool beard.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/wizard_fake.rsi
@@ -829,7 +914,7 @@
   parent: ClothingHeadHatWizardBase
   id: ClothingHeadHatWizard
   name: wizard hat
-  description: Strange-looking blue hat-wear that most certainly belongs to a powerful magic user.
+  description: A strange-looking blue hat that most certainly belongs to a powerful magic-user.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/wizardhat.rsi
@@ -837,6 +922,8 @@
     sprite: Clothing/Head/Hats/wizardhat.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -847,7 +934,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatXmasCrown
   name: xmas crown
-  description: 'Happy Christmas!'
+  description: "\"Happy Christmas!\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/xmascrown.rsi
@@ -858,7 +945,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatTrucker
   name: trucker hat
-  description: Formerly Chucks, this hat is yours now.
+  description: Formerly Chuck's, this hat is yours now.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/truckershat.rsi
@@ -924,7 +1011,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadPaperSack
   name: papersack hat
-  description: A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness.
+  description: A paper sack with crude holes cut out for eyes. Useful for hiding one's identity and/or ugliness.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/papersack.rsi
@@ -972,7 +1059,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadFishCap
   name: fishing cap
-  description: Women fear me. Fish fear me. Men turn their eyes away from me. As I walk no beast dares make a sound in my presence. I am alone on this barren Earth.
+  description: "\"Women fear me. Fish fear me. Men turn their eyes away from me. As I walk no beast dares make a sound in my presence. I am alone on this barren Earth.\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/fishcap.rsi
@@ -990,7 +1077,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadWehcellentCap
   name: wehcellent cap
-  description: It was a net hat! Tiders wear them all the time! It's got airholes in the back to keep a cross-breeze going and everything!
+  description: "\"It was a net hat! Tiders wear them all the time! It's got airholes in the back to keep a cross-breeze going and everything!\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/wehcellentcap.rsi
@@ -1059,7 +1146,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatJester
   name: jester hat
-  description: A hat with bells, to add some merriness to the suit.
+  description: A hat with bells, to add some merriness to your head.
   components:
     - type: Sprite
       sprite: Clothing/Head/Hats/jester.rsi
@@ -1098,7 +1185,7 @@
   parent: [ClothingHeadBase, BaseCommandContraband]
   id: ClothingHeadHatBeretCmo
   name: chief medical officer's beret
-  description: Turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured.
+  description: A turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_cmo.rsi
@@ -1106,6 +1193,8 @@
     sprite: Clothing/Head/Hats/beret_cmo.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - HamsterWearable
@@ -1115,7 +1204,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatPirateTricord
   name: pirate hat
-  description: 'Yo ho ho and a bottle of rum!'
+  description: "\"Yo ho ho and a bottle of rum!\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/piratetricord.rsi
@@ -1196,7 +1285,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatTacticalMaidHeadband
   name: tactical maid headband
-  description: "A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns."
+  description: A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/tacticalmaidheadband.rsi
@@ -1225,7 +1314,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatMagician
   name: magician's tophat
-  description: "A magician's tophat."
+  description: A magician's top hat.
   components:
   - type: Icon
     sprite: Clothing/Head/Hats/magician.rsi
@@ -1256,16 +1345,19 @@
   # Sunrise-Start
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
+    # Sunrise-Start
     - ClothMade
     - WhitelistChameleon
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCapcap
   name: cap cap
-  description: A grand, stylish captain cap.
+  description: A grand, stylish cap worn by the Captain. Shows the station who's in charge.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/capcap.rsi
@@ -1275,6 +1367,8 @@
     sprite: Clothing/Head/Hats/capcap.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - WhitelistChameleon
@@ -1288,7 +1382,7 @@
   parent: [ ClothingHeadBase, BaseCentcommContraband ]
   id: ClothingHeadHatCentcomcap
   name: CentComm cap
-  description: An extravagant, fancy Central Commander cap.
+  description: An extravagant, stylish cap worn by CentComm officials. Shows the Captain who's in charge.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/comcap.rsi
@@ -1298,6 +1392,8 @@
     sprite: Clothing/Head/Hats/comcap.rsi
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - ClothMade
     - Recyclable
     - WhitelistChameleon
@@ -1338,8 +1434,10 @@
     sprite: Clothing/Head/Hats/party_red.rsi
   - type: Tag
     tags:
-      - WhitelistChameleon
-      - HamsterWearable
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1350,6 +1448,12 @@
     sprite: Clothing/Head/Hats/party_yellow.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_yellow.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1360,6 +1464,12 @@
     sprite: Clothing/Head/Hats/party_green.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_green.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1370,6 +1480,12 @@
     sprite: Clothing/Head/Hats/party_blue.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_blue.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1381,6 +1497,12 @@
     sprite: Clothing/Head/Hats/party_water_cup.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_water_cup.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - WhitelistChameleon
+    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1401,7 +1523,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBrownFlatcap
   name: brown flatcap
-  description: Stupid clown! You made me look bad!
+  description: "\"Stupid clown! You made me look bad!\""
   components:
   - type: Tag
     tags:
@@ -1416,7 +1538,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatCowboyBrown
   name: brown cowboy hat
-  description: This hat ain't big enough for the both of us.
+  description: "\"This hat ain't big enough for the two of us.\""
   components:
     - type: Sprite
       sprite: Clothing/Head/Hats/cowboyhatbrown.rsi
@@ -1425,13 +1547,16 @@
     - type: AddAccentClothing
       accent: ReplacementAccent
       replacement: cowboy
-  # Sunrise-Start
     - type: Tag
       tags:
-      - ClothMade
+      - PetWearable
+      - CorgiWearable
       - WhitelistChameleon
+      - HamsterWearable
+      # Sunrise-Start
+      - ClothMade
       - FullCovered
-  # Sunrise-End
+      # Sunrise-End
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1442,6 +1567,12 @@
       sprite: Clothing/Head/Hats/cowboyhatblack.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatblack.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1452,6 +1583,12 @@
       sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1462,6 +1599,12 @@
       sprite: Clothing/Head/Hats/cowboyhatred.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatred.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1472,6 +1615,12 @@
       sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatCowboyBrown
@@ -1482,6 +1631,12 @@
       sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
+    - type: Tag
+      tags:
+      - PetWearable
+      - CorgiWearable
+      - WhitelistChameleon
+      - HamsterWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1498,6 +1653,8 @@
     node: strawhat
   - type: Tag
     tags:
+    - PetWearable
+    - CorgiWearable
     - HamsterWearable
     - TopCovered # Sunrise-Edit
   - type: Flammable
@@ -1532,23 +1689,31 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretMedic
   name: medical beret
-  description: White beret that encourages you to be clean.
+  description: A sterile white beret.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_medic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_medic.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatSolidHeadband
   name: solid headband
-  description: "You'll feel like you're Invisible while wearing this! (DISCLAIMER: DOES NOT ACTUALLY MAKE THE WEARER INVISIBLE)"
+  description: "\"You'll feel like you're Invisible while wearing this! (DISCLAIMER: DOES NOT ACTUALLY MAKE THE WEARER INVISIBLE)\""
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/solidheadband.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/solidheadband.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
 
 - type: entity
   parent: ClothingHeadBase
@@ -1582,3 +1747,7 @@
       path: /Audio/Items/flashlight_on.ogg
     soundDeactivate:
       path: /Audio/Items/flashlight_off.ogg
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 416d6511d3..fb10269907 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -343,6 +343,7 @@
     tags:
     - WhitelistChameleon
     - FireHelmet
+    - CorgiWearable
     - FullCovered # INTERACTIONS
   - type: HideLayerClothing
     layers:
@@ -603,6 +604,27 @@
   - type: InstantAction
     event: !type:ToggleActionEvent
 
+#card helmet
+- type: entity
+  parent: ClothingHeadHelmetBase
+  id: CardHelmet
+  name: cardboard helmet
+  description: A medieval helmet built from cardboard.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/card_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/card_helmet.rsi
+  - type: IngestionBlocker
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+  - type: StaminaResistance
+    damageCoefficient: 0.95
+  - type: Construction
+    graph: cardHelmet
+    node: cardhelmet
 - type: entity
   parent: ClothingHeadBase
   id: ChangelingClothingHeadHelmet
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 6ec65701f1..241dae5bb7 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -218,13 +218,14 @@
   - type: HideLayerClothing
     slots:
     - Hair
-  # Sunrise-Start
   - type: Tag
     tags:
+    - CorgiWearable
     - ClothMade
     - WhitelistChameleon
+    # Sunrise-Start
     - FullCovered
-  # Sunrise-End
+    # Sunrise-End
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index e8138e3f93..10d19b9d15 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -350,15 +350,16 @@
   - type: Clothing
     slots:
     - HEAD
-  - type: Food
+  - type: Edible
+    edible: Drink
     solution: drink
-    useSound: /Audio/Items/drink.ogg
-    eatMessage: drink-component-try-use-drink-success-slurp
     delay: 0.5
     forceFeedDelay: 1.5
   - type: FlavorProfile
     flavors:
       - water
+  - type: DrainableSolution
+    solution: drink
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index 41b9dbb88b..fd9ea16ef1 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -59,7 +59,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBluesoft
   name: blue cap
-  description: "It's a baseball hat in a tasteless blue colour."
+  description: A blue baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/bluesoft.rsi
@@ -75,7 +75,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCargosoft
   name: cargo cap
-  description: "It's a baseball hat painted in Cargo colours."
+  description: A baseball cap colored to match cargo's uniforms.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/cargosoft.rsi
@@ -104,7 +104,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatQMsoft
   name: quartermaster's cap
-  description: "It's a baseball hat painted in the Quartermaster's colors."
+  description: A baseball cap colored to match the Quartermaster's uniform.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/qmsoft.rsi
@@ -120,7 +120,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCommandSoft
   name: command cap
-  description: It's a baseball hat painted in Command colours.
+  description: A baseball cap in command's distinctive shade of blue.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/commandsoft.rsi
@@ -136,7 +136,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCorpsoft
   name: corporate cap
-  description: A baseball bat in corporation colors.
+  description: A baseball cap in corporation colors.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/corpsoft.rsi
@@ -152,7 +152,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreensoft
   name: green cap
-  description: "It's a baseball hat in a tasteless green colour."
+  description: A green baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/greensoft.rsi
@@ -168,7 +168,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBlacksoft
   name: black cap
-  description: "It's a baseball hat in a tasteless black colour."
+  description: A black baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/blacksoft.rsi
@@ -184,7 +184,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreysoft
   name: grey cap
-  description: "It's a baseball hat in a tasteless grey colour."
+  description: A grey baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/greysoft.rsi
@@ -200,7 +200,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatMimesoft
   name: white cap
-  description: "It's a baseball hat in a tasteless white colour."
+  description: A white baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/mimesoft.rsi
@@ -216,7 +216,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatOrangesoft
   name: orange cap
-  description: It's a baseball hat in a good-looking orange colour.
+  description: An orange baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/orangesoft.rsi
@@ -232,7 +232,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatPurplesoft
   name: purple cap
-  description: It's a baseball hat in a tasteless purple colour.
+  description: A purple baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/purplesoft.rsi
@@ -261,7 +261,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatRedsoft
   name: red cap
-  description: It's a baseball hat in a tasteless red colour.
+  description: A red baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/redsoft.rsi
@@ -277,7 +277,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatSecsoft
   name: security cap
-  description: It's a robust baseball hat in tasteful red colour.
+  description: A baseball cap colored to match security's uniforms.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/secsoft.rsi
@@ -293,7 +293,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatYellowsoft
   name: yellow cap
-  description: A yellow baseball hat.
+  description: A yellow baseball cap.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/yellowsoft.rsi
@@ -325,7 +325,7 @@
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatParamedicsoft
   name: paramedic cap
-  description: "It's a paramedic's baseball hat with a medical logo."
+  description: A blue baseball cap with a cross on the front.
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/paramedicsoft.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
index 19ed89c4e8..ece7d81361 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
@@ -44,7 +44,7 @@
   - type: Storage
     showVerb: false
     grid:
-    - 0,0,6,3
+    - 0,0,3,2
     maxItemSize: Small
     blacklist:
       tags:
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 6a689349ba..62e64ccd16 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -284,6 +284,8 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 25
+  - type: StaticPrice
+    price: 5
 
 - type: entity
   parent: ClothingMaskBase
@@ -302,6 +304,9 @@
   - type: IngestionBlocker
   - type: AddAccentClothing
     accent: MumbleAccent
+  - type: EmoteBlocker
+    blocksCategories:
+    - Vocal
   - type: Construction
     graph: Muzzle
     node: muzzle
diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/misc.yml b/Resources/Prototypes/Entities/Clothing/Multiple/misc.yml
new file mode 100644
index 0000000000..95b45bd8dc
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Multiple/misc.yml
@@ -0,0 +1,40 @@
+- type: entity
+  parent: Clothing
+  id: ClothingMultipleHeadphones
+  name: headphones
+  description: Quality headphones from Drunk Masters, with good sound insulation.
+  components:
+  - type: Sprite
+    sprite: Clothing/Multiple/headphones.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleableVisuals.Layer" ]
+  - type: Clothing
+    equippedPrefix: off
+    sprite: Clothing/Multiple/headphones.rsi
+    slots:
+    - HEAD
+    - EARS
+    - NECK
+  - type: ToggleableVisuals
+    spriteLayer: enum.ToggleableVisuals.Layer
+    clothingVisuals:
+      head:
+      - state: on-equipped-HELMET
+      ears:
+      - state: on-equipped-EARS
+      neck:
+      - state: on-equipped-NECK
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Items/flashlight_on.ogg
+    soundDeactivate:
+      path: /Audio/Items/flashlight_off.ogg
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 148010f489..11b41a7cb3 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -1,36 +1,3 @@
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckHeadphones
-  name: headphones
-  description: Quality headphones from Drunk Masters, with good sound insulation.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/headphones.rsi
-    layers:
-    - state: icon
-      map: [ "enum.ToggleableVisuals.Layer" ]
-  - type: Clothing
-    equippedPrefix: off
-    sprite: Clothing/Neck/Misc/headphones.rsi
-  - type: ToggleableVisuals
-    spriteLayer: enum.ToggleableVisuals.Layer
-    clothingVisuals:
-      neck:
-      - state: on-equipped-NECK
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ToggleableVisuals.Enabled:
-        enum.ToggleableVisuals.Layer:
-          True: {state: icon-on}
-          False: {state: icon}
-  - type: ItemToggle
-    predictable: false
-    soundActivate:
-      path: /Audio/Items/flashlight_on.ogg
-    soundDeactivate:
-      path: /Audio/Items/flashlight_off.ogg
-
 - type: entity
   parent: Clothing
   id: ClothingNeckStethoscope
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index da4b5079b2..4fbc609075 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -4,10 +4,10 @@
 
 #Basic armor vest for inheritance
 - type: entity
+  abstract: true
   parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseSecurityContraband]
   id: ClothingOuterArmorBase
   name: armor vest
-  abstract: true
   description: A standard Type I armored vest that provides decent protection against most types of damage.
   components:
   - type: Sprite
@@ -41,9 +41,9 @@
   components:
   - type: Tag
     tags:
-    - Vest
-    - NudeBottom # Sunrise-Add
+    - CorgiWearable
     - WhitelistChameleon
+    - NudeBottom # Sunrise-Add
 
 #Alternate / slim basic armor vest
 - type: entity
@@ -148,6 +148,10 @@
     sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
   - type: Pierceable
     level: Metal
 
@@ -265,7 +269,7 @@
         Caustic: 0.5
   - type: ExplosionResistance
     damageCoefficient: 0.35
-  - type: StaminaResistance
+  - type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
     damageCoefficient: 0.45
   - type: ClothingSpeedModifier
     walkModifier: 0.9
@@ -308,8 +312,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600
@@ -374,7 +378,7 @@
       coefficients:
         Blunt: 0.5
         Slash: 0.5
-        Piercing: 0.6
+        Piercing: 0.5
         Heat: 0.5
   - type: GroupExamine
   # Sunrise-Start
@@ -570,6 +574,25 @@
     - WhitelistChameleon
   # Sunrise-End
 
+- type: entity
+  parent: ClothingOuterArmorBase
+  id: CardArmour
+  name: cardboard armour
+  description: A medieval chestpiece built from cardboard.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/card_armour.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/card_armour.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+  - type: StaminaResistance
+    damageCoefficient: 0.90
+  - type: Construction
+    graph: cardArmour
+    node: cardarmour
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ChangelingClothingOuterArmor
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index c982eec80e..bd4651329f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -38,6 +38,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitAtmos
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Engineering Hardsuit
 - type: entity
@@ -72,6 +77,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitEngineering
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Spationaut Hardsuit
 - type: entity
@@ -109,6 +119,7 @@
     - FullBodyOuter # SUNRISE EDIT
     - WhitelistChameleon
     - HardsuitSpatio
+    - CorgiWearable
 
 #Salvage Hardsuit
 - type: entity
@@ -143,6 +154,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSalvage
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Goliath Hardsuit
 - type: entity
@@ -180,6 +196,11 @@
   - type: Construction
     graph: HardsuitGoliath
     node: hardsuitGoliath
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Maxim Hardsuit
 - type: entity
@@ -271,6 +292,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSecurity
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Brigmedic Hardsuit
 - type: entity
@@ -365,6 +391,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCap
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Chief Engineer's Hardsuit
 - type: entity
@@ -401,6 +432,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitEngineeringWhite
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Chief Medical Officer's Hardsuit
 - type: entity
@@ -430,6 +466,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitMedical
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Research Director's Hardsuit
 - type: entity
@@ -470,6 +511,8 @@
     tags:
     - WhitelistChameleon
     - HighRiskItem
+    - CorgiWearable
+    - Hardsuit
     - FullBodyOuter # Sunrise-Add
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitRd
@@ -566,7 +609,7 @@
     lowPressureMultiplier: 1000
   - type: ExplosionResistance
     damageCoefficient: 0.5
-  - type: StaminaResistance
+  - type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
     damageCoefficient: 0.75
   - type: Pierceable
     level: Metal
@@ -591,6 +634,8 @@
     - Hardsuit
     - FullBodyOuter # SUNRISE EDIT
     - WhitelistChameleon
+    - CorgiWearable
+    - ScurretWearable
   - type: StaticPrice
     price: 5000
 
@@ -655,7 +700,7 @@
     reduction: 0.8
   - type: Pierceable
     level: Rock
-  - type: StaminaResistance
+  - type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
     damageCoefficient: 0.6
   - type: Armor
     modifiers:
@@ -674,6 +719,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Syndicate Commander Hardsuit
 - type: entity
@@ -691,7 +741,7 @@
     lowPressureMultiplier: 1000
   - type: ExplosionResistance
     damageCoefficient: 0.5
-  - type: StaminaResistance
+  - type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
     damageCoefficient: 0.6
   - type: Pierceable
     level: Metal
@@ -710,6 +760,12 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
+
 
 #Cybersun Juggernaut Hardsuit
 - type: entity
@@ -755,6 +811,8 @@
   - type: Tag
     tags:
     - MonkeyWearable
+    - CorgiWearable
+    - Hardsuit
     - FullBodyOuter # SUNRISE EDIT
     - WhitelistChameleon
 
@@ -791,6 +849,11 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWizard
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 #Ling Space Suit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index c77ccf0caa..8cb4831ced 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -259,6 +259,10 @@
     sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingOuterWizardBase, BaseClothingOuterSounds] # Sunrise
@@ -270,6 +274,10 @@
     sprite: Clothing/OuterClothing/Misc/wizard.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/wizard.rsi
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingOuterWizardBase, BaseClothingOuterSounds] # Sunrise
@@ -281,6 +289,10 @@
     sprite: Clothing/OuterClothing/Misc/redwizard.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingOuterBase, BaseClothingOuterSounds] # Sunrise
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 854a1fdf52..582f12146b 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -13,6 +13,7 @@
     tags:
     - SuitEVA
     - MonkeyWearable
+    - CorgiWearable
     - FullBodyOuter # SUNRISE EDIT
     - WhitelistChameleon
 
@@ -62,6 +63,8 @@
       toggleable-clothing: !type:ContainerSlot {}
   - type: Tag
     tags:
+    - CorgiWearable
+    - ScurretWearable
     - MonkeyWearable
     - WhitelistChameleon
 
@@ -163,3 +166,7 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+  - type: Tag
+    tags:
+    - CorgiWearable
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 8c0d857ac1..ada9f2082e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -115,12 +115,11 @@
   - type: GroupExamine
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
-  # Sunrise-Start
   - type: Tag
     tags:
-    - FullBodyOuter
+    - CorgiWearable
     - WhitelistChameleon
-  # Sunrise-End
+    - FullBodyOuter # Sunrise-Edit
 
 - type: entity
   parent: [ClothingOuterBaseLarge, GeigerCounterClothing, AllowSuitStorageClothing]
@@ -312,12 +311,11 @@
     node: suit
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
-  # Sunrise-Start
   - type: Tag
     tags:
-    - FullBodyOuter
+    - CorgiWearable
     - WhitelistChameleon
-  # Sunrise-End
+    - FullBodyOuter # Sunrise-Edit
 
 - type: entity
   parent: ClothingOuterBase
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index 1747979a48..44b109908b 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -184,3 +184,30 @@
     price: 75
   - type: Tag
     tags: [ ]
+   
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsJump
+  name: jump boots
+  description: High-tech boots that give you the incredible ability to JUMP! With these boots you can jump over lava, chasms and weird chemicals on the floor!
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/jumpboots.rsi
+    layers:
+    - state: icon
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/jumpboots.rsi
+  - type: JumpAbility
+    jumpDistance: 4
+    jumpSound: /Audio/Effects/stealthoff.ogg
+  - type: ActionGrant
+    actions:
+    - ActionGravityJump 
+  - type: ItemActionGrant
+    actions:
+    - ActionGravityJump
+    activeIfWorn: true
+  - type: StaticPrice
+    price: 220
+  - type: Tag
+    tags: []
diff --git a/Resources/Prototypes/Entities/Effects/admin_triggers.yml b/Resources/Prototypes/Entities/Effects/admin_triggers.yml
index 52c5a6c110..df9e11bcff 100644
--- a/Resources/Prototypes/Entities/Effects/admin_triggers.yml
+++ b/Resources/Prototypes/Entities/Effects/admin_triggers.yml
@@ -7,7 +7,7 @@
     sprite: /Textures/Objects/Fun/goldbikehorn.rsi
     visible: false
     state: icon
-  - type: TriggerOnSpawn   
+  - type: TriggerOnSpawn
   - type: TimedDespawn
     lifetime: 5
 
@@ -25,7 +25,7 @@
   suffix: BluespaceFlash
   parent: AdminInstantEffectBase
   components:
-  - type: SpawnOnTrigger 
+  - type: SpawnOnTrigger
     proto: EffectFlashBluespace
 
 - type: entity
@@ -35,9 +35,9 @@
   components:
   - type: FlashOnTrigger
     range: 7
-  - type: SpawnOnTrigger 
+  - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
-  
+
 - type: entity
   id: AdminInstantEffectSmoke3
   suffix: Smoke (03 sec)
@@ -46,12 +46,12 @@
   - type: SmokeOnTrigger
     duration: 3
     spreadAmount: 1
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
-  
+
 - type: entity
   id: AdminInstantEffectSmoke10
   suffix: Smoke (10 sec)
@@ -60,12 +60,12 @@
   - type: SmokeOnTrigger
     duration: 10
     spreadAmount: 30
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
-  
+
 - type: entity
   id: AdminInstantEffectSmoke30
   suffix: Smoke (30 sec)
@@ -74,7 +74,7 @@
   - type: SmokeOnTrigger
     duration: 30
     spreadAmount: 50
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
@@ -97,12 +97,12 @@
   id: AdminInstantEffectGravityWell
   suffix: Gravity Well
   parent: AdminInstantEffectBase
-  components: 
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  components:
+  - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
-      volume: 5
+      params:
+        volume: 5
   - type: AmbientSound
     enabled: true
     volume: -5
@@ -117,4 +117,4 @@
   - type: SingularityDistortion
     intensity: 10
     falloffPower: 1.5
-      
+
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 9d2dbbb988..4fed13d9c0 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -23,10 +23,8 @@
       puddle:
         maxVol: 1000
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
-        - ReagentId: Water
-          Quantity: 5
+        - ReagentId: Vomit
+          Quantity: 10
 
 - type: entity
   id: PuddleEgg
@@ -51,10 +49,8 @@
       puddle:
         maxVol: 1000
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
-        - ReagentId: Water
-          Quantity: 5
+        - ReagentId: JuiceTomato
+          Quantity: 10
 
 - type: entity
   parent: PuddleTemporary
@@ -118,10 +114,8 @@
       puddle:
         maxVol: 1000
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 15
-        - ReagentId: Water
-          Quantity: 15
+        - ReagentId: JuiceWatermelon
+          Quantity: 30
 
 - type: entity
   id: PuddleFlour
@@ -165,6 +159,8 @@
   components:
   - type: Clickable
   - type: Slippery
+    staminaDamage: 0
+    frictionStatusTime: 0 # Don't apply friction twice
   - type: Transform
     noRot: true
     anchored: true
@@ -205,13 +201,14 @@
   - type: EdgeSpreader
     id: Puddle
   - type: StepTrigger
-  - type: Drink
+  - type: Edible
+    edible: Drink
     delay: 3
     transferAmount: 1
     solution: puddle
-    examinable: false
   - type: ExaminableSolution
     solution: puddle
+    locVolume: "examinable-solution-on-examine-volume-puddle"
   - type: DrawableSolution
     solution: puddle
   - type: BadDrink
diff --git a/Resources/Prototypes/Entities/Interface/admin_tools.yml b/Resources/Prototypes/Entities/Interface/admin_tools.yml
new file mode 100644
index 0000000000..a8c978ed0c
--- /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/Mobs/animals.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
index 5691d984b7..02d99e81c3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
@@ -86,6 +86,21 @@
     prototypes:
     - MobCockroach
 
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobMoproach
+  name: Moproach Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Animals/mothroach/moproach.rsi
+      state: icon
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMoproach
+
 - type: entity
   parent: MarkerBase
   id: SpawnMobCow
@@ -210,7 +225,7 @@
     layers:
     - state: green
     - state: parrot
-      sprite: Mobs/Animals/parrot.rsi
+      sprite: Mobs/Animals/parrot/parrot.rsi
   - type: ConditionalSpawner
     prototypes:
     - MobParrot
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
index 0708f9a108..f590bcb508 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
@@ -218,6 +218,21 @@
     prototypes:
     - MobMonkeyPunpun
 
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobPollyParrot
+  name: Polly the parrot Spawner
+  suffix: CE Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: parrot
+      sprite: Mobs/Animals/parrot/parrot.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPollyParrot
+
 - type: entity
   parent: MarkerBase
   id: SpawnMobPossumMorty
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/xenos.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/xenos.yml
index 36a6480e36..45359e05c2 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/xenos.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/xenos.yml
@@ -109,3 +109,19 @@
   - type: ConditionalSpawner
     prototypes:
     - MobXenoSpitter
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoLonePraetorian
+  name: Xeno Spawner
+  suffix: Lone Praetorian, Exo Station
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/praetorian.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoLonePraetorianNoGhost
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index 88506d33a6..7d0f734acc 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -42,6 +42,8 @@
       - FoodCakeChristmasSlice
       - FoodCakeVanillaSlice
       - FoodCakeBirthdaySlice
+      - FoodCakeBerryDelightSlice
+      - FoodCakeCottonSlice
       - FoodBakedMuffin
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
index 7e580db980..7683f19884 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
@@ -37,6 +37,8 @@
       - FoodCakeChristmas
       - FoodCakeBirthday
       - FoodCakeVanilla
+      - FoodCakeBerryDelight
+      - FoodCakeCotton
       - FoodPieApple
       - FoodPieBaklava
       - FoodPieBananaCream
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 65f8f66106..9f952db002 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -172,6 +172,7 @@
     - id: ClothingHeadHatFancyCrown
     - id: GoldenBikeHorn
     - id: ClothingHeadHatCatEars
+    - id: GoldenPersonalAI
     - id: TreasureCoinDiamond
       amount: !type:RangeNumberSelector
         range: 2, 5
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index c84e386a1b..5e83b9949d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -56,7 +56,7 @@
       - id: ClothingHeadHatPaper
       - id: ClothingHeadHatPirate
       - id: ClothingMaskSterile
-      - id: ClothingNeckHeadphones
+      - id: ClothingMultipleHeadphones
       - id: ClothingNeckTieRed
       - id: ClothingOuterCoatGentle
       - !type:AllSelector
@@ -172,6 +172,8 @@
       - id: ClothingUniformJumpsuitFamilyGuy
       - id: WristwatchGold
       - id: RubberStampGreytide
+      - id: MysteryLighterBox
+      - id: GoldenPersonalAI
 
 - type: entity
   name: Maint Loot Spawner
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
index 3830cbc03a..818a86f1bc 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -163,4 +163,5 @@
       - PosterLegitSafetyMothSSD
       - PosterLegitOppenhopper
       - PosterLegitTyrone
+      - PosterLegitHelio
     chance: 1
diff --git a/Resources/Prototypes/Entities/Markers/pointing.yml b/Resources/Prototypes/Entities/Markers/pointing.yml
index e347809a47..7c07405c7d 100644
--- a/Resources/Prototypes/Entities/Markers/pointing.yml
+++ b/Resources/Prototypes/Entities/Markers/pointing.yml
@@ -9,7 +9,7 @@
   - type: Sprite
     sprite: Interface/Misc/pointing.rsi
     state: pointing
-    drawDepth: Overlays
+    drawdepth: Overlays
     noRot: true
   - type: PointingArrow
     duration: 4
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
index 8a47856fec..eaca0d719c 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -165,3 +165,28 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_moth_l
+
+- type: marking
+  id: TattooEyeshadowUpper
+  # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional.
+  # this marking is meant to be supplementary so they are transparent. if you give this 255 alpha it will probably be really distracting looking and make the face very difficult to read
+  # the reason these are also not recolorable is because allowing for the full RGB range makes these look not very good (especially considering they are stackable, and ESPECIALLY considering vox can stack 3 at once.)
+  # this is not a very big issue on humans, but is much more pronounced on vox & other nonhuman species, where the skin being more colorful can make for some truly dreadful meshing with the sprite thats definitely not desired.
+  # some of these limitations could possibly be removed with better control over how the marking can be customized - possibly removing stacking, allowing recoloring & clamping higher-end colors for the eyeshadow, etc.
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: eyeshadow_upper
+
+- type: marking
+  id: TattooEyeshadowLower
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: eyeshadow_lower
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 7fc3fedaa2..01d88513d8 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -18,6 +18,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: braid_s
 
+- type: marking
+  id: VoxHairBushy
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: bushy_s
+
 - type: marking
   id: VoxHairCrestedQuills
   bodyPart: Hair
@@ -58,6 +68,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: hawk_s
 
+- type: marking
+  id: VoxHairHedgehog
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: hedgehog_s
+
 - type: marking
   id: VoxHairHorns
   bodyPart: Hair
@@ -108,6 +128,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: long_braid_s
 
+- type: marking
+  id: VoxHairMadScientist
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: mad_scientist_s
+
 - type: marking
   id: VoxHairMange
   bodyPart: Hair
@@ -188,6 +218,16 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: shortquills_s
 
+- type: marking
+  id: VoxHairSlick
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: slick_s
+
 - type: marking
   id: VoxHairSpotty
   bodyPart: Hair
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
index cd3588bf54..f3c0e5d204 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
@@ -141,5 +141,24 @@
   forcedColoring: true
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
-    # Ideally this should use the normal tail sprite and apply an actual mask over it, not just use a butchered sprite
-    state: tail_stenciled
+    state: tail
+
+- type: marking
+  id: VoxTailShort
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_short
+
+- type: marking
+  id: VoxTailBig
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_big
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
new file mode 100644
index 0000000000..5998ddc237
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml
@@ -0,0 +1,118 @@
+- type: marking
+  id: VoxScarEyeRight
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_right
+
+- type: marking
+  id: VoxScarEyeLeft
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_left
+
+- type: marking
+  id: VoxScarTopSurgeryShort
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_top_surgery_short
+
+- type: marking
+  id: VoxScarTopSurgeryLong
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_top_surgery_long
+
+- type: marking
+  id: VoxScarChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_chest
+
+- type: marking
+  id: VoxScarNeck
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_neck
+
+- type: marking
+  id: VoxScarChestBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_chest_bullets
+
+- type: marking
+  id: VoxScarStomachBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_stomach_bullets
+
+- type: marking
+  id: VoxScarFace1
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_face_1
+
+- type: marking
+  id: VoxScarFace2
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_face_2
+
+- type: marking
+  id: VoxScarEyeRightSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_right_small
+
+- type: marking
+  id: VoxScarEyeLeftSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_left_small
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
index c61cfea0c6..567c3b2620 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -53,3 +53,80 @@
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
     state: nightling_s
+
+- type: marking
+  id: TattooVoxTailRing
+  bodyPart: Tail
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tail_ring
+
+- type: marking
+  id: TattooEyeVoxRight
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tattoo_eye_vox_r
+
+- type: marking
+  id: TattooEyeVoxLeft
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+          negative: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: tattoo_eye_vox_l
+
+- type: marking
+  id: TattooEyeshadowVoxSmall
+  # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional.
+  # this marking is meant to be supplementary so they are transparent. if you give this 255 alpha it will probably be really distracting looking and make the face very difficult to read
+  # the reason these are also not recolorable is because allowing for the full RGB range makes these look not very good (especially considering they are stackable, and ESPECIALLY considering vox can stack 3 at once.)
+  # this is not a very big issue on humans, but is much more pronounced on vox & other nonhuman species, where the skin being more colorful can make for some truly dreadful meshing with the sprite thats definitely not desired.
+  # some of these limitations could possibly be removed with better control over how the marking can be customized - possibly removing stacking, allowing recoloring & clamping higher-end colors for the eyeshadow, etc.
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeshadow_small
+
+- type: marking
+  id: TattooEyeshadowVoxMedium
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeshadow_medium
+
+- type: marking
+  id: TattooEyeshadowVoxLarge
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Vox]
+  forcedColoring: true
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: eyeshadow_large
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index e3819645c8..5ce43a2317 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -25,7 +25,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 150
+        density: 300
         mask:
         - MobMask
         layer:
@@ -155,9 +155,6 @@
   - type: Body
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Flashed
     - Jump # Sunrise-Edit
     - Flip # Sunrise-Edit
@@ -233,8 +230,8 @@
       id: blinking
       interpolate: Nearest
       maxDuration: 1.0
-      minValue: 0.1
-      maxValue: 2.0
+      startValue: 0.1
+      endValue: 2.0
       isLooped: true
   - type: ToggleableVisuals
     spriteLayer: light
@@ -299,7 +296,7 @@
     receiveFrequencyId: CyborgControl
     transmitFrequencyId: RoboticsConsole
     savableAddress: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 10
     examinable: false
     beepSound:
@@ -307,8 +304,9 @@
       params:
         volume: -4
   # prevent any funnies if someone makes a cyborg item...
-  - type: AutomatedTimer
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   # explosion does most of its damage in the center and less at the edges
   - type: Explosive
     explosionType: Minibomb
@@ -464,13 +462,15 @@
   parent: BaseBorgChassisNotIonStormable
   id: BaseXenoborgChassis
   name: xenoborg
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army.
   save: false
   abstract: true
   components:
   - type: RandomMetadata
     nameSegments:
     - NamesXenoborg
+  - type: NameIdentifier
+    group: Xenoborg
   - type: Sprite
     sprite: Mobs/Silicon/chassis.rsi
   - type: MobThresholds
@@ -511,7 +511,7 @@
   - type: Vocal
     sounds:
       Unsexed: UnisexSiliconXenoborg
-    screamAction: null
+    wilhelmProbability: 0
   - type: DamagedSiliconAccent
   - type: UnblockableSpeech
   - type: FootstepModifier
@@ -537,7 +537,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Machines/warning_buzzer.ogg
+          path: /Audio/Machines/warning_buzzer_xenoborg.ogg
           params:
             volume: 5
     - trigger:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
index 5bd6929bfe..556b6ac4c4 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -3,7 +3,7 @@
   id: XenoborgEngi
   name: engi xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This one seems to be an engineering type, as it has more tools for supporting the other xenoborgs.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This one seems to be an engineering type, as it has more tools for supporting the other Xenoborgs.
   components:
   - type: BorgTransponder
     name: engi xenoborg
@@ -30,6 +30,7 @@
       - XenoborgModuleGeneric
       - XenoborgModuleEngi
       - BorgModuleEngineering
+      - BorgModuleGeneric
   - type: ContainerFill
     containers:
       borg_brain:
@@ -57,7 +58,7 @@
   id: XenoborgHeavy
   name: heavy xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This type is has heavy lasers and is covered in thick armor plates. It may be tougher, but its speed matches its brawn.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This type is has heavy lasers and is covered in thick armor plates. It may be tougher, but its speed matches its brawn.
   components:
   - type: BorgTransponder
     name: heavy xenoborg
@@ -106,7 +107,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Machines/warning_buzzer.ogg
+          path: /Audio/Machines/warning_buzzer_xenoborg.ogg
           params:
             volume: 5
     - trigger:
@@ -144,7 +145,7 @@
   id: XenoborgScout
   name: scout xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This is a scout type, its nimble thrusters allow it to move quickly through space.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This is a scout type, its nimble thrusters allow it to move quickly through space.
   components:
   - type: BorgTransponder
     name: scout xenoborg
@@ -197,7 +198,7 @@
   id: XenoborgStealth
   name: stealth xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This one is a stealth type. Its armor shimmers in the light like no other material you've seen.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This one is a stealth type. Its armor shimmers in the light like no other material you've seen.
   components:
   - type: BorgTransponder
     name: stealth xenoborg
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6071fc2b71..2aa796e57a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -120,6 +120,7 @@
       10: Dead
   - type: Stamina
     critThreshold: 10
+    animationThreshold: 1
   - type: DamageStateVisuals
     states:
       Alive:
@@ -1093,10 +1094,10 @@
     growthDelay: 20
   - type: ExaminableHunger
   - type: Wooly
-  - type: Food
+  - type: Edible
+    destroyOnEmpty: false
     solution: wool
     requiresSpecialDigestion: true
-    # Wooly prevents eating wool deleting the goat so its fine
     requireDead: false
   - type: FlavorProfile
     flavors:
@@ -1540,6 +1541,9 @@
         Piercing: 4
       groups:
         Burn: 3
+    catchingFailDamage:
+      types:
+        Blunt: 1
     clumsySound:
       path: /Audio/Animals/monkey_scream.ogg
 
@@ -1723,6 +1727,9 @@
         Piercing: 7
       groups:
         Burn: 3
+    catchingFailDamage:
+      types:
+        Blunt: 1
     clumsySound:
       path: /Audio/Voice/Reptilian/reptilian_scream.ogg
 
@@ -2283,9 +2290,10 @@
 
 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
-  name: parrot
   parent: [ SimpleMobBase, FlyingMobBase ]
-  id: MobParrot
+  id: MobParrotBase
+  name: parrot
+  abstract: true
   description: Infiltrates your domain, spies on you, and somehow still a cool pet.
   components:
   - type: MovementSpeedModifier
@@ -2296,7 +2304,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: parrot
-      sprite: Mobs/Animals/parrot.rsi
+      sprite: Mobs/Animals/parrot/parrot.rsi
   - type: Fixtures
     fixtures:
       fix1:
@@ -2326,7 +2334,29 @@
   - type: Vocal
     sounds:
       Unsexed: Parrot
-  - type: ParrotAccent
+  - type: ActiveListener
+  - type: Vocalizer
+  - type: RadioVocalizer
+  - type: ParrotListener
+  - type: ParrotMemory
+  - type: Inventory
+    templateId: parrot
+    speciesId: parrot
+    # transparent displacement map to hide the headset. this should be an animated displacement map to follow the parrot
+    # as it bobs up and down, but this in turn needs some way to change the displacement map on inventory entities when
+    # the parrot dies, otherwise the visuals will be broken
+    displacements:
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/parrot/displacement.rsi
+            state: ears
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-bird
@@ -2343,6 +2373,12 @@
   - type: FactionException
   # Sunrise-End
 
+- type: entity
+  parent: MobParrotBase
+  id: MobParrot
+  components:
+  - type: ParrotAccent # regular parrots have a parrotaccent. Polly is special and does not
+
 - type: entity
   name: penguin
   parent: SimpleMobBase
@@ -2463,7 +2499,8 @@
   - type: Item
     size: Normal
     sprite: Mobs/Animals/grenadepenguin.rsi
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 10
     beepSound:
       path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg #funny sfx use
@@ -2476,6 +2513,8 @@
     intensitySlope: 20
     totalIntensity: 225
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Destructible
     thresholds:
     - trigger:
@@ -3014,6 +3053,7 @@
   - type: HTN
     rootTask:
       task: RuminantHostileCompound
+  - type: MessyDrinker
   - type: Tag
     tags:
     - VimPilot
@@ -3064,6 +3104,7 @@
       gender: epicene
   - type: MobPrice
     price: 200
+  - type: MessyDrinker
   - type: DogVision  # Sunrise-DogVision
 
 - type: entity
@@ -3485,6 +3526,7 @@
   - type: Grammar
     attributes:
       gender: epicene
+  - type: SlowAccent
   - type: Tag
     tags:
     - VimPilot
@@ -4014,13 +4056,18 @@
       belt:
         sizeMaps:
           32:
-            sprite: Mobs/Pets/corgi.rsi
-            state: belt_displacement
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_belt_displacement
       ears:
         sizeMaps:
           32:
-            sprite: Mobs/Pets/corgi.rsi
-            state: belt_displacement
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_belt_displacement
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_head_displacement
   - type: Hands # HANDS!
   - type: Puller
   - type: Cuffable # bad dog!
@@ -4044,3 +4091,6 @@
     - DoorBumpOpener
   - type: StatusIcon # marks them as crew
     bounds: -0.5,-0.5,0.5,0.5
+  - type: NpcFactionMember
+    factions:
+    - NanoTrasen
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index 3ba17c3319..d2dd761468 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -19,13 +19,10 @@
     group: GenericNumber
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Stutter
-    - Stun
     - Electrocution
     - TemporaryBlindness
     - RadiationProtection
-    - Drowsiness
     - Adrenaline
   - type: StandingState
   - type: Tag
@@ -58,7 +55,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      250: Dead
+      150: Dead
   - type: MeleeWeapon
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
@@ -379,7 +376,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      75: Dead
+      45: Dead
   - type: MeleeWeapon
     angle: 0
     animation: WeaponArcBite
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index e26759bba7..8114f1f52d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -76,6 +76,7 @@
       tags:
         - Carp
         - DoorBumpOpener
+        - CannotSuicide
         - NoPaint  # Sunrise-edit
     - type: ReplacementAccent
       accent: genericAggressive
@@ -163,6 +164,10 @@
   suffix: "Salvage Ruleset"
   components:
     - type: SalvageMobRestrictions
+    - type: MobThresholds
+      thresholds:
+        0: Alive
+        30: Dead
 
 - type: entity
   name: space carp
@@ -237,7 +242,7 @@
     - type: MobThresholds
       thresholds:
         0: Alive
-        150: Dead
+        82: Dead # Might seem random, but this brings up the hits to kill with a crusher mark to 3
     - type: Stamina
       critThreshold: 150
     - type: DamageStateVisuals
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 7b435a2625..ba4c5e3698 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
@@ -56,11 +53,6 @@
     critThreshold: 120
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:TriggerBehavior
     - trigger:
         !type:DamageTrigger
         damage: 120
@@ -386,7 +378,6 @@
     chemicalMaxVolume: 100
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Electrocution
   - type: MeleeWeapon
     soundHit:
@@ -399,7 +390,6 @@
     solution: bloodstream
     transferAmount: 5
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: alive
@@ -410,6 +400,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 a1bcd547a6..f3ec5ff80b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -42,6 +42,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -240,6 +241,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -359,4 +361,4 @@
       30: Dead
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
\ No newline at end of file
+    baseSprintSpeed: 2.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
index 9500345e4f..4717e200dd 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/moproach.yml b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
new file mode 100644
index 0000000000..c38b2cedf7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
@@ -0,0 +1,55 @@
+- type: entity
+  name: moproach
+  parent: MobMothroach
+  id: MobMoproach
+  description: This little mothroach has mopshoes on its feet! How adorable!
+  components:
+  - type: GhostRole
+    name: ghost-role-information-moproach-name
+    description: ghost-role-information-moproach-description
+  - type: Sprite
+    sprite: Mobs/Animals/mothroach/moproach.rsi
+  - type: Clothing
+    quickEquip: false
+    sprite: Mobs/Animals/mothroach/moproach.rsi
+    equippedPrefix: 0
+    slots:
+    - HEAD
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      45: Critical
+      65: Dead
+  - type: MovementSpeedModifier
+    baseSprintSpeed : 5 # extra speed for that moppin'!
+  - type: HTN
+    rootTask:
+      task: MoproachCompound
+  - type: Absorbent
+    pickupAmount: 2 # small feet
+  - type: UseDelay
+    delay: 0.5 # quick feet
+  - type: SolutionRegeneration
+    solution: absorbed
+    generated:
+      reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: SolutionPurge
+    solution: absorbed
+    preserve:
+      - Water
+    quantity: 10
+  - type: SolutionContainerManager
+    solutions:
+      absorbed:
+        maxVol: 50
+      food:
+        reagents:
+        - ReagentId: Slime
+          Quantity: 5
+  - type: DrainableSolution
+    solution: drainBuffer
+  - type: InteractionPopup
+    interactSuccessString: petting-success-cleanbot
+    interactFailureString: petting-failure-cleanbot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index b4ceb60c15..6541df0939 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -13,6 +13,20 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ian
+  - type: Inventory
+    speciesId: dog
+    templateId: petAdvanced
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_head_displacement
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_eyes_displacement
   - type: DamageStateVisuals
     states:
       Alive:
@@ -84,6 +98,20 @@
     attributes:
       proper: true
       gender: female
+  - type: Inventory
+    speciesId: dog
+    templateId: petAdvanced
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: lisa_head_displacement
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: corgi_eyes_displacement
 
 - type: entity
   name: real mouse
@@ -288,6 +316,8 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: mcgriff
+    - map: [ "head" ]
+    - map: [ "eyes" ]
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -302,7 +332,18 @@
         - MobLayer
   - type: Inventory
     speciesId: puppy
-    templateId: pet
+    templateId: petAdvanced
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: mcgriff_head_displacement
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/displacements.rsi
+            state: mcgriff_eyes_displacement
   - type: DamageStateVisuals
     states:
       Alive:
@@ -338,6 +379,7 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalMcGriff
+  - type: MessyDrinker
   # Sunrise-start
   - type: Carriable
   - type: CanEscapeInventory
@@ -442,6 +484,7 @@
   - type: Speech
     speechVerb: Canine
     speechSounds: Dog
+  - type: MessyDrinker
   # Sunrise-start
   - type: DogVision
   - type: Carriable
@@ -709,6 +752,8 @@
       types:
         Piercing: 8
         Poison: 8
+  - type: Spider
+    spawnsWebsAsNonPlayer: false
   - type: Grammar
     attributes:
       proper: true
@@ -939,3 +984,21 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
+
+- type: entity
+  name: Polly the parrot
+  parent: MobParrotBase
+  id: MobPollyParrot
+  description: An expert in quantum cracker theory
+  components:
+  - type: Vocalizer
+    maxVocalizeInterval: 240 # polly is chattier
+  - type: RadioVocalizer
+    radioAttemptChance: 0.8 # polly wants to share with the world
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Loadout
+    prototypes: [ MobPollyGear ]
+
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index b2d16b5733..4b68ebcd72 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -85,7 +85,6 @@
       Dead: 0
     baseDecayRate: 0.1
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: regalrat
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 6a8fdf048e..ba6ea214f3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -6,6 +6,8 @@
   name: revenant
   description: A spooky ghostie.
   components:
+  - type: Emag
+    emagType: All
   # Sunrise edit start
   - type: GhostPanelAntagonistMarker
     name: ghost-panel-antagonist-revenant-name
@@ -24,7 +26,6 @@
     - state: active
   - type: StatusEffects
     allowed:
-    - Stun
     - Corporeal
   - type: Damageable
     damageContainer: ManifestedSpirit
@@ -87,10 +88,12 @@
   - type: Reactive
     groups:
       Acidic: [Touch]
-  # Sunrise-start
   - type: Tag
     tags:
-    - NoPaint
+    - SlowImmune
+    - KnockdownImmune
+    - NoPaint # Sunrise-Edit
+  # Sunrise-start
   - type: TTS
     voice: HermaeusMora
   - type: Electrified
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
new file mode 100644
index 0000000000..6d328014db
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -0,0 +1,212 @@
+# Defines the scurret, a small, agile sapient species intended for players who want to play as something similar to an ewok.
+# Although based on MobBaseAncestor, this species does not have a "developed" playable species it is an ancestor to.
+
+- type: entity
+  name: scurret
+  id: MobBaseScurret
+  parent: MobBaseAncestor
+  abstract: true
+  components:
+  # Custom names
+  - type: ReplacementAccent
+    accent: scurret
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      sprite: Mobs/Animals/scurret/scurret.rsi
+      state: scurret
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+  # Custom visuals for dead scurrets; be aware these do not work well with equipment.
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: scurret
+      Critical:
+        Base: scurret_oof
+      Dead:
+        Base: scurret_rip
+  #  About as tough as a monkey
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      60: Critical
+      125: Dead
+  - type: Temperature
+    heatDamageThreshold: 360
+    coldDamageThreshold: 285
+    currentTemperature: 310.15
+    specificHeat: 42
+  # Good eatin', you monster.
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeat
+      amount: 4
+  # They wawa!
+  - type: Vocal
+    sounds:
+      Male: Scurret
+      Female: Scurret
+      Unsexed: Scurret
+    wilhelmProbability: 0.01 # the scug, it screams like a man
+  - type: Speech
+    speechVerb: Wawa
+    speechSounds: Wawa
+    allowedEmotes: ["Thump"] # They're 80% tail
+  - type: TypingIndicator
+    proto: moth
+  - type: InteractionPopup
+    successChance: 0.99 # Imagine not being allowed to headpat a scurret, chat
+    interactSuccessString: petting-success-scurret
+    interactFailureString: petting-failure-scurret
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/wawa_chillin.ogg
+    interactFailureSound:
+      path: /Audio/Animals/wawa_chatter.ogg
+  # They nyoom
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 5 # nyoom
+    baseSprintSpeed: 7 # NYOOOOOM
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    angle: 30
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 10 # NOM
+  - type: Inventory
+    speciesId: scurret
+    templateId: scurret
+    displacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: jumpsuit
+      id:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: id
+      gloves:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: gloves
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: neck
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: ears
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: eyes
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: mask
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: back
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Animals/scurret/displacement.rsi
+          state: hand
+
+  - type: InventorySlots
+  - type: Food
+  - type: Hunger
+    baseDecayRate: 0.05 # They get a lil' hungy
+  - type: BodyEmotes # Grants them clapping and so on.
+    soundsId: Scurret
+  - type: Deathgasp
+    prototype: ScurretDeathgasp # You monster
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+    - CanPilot
+    - VimPilot
+    - AnomalyHost
+
+# Spawnable scurrets have a random name and colour.
+
+- type: entity
+  name: scurret
+  description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce".
+  id: MobScurret
+  parent: MobBaseScurret
+  components:
+  # The have a rich culture
+  - type: RandomMetadata
+    nameSegments:
+    - NamesFirstScurret
+    - NamesLastScurret
+    nameFormat: name-format-standard
+  # They come in a variety of colours
+  - type: RandomSprite
+    available:
+    - enum.DamageStateVisualLayers.Base:
+        scurret: ScurretColors
+  # They are of a mysterious gender.
+  - type: Grammar
+    attributes:
+      gender: epicene
+      proper: true
+  # Strips the name identifier from them, so they're just "Confident Waters" rather than "Confident Waters (123)"
+  - type: NameIdentifier
+    group: null
+
+# Emotional Support Scurrets have a ghost role and equipment. At the moment, these are intended to be used for admemes, but
+# feel free to hook them into random content.
+
+- type: entity
+  name: Emotional Support Scurret
+  id: MobBaseEmotionalSupportScurret
+  parent: MobBaseScurret
+  abstract: true
+  components:
+    - type: Loadout
+      prototypes: [ EmotionalSupportScurretGear ]
+    - type: NpcFactionMember
+      factions:
+      - Passive
+    - type: GhostRole
+      makeSentient: true
+      name: ghost-role-information-emotional-support-scurret-name
+      description: ghost-role-information-emotional-support-scurret-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+
+# Spawnable ESS have a ghost role, equipment, a random name and a random colour.
+
+- type: entity
+  name: Emotional Support Scurret
+  id: MobEmotionalSupportScurret
+  parent: [MobScurret, MobBaseEmotionalSupportScurret]
+  description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnold's Pizza's "loyal workforce". This one is here as a temp.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 706cc71eea..e6d58c40d0 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
     - Jump # Sunrise-Edit
@@ -169,8 +166,9 @@
     interactFailureString: petting-failure-firebot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: Advertise
-    pack: FirebotAd
+  - type: Vocalizer
+  - type: DatasetVocalizer
+    dataset: FirebotAd
 
 - type: entity
   parent: MobSiliconBase
@@ -368,8 +366,9 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: Advertise
-    pack: MedibotAds
+  - type: Vocalizer
+  - type: DatasetVocalizer
+    dataset: MedibotAds
   - type: Inventory
     templateId: medibot
   - type: DoAfter
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 120b1c4b7a..d8f2c79e12 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -19,15 +19,12 @@
     baseSprintSpeed : 4
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Stutter
     - Electrocution
-    - ForcedSleep
     - TemporaryBlindness
     - Pacified
     - Flashed
     - RadiationProtection
-    - Drowsiness
     - Adrenaline
     - Jump # Sunrise-Edit
     - Flip # Sunrise-Edit
@@ -38,6 +35,7 @@
   - type: Tag
     tags:
     - DoorBumpOpener
+    - StunImmune
 
 - type: entity
   abstract: true
@@ -99,18 +97,13 @@
     baseDecayRate: 0.04
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Stutter
     - Electrocution
-    - ForcedSleep
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
     - Flashed
     - RadiationProtection
-    - Drowsiness
     - Adrenaline
     - Jump # Sunrise-Edit
     - Flip # Sunrise-Edit
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 6e8f436215..95a69c37a6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -34,7 +34,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      80: Dead
   - type: Stamina
     critThreshold: 150
   - type: MovementAlwaysTouching
@@ -168,6 +168,10 @@
     spawned:
     - id: FoodMeat
       amount: 1
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      60: Dead
 
 - type: entity
   id: MobKangarooSpaceSalvage
@@ -195,7 +199,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      90: Dead
+      45: Dead
   - type: Stamina
     critThreshold: 150
   - type: DamageStateVisuals
@@ -297,7 +301,7 @@
     - type: MobThresholds
       thresholds:
         0: Alive
-        100: Dead
+        45: Dead
     - type: Stamina
       critThreshold: 150
     - type: DamageStateVisuals
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 44945c9a95..f72bcc4e8c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -42,7 +42,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      15: Dead
+      5: Dead
   - type: Destructible
     thresholds:
     - trigger:
@@ -54,6 +54,7 @@
         recursive: false
   - type: Stamina
     critThreshold: 15
+    animationThreshold: 5
   - type: MovementAlwaysTouching
   - type: DamageStateVisuals
     states:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 6c3a8c66b6..f06ff48681 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -79,7 +79,6 @@
       groups:
         Brute: 6
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: running
@@ -518,8 +517,8 @@
 # Mob mapped to Xeno Station that can not be ghostrole / pry
 
 - type: entity
-  name: lone praetorian
-  description: The last of its kind.
+  name: '"Dale"'
+  description: A praetorian left over from the station's initial security sweep. Has a pair of bloodied dog tags engraved with the name "Pvt. Dale" stuck in its maw.
   parent: SimpleSpaceMobBase
   id: MobXenoLonePraetorianNoGhost
   components:
@@ -564,7 +563,6 @@
      groups:
        Brute: 5
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: running
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 5b710cf3d6..d837fa5422 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -22,6 +22,14 @@
     canInteract: true
   - type: GhostHearing
   - type: Hands
+    hands:
+      hand_right:
+        location: Right
+      hand_left:
+        location: Left
+    sortedHands:
+    - hand_right
+    - hand_left
   - type: ComplexInteraction
   - type: Puller
     needsHands: false
@@ -29,8 +37,6 @@
   - type: Physics
     ignorePaused: true
     bodyType: Kinematic
-  - type: Body
-    prototype: Aghost
   - type: Access
     groups:
     - AllAccess
@@ -106,13 +112,8 @@
   - type: Loadout
     prototypes: [ MobAghostGear ]
   - type: BypassInteractionChecks
-  - type: InteractionPopup
-    successChance: 1.0
-    interactSuccessString: petting-success-cat
-    interactFailureString: petting-failure-generic
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/cat_meow.ogg
+  - type: ExplosionResistance
+    damageCoefficient: 0
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index 92bed341b1..4d3b286670 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -1,13 +1,12 @@
 # Settings for cloning bodies
 # If you add a new trait, job specific component or a component doing visual/examination changes for humanoids
 # then add it here to the correct prototype.
-# The datafields of the components are only shallow copied using CopyComp.
+# The datafields of the components copied using CopyComp.
 # Subscribe to CloningEvent instead if that is not enough.
 
-# for basic traits etc.
-# used by the random clone spawner
+# for basic physical traits
 - type: cloningSettings
-  id: BaseClone
+  id: Body
   components:
   # general
   - DetailExaminable
@@ -15,9 +14,10 @@
   - Fingerprint
   - NpcFactionMember
   # traits
+  - BlackAndWhiteOverlay
+  - Clumsy
   # - LegsParalyzed (you get healed)
   - LightweightDrunk
-  - Monochromacy
   - Muted
   - Narcolepsy
   - Pacified
@@ -62,6 +62,30 @@
   - SouthernAccent
   - SpanishAccent
   - StutteringAccent
+
+# for job-specific traits etc.
+- type: cloningSettings
+  id: Special
+  components:
+  - BibleUser
+  - CommandStaff
+  - MindShield
+  - MimePowers
+  - SpaceNinja
+  - Thieving
+
+# antag roles
+- type: cloningSettings
+  id: Antag
+  components:
+  - HeadRevolutionary
+  - Revolutionary
+  - NukeOperative
+
+# a full clone with all traits and items, but no antag roles
+- type: cloningSettings
+  id: BaseClone
+  parent: [Body, Special]
   blacklist:
     components:
     - AttachedClothing # helmets, which are part of the suit
@@ -69,26 +93,47 @@
     - Implanter # they will spawn full again, but you already get the implant. And we can't do item slot copying yet
     - VirtualItem
 
-# all antagonist roles
-- type: cloningSettings
-  id: Antag
-  parent: BaseClone
-  components:
-  - HeadRevolutionary
-  - Revolutionary
-  - NukeOperative
-
 # for cloning pods
 - type: cloningSettings
   id: CloningPod
-  parent: Antag
+  parent: [BaseClone, Antag]
   forceCloning: false
   copyEquipment: null
   copyInternalStorage: false
   copyImplants: false
 
-# spawner
+# for paradox clones
+- type: cloningSettings
+  id: ParadoxCloningSettings
+  parent: [BaseClone, Antag]
 
+# changeling identity copying
+- type: cloningSettings
+  id: ChangelingCloningSettings
+  parent: Body
+  components:
+  # These are already part of the base species prototype that is spawned for the clone,
+  # that means we only need to copy them over when switching between species.
+  # So these don't need to be part of the Body settings, unless someone makes a trait that adjusts these components.
+  - BodyEmotes
+  # - Fixtures TODO: A better way to clone fixtures or a fixture fix. Currently if you devour someone on the ground and transform, you lose collision with tables as they were knocked down when they were copied.
+  - Speech
+  - TypingIndicator
+  - ScaleVisuals # for dwarf height
+  eventComponents:
+  # these need special treatment in the event subscription
+  - Inventory # arachnid pockets and diona feet
+  - Wagging # lizard tails
+  - Vocal # voice sounds
+  - Storage # slime storage
+  - Rootable # diona
+  - Sericulture # arachnids
+  - MovementSpeedModifier # moths when weightless
+  copyEquipment: null
+  copyInternalStorage: false
+  copyImplants: false
+
+# spawner
 - type: entity
   id: RandomCloneSpawner
   name: Random Clone
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 134dc2e889..e24f87b7c5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -104,14 +104,11 @@
       types: {}
   - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
     allowed:
-    - SlowedDown
     - Stutter
     - Electrocution
-    - ForcedSleep
     - TemporaryBlindness
     - Pacified
     - RadiationProtection
-    - Drowsiness
     - Adrenaline
   - type: Temperature
     heatDamageThreshold: 800
@@ -142,8 +139,12 @@
         Piercing: 15
         Slash: 15
   - type: Devourer
-    foodPreference: Humanoid
-    shouldStoreDevoured: true
+    foodPreferenceWhitelist:
+      components:
+      - HumanoidAppearance
+    stomachStorageWhitelist:
+      components:
+      - MobState
     chemical: Ichor
     healRate: 20.0 #Sunrise-edit
     whitelist:
@@ -156,6 +157,7 @@
     tags:
     - CannotSuicide
     - DoorBumpOpener
+    - StunImmune
   - type: Puller
     needsHands: false
   - type: RandomMetadata
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 3cdd23b5c8..bc5d139e7d 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -241,6 +241,9 @@
           Piercing: 4
         groups:
           Burn: 3
+      catchingFailDamage:
+        types:
+          Blunt: 1
     - type: MeleeWeapon
       angle: 30
       animation: WeaponArcFist
diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
new file mode 100644
index 0000000000..4d729889c2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -0,0 +1,192 @@
+- type: startingGear
+  id: MothershipCoreGear
+  inhand:
+  - DoorRemoteXenoborg
+  - Omnitool
+
+- type: entity
+  parent:
+  - BaseMachinePowered
+  - BaseMob
+  id: MothershipCore
+  name: mothership core
+  description: A sentient machine that can produce Xenoborgs. Without this the Xenoborgs are doomed.
+  components:
+  - type: Appearance
+  - type: WiresVisuals
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 190
+        mask:
+        - MachineMask
+        layer:
+          - MachineLayer
+  - type: Sprite
+    sprite: Mobs/Silicon/mothership_core.rsi
+    layers:
+    - state: core-idle
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: core-load
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: core-o
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: null
+  - type: Lathe
+    idleState: core-idle
+    runningState: core-active
+    staticPacks:
+    - EmptyXenoborgs
+    - XenoborgUpgradeModules
+  - type: MaterialStorage
+    whitelist:
+      tags:
+      - Sheet
+      - RawMaterial
+      - Ingot
+  - type: PointLight
+    color: "#0033ff"
+    enabled: true
+    radius: 4
+    netsync: false
+  - type: Anchorable
+    flags:
+    - Anchorable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+      - !type:ExplodeBehavior
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MachineFrameDestroyed:
+            min: 1
+            max: 1
+      - !type:SpawnGasBehavior
+        gasMixture:
+          volume: 1000
+          moles:
+            - 0 # oxygen
+            - 0 # nitrogen
+            - 340.5701689 # carbon dioxide
+          temperature: 373.15
+  - type: Repairable
+    doAfterDelay: 30 # you can heal the mothership core, but it takes a while
+  - type: DamagedSiliconAccent
+    enableChargeCorruption: false
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 100
+    intensitySlope: 2
+    totalIntensity: 200
+  - type: WiresPanel
+  - type: ActivatableUI
+    key: enum.LatheUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: UserInterface
+    interfaces:
+      enum.SiliconLawsUiKey.Key:
+        type: SiliconLawBoundUserInterface
+        requireInputValidation: false
+      enum.RadarConsoleUiKey.Key:
+        type: RadarConsoleBoundUserInterface
+      enum.LatheUiKey.Key:
+        type: LatheBoundUserInterface
+      enum.ResearchClientUiKey.Key:
+        type: ResearchClientBoundUserInterface
+  - type: Transform
+    anchored: true
+  - type: Pullable
+  - type: StaticPrice
+    price: 800
+  - type: WarpPoint
+    location: Mothership Core
+    follow: true
+  - type: VoiceOverride
+    nameOverride: MOTHERSHIP CORE
+  - type: TypingIndicator
+    proto: xenoborg
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Xenoborg
+    allowedEmotes:
+    - Laugh
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconXenoborg
+    wilhelmProbability: 0
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Mothership
+    - Xenoborg
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Mothership
+    - Xenoborg
+    - Binary
+  - type: XenoborgMothership
+  - type: Tag
+    tags:
+    - SiliconEmotes
+    - CanPilot
+    - Structure
+  - type: Inventory
+    templateId: borg
+  - type: Loadout
+    prototypes: [MothershipCoreGear]
+  - type: NpcFactionMember
+    factions:
+    - Xenoborg
+  - type: Body
+    prototype: MothershipCoreBody
+  - type: Hands
+  # - type: Puller # use the conveyor
+  - type: Eye
+    drawFov: false
+  # - type: StationAiOverlay # removed until is no longer buggy
+  - type: IgnoreUIRange
+  - type: ComplexInteraction
+  - type: MindContainer
+  - type: SiliconLawBound
+  - type: Actions
+  - type: ActionGrant
+    actions:
+    - ActionViewLaws
+  - type: SiliconLawProvider
+    laws: MothershipCoreLawset # custom laws here
+    subverted: true
+  - type: Stripping
+  - type: Access
+    enabled: true
+    tags:
+    - Xenoborg
+  - type: LockingWhitelist
+    blacklist:
+      components:
+      - RoboticsConsole
+    whitelist:
+      components:
+      - BorgChassis
+  - type: IntrinsicUI
+    uis:
+      enum.RadarConsoleUiKey.Key:
+        toggleAction: ActionAGhostShowRadar
+  - type: ShowElectrocutionHUD
+  - type: PowerMonitoringCableNetworks
+  - type: RadarConsole
+
+# TODO: add xenoborg control interface action (part 5)
+# TODO: add xenoborg camera monitor interface action (part 5)
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index f432714399..4369196934 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -207,6 +207,7 @@
         acts: [ "Destruction" ]
   - type: ApcPowerReceiver
     powerLoad: 1000
+    needsPower: false
   - type: StationAiCore
   - type: StationAiVision
   - type: InteractionOutline
@@ -235,7 +236,6 @@
     listeningRange: 0
     speakerVolume: Speak
     unlistedNumber: true
-    requiresPower: false
   - type: Holopad
   - type: StationAiWhitelist
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 7dea0f2832..9356c749ef 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -23,7 +23,6 @@
         Bloodloss: 0.5
         Asphyxiation: 0.5
   - type: Sericulture
-    action: ActionSericulture
     productionLength: 2
     entityProduced: MaterialWebSilk1
     hungerCost: 4 # Should total to 25 total silk on full hunger
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index d399838162..f60b2f5844 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -86,6 +86,7 @@
     horizontalRotation: 90
   - type: HumanoidAppearance
     species: Human
+  - type: TypingIndicator
   - type: SlowOnDamage
     speedModifierThresholds:
       60: 0.7
@@ -124,24 +125,18 @@
       - !type:WashCreamPieReaction
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Stutter
-    - SeeingRainbows
     - Electrocution
     - Drunk
     - SlurredSpeech
     - RatvarianLanguage
     - PressureImmunity
     - Muted
-    - ForcedSleep
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
     - Flashed
     - RadiationProtection
-    - Drowsiness
     - Adrenaline
     - LoveEffect  # Sunrise-Edit
     - Jump # Sunrise-Edit
@@ -303,9 +298,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
@@ -329,6 +324,7 @@
         Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
+  - type: StunVisuals
   - type: PetOnInteract
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 1758fc6b64..6047678476 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -26,9 +26,6 @@
     damageRecovery:
       types:
         Asphyxiation: -1.0
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
   - type: Body
     prototype: Dwarf
     requiredLegs: 2
@@ -448,7 +445,7 @@
   id: MobDwarfDummy
   categories: [ HideSpawnMenu ]
   components:
-  - type: Sprite
+  - type: ScaleVisuals
     scale: 1, 0.8
   - type: Inventory
     ### Female
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 759ae41432..b282ffb556 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -56,8 +56,8 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 1.5 # Move around more easily in space.
-    weightlessFriction: 1
+    baseWeightlessAcceleration: 1.5 # Move around more easily in space.
+    baseWeightlessFriction: 1
     baseWeightlessModifier: 1
   - type: Flammable
     damage:
@@ -76,9 +76,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 2e6db88ff2..d21ae6f7df 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -72,9 +72,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 8ab912b7c6..7e1ab169c2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -96,11 +96,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" ]
@@ -146,6 +146,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/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 852f6b09b1..8a7bb4a239 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -44,6 +44,7 @@
   - type: MovementSpeedModifier
   - type: RequireProjectileTarget
     active: False
+  - type: StunVisuals
   # Sunrise-Start
   - type: TTS
   - type: DamageOverlay
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index c33e24ad3e..834a2c3a8e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -17,6 +17,8 @@
         maxVol: 50
   - type: PressurizedSolution
     solution: drink
+  - type: ExaminableSolution
+    examinableWhileClosed: false
   - type: Shakeable
   - type: Sprite
     state: icon
@@ -194,7 +196,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
-    
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkJuiceLemonCarton
@@ -209,7 +211,7 @@
           Quantity: 50
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
-    
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkJuicePineappleCarton
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index d7c8401bb8..f3f7fa70f3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2,9 +2,9 @@
 # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml
 # When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_glass.yml
 - type: entity
+  abstract: true
   parent: BaseItem
   id: DrinkBase
-  abstract: true
   components:
   - type: SolutionContainerManager
     solutions:
@@ -14,7 +14,10 @@
     solution: drink
   - type: SolutionTransfer
     canChangeTransferAmount: true
-  - type: Drink
+  - type: Edible
+    edible: Drink
+    solution: drink
+    destroyOnEmpty: false
   - type: Sprite
     state: icon
   - type: MeleeWeapon
@@ -31,6 +34,8 @@
     solution: drink
   - type: DrainableSolution
     solution: drink
+  - type: ExaminableSolution
+    solution: drink
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
@@ -75,8 +80,6 @@
   - type: PhysicalComposition
     materialComposition:
       Glass: 25
-  - type: ExaminableSolution
-    solution: drink
   - type: FitsInDispenser
     solution: drink
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 11da44f898..d432c6d9d5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -192,6 +192,8 @@
     layers:
       - state: icon
         map: ["enum.OpenableVisuals.Layer"]
+  - type: ExaminableSolution
+    examinableWhileClosed: false # If you can't see fill levels, it's probably opaque
 
 - type: entity
   id: DrinkBottleVisualsAll
@@ -215,6 +217,9 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: fill-
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
+  - type: ExaminableSolution
 
 # Large Glass Bottles
 
@@ -719,9 +724,6 @@
           Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/waterbottle.rsi
-  - type: SolutionContainerVisuals
-    inHandsMaxFillLevels: 2
-    inHandsFillBaseName: -fill-
   - type: Label
     currentLabel: reagent-name-water
   - type: Sealable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index d933cbcd1b..e6ba0d002e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -46,6 +46,9 @@
     solution: drink
   - type: PressurizedSolution
     solution: drink
+  - type: ExaminableSolution
+    solution: drink
+    examinableWhileClosed: false
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 352749dd05..72f3322ebd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -20,6 +20,8 @@
     solution: drink
   - type: DrainableSolution
     solution: drink
+  - type: ExaminableSolution
+    solution: drink
   - type: SolutionTransfer
     canChangeTransferAmount: true
     maxTransferAmount: 10
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index 2ebc20e365..8f3b9381f7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -3,15 +3,47 @@
   id: FlaskBase
   abstract: true
   components:
-  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+  - type: Sprite
+    state: icon
+    sprite: Objects/Consumable/Drinks/flask.rsi
   - type: PhysicalComposition
     materialComposition:
       Steel: 300
   - type: FitsInDispenser
     solution: drink
+  - type: ExaminableSolution
+    examinableWhileClosed: false
 
 - type: entity
-  parent: FlaskBase
+  id: DrinkFlaskVisualsOpenable
+  abstract: true
+  components:
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon"}
+  - type: Appearance
+  - type: Sprite
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+  - type: Openable
+    sound:
+      collection: flaskOpenSounds
+    closeable: true
+    closeSound:
+      collection: flaskCloseSounds
+
+# Flasks
+
+- type: entity
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkShinyFlask
   name: shiny flask
   description: A shiny metal flask. It appears to have a Greek symbol inscribed on it.
@@ -20,8 +52,9 @@
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkMREFlask
+  suffix: Full
   name: MRE flask
   description: An old military flask, filled with the finest contents for soldiers.
   components:
@@ -37,7 +70,7 @@
     solution: drink
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkDetFlask
   name: inspector's flask
   description: A metal flask with a leather band and golden badge belonging to the inspector.
@@ -46,7 +79,7 @@
     sprite: Objects/Consumable/Drinks/detflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkHosFlask
   name: hos's flask
   description: A metal flask, fit for a hard working HoS.
@@ -55,7 +88,7 @@
     sprite: Objects/Consumable/Drinks/hosflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkFlask
   name: captain's flask
   description: A metal flask belonging to the captain.
@@ -64,7 +97,7 @@
     sprite: Objects/Consumable/Drinks/flask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkFlaskBar
   name: bar flask
   description: A metal flask often given out by the bartender on loan. Don't forget to return it!
@@ -75,14 +108,14 @@
 - type: entity
   parent: FlaskBase
   id: DrinkFlaskOld
-  name: flask
-  description: ''
+  name: old flask
+  description: A decrepit old flask, its lid seems to be missing.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask_old.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkLithiumFlask
   name: lithium flask
   description: A flask with a Lithium Atom symbol on it.
@@ -91,35 +124,10 @@
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
 
 - type: entity
-  parent: FlaskBase
+  parent: [FlaskBase, DrinkFlaskVisualsOpenable]
   id: DrinkVacuumFlask
   name: vacuum flask
   description: Keeping your drinks at the perfect temperature since 1892.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vacuumflask.rsi
-
-- type: entity
-  parent: FlaskBase
-  id: Pitcher
-  name: metal pitcher
-  description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 60
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/pitcher.rsi
-    layers:
-      - state: icon
-        map: ["enum.SolutionContainerLayers.Base"]
-      - state: fill-6
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 6
-    fillBaseName: fill-
-    inHandsMaxFillLevels: 2
-    inHandsFillBaseName: -fill-
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index ed2324811e..0cd960bed1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -81,6 +81,26 @@
   - type: TrashOnSolutionEmpty
     solution: drink
 
+- type: entity
+  parent: BluespaceBeaker
+  id: BottomlessLube
+  name: bottomless lube beaker
+  suffix: DEBUG
+  description: This anomalous beaker infinitely produces space lube and as such is to be closely guarded such that it doesn't fall in the wrong hands.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 1000
+        reagents:
+        - ReagentId: SpaceLube
+          Quantity: 1000
+  - type: SolutionRegeneration
+    solution: beaker
+    generated:
+      reagents:
+      - ReagentId: SpaceLube
+        Quantity: 200
 
 # Mopwata
 - type: weightedRandomFillSolution
@@ -168,3 +188,5 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: fill-
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index d5f5320a42..e365b0832a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -41,6 +41,10 @@
     mixOnInteract: false
     reactionTypes:
     - Shake
+  - type: ExaminableSolution
+    solution: drink
+    heldOnly: true
+    examinableWhileClosed: false
 
 - type: entity
   parent: DrinkGlassBase
@@ -178,3 +182,33 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 75
+
+- type: entity
+  parent: DrinkBase
+  id: Pitcher
+  name: metal pitcher
+  description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 60
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/pitcher.rsi
+    layers:
+    - state: icon
+      map: ["enum.SolutionContainerLayers.Base"]
+    - state: fill-6
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: fill-
+    inHandsMaxFillLevels: 2
+    inHandsFillBaseName: -fill-
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300
+  - type: FitsInDispenser
+    solution: drink
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index eb6b71212a..a1b69a0966 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -1190,3 +1190,143 @@
       Burger: SuppermatterBurger
   - type: Item
     heldPrefix: suppermatter-shard
+
+- type: entity
+  name: cotton cake
+  parent: FoodCakeBase
+  id: FoodCakeCotton
+  description: A cake with a fiber frosting and a wad of cotton on top.
+  components:
+  - type: Sprite
+    state: cotton
+  - type: SliceableFood
+    slice: FoodCakeCottonSlice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 30
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 10
+  - type: Item
+    heldPrefix: cotton
+
+- type: entity
+  name: slice of cotton cake
+  parent: FoodCakeSliceBase
+  id: FoodCakeCottonSlice
+  description: A slice of cotton cake. You can just lick the frosting, it's fine.
+  components:
+  - type: Sprite
+    state: cotton-slice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+    - Slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Fiber
+          Quantity: 2
+  - type: Item
+    heldPrefix: cotton-slice
+
+# Motivating
+
+- type: entity
+  name: berry delight
+  parent: FoodCakeBase
+  id: FoodCakeBerryDelight
+  description: This is a cake that is approaching.
+  components:
+  - type: Sprite
+    state: berry_delight
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - berry
+      - motivating
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 40
+        - ReagentId: Vitamin
+          Quantity: 10
+        - ReagentId: Milk
+          Quantity: 10
+  - type: SliceableFood
+    slice: FoodCakeBerryDelightSlice
+  - type: Tag
+    tags:
+    - Cake
+    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: red
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: red
+
+- type: entity
+  name: berry delight slice
+  parent: FoodCakeSliceBase
+  id: FoodCakeBerryDelightSlice
+  description: Put a fork in, your hunger in isolation.
+  components:
+  - type: Sprite
+    state: berry_delight_slice
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - berry
+      - motivating
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: Milk
+          Quantity: 2
+  - type: Tag
+    tags:
+    - Cake
+    - Fruit
+    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: white
+      - state: alpha-slice-filling-inhand-left
+        color: red
+      right:
+      - state: alpha-slice-inhand-right
+        color: white
+      - state: alpha-slice-filling-inhand-right
+        color: red
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index 78543f15e9..819256443f 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 52ac7b2fe9..c13f52194f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -445,9 +445,9 @@
 # Tastes like jelly-donut, fizzy tutti frutti.
 
 - type: entity
-  name: slugcat jelly-donut
+  name: scurret jelly-donut
   parent: FoodDonutBase
-  id: FoodDonutJellySlugcat
+  id: FoodDonutJellyScurret
   description: No holes in this donut in case a suspicious looking pole shows up.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index 2748462abc..c031559b58 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -164,7 +164,7 @@
       payloadSlot:
         whitelist:
           components:
-          - OnUseTimerTrigger
+          - TimerTrigger
         insertSound:
           path: /Audio/Weapons/Guns/Empty/empty.ogg
         ejectSound:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 00df6b5b68..a0cc580118 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -277,7 +277,7 @@
       prob: 0.05
       orGroup: Pizza
     - id: KnifePlastic
-  
+
 - type: entity
   name: pizza box
   parent: FoodBoxPizzaFilled
@@ -372,6 +372,9 @@
     contents:
     - id: FoodDonkpocket
       amount: 6
+    - id: DonkcoLighter
+      amount: 1
+      prob: 0.10
 
 - type: entity
   parent: FoodBoxDonkpocket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index c7de98b4a4..7c7df07f78 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -9,6 +9,8 @@
     solution: food
   - type: DrainableSolution
     solution: food
+  - type: ExaminableSolution
+    solution: food
   - type: Sprite
     sprite: Objects/Consumable/Food/condiments.rsi
   - type: Icon
@@ -69,6 +71,8 @@
   - type: Tag
     tags:
       - Packet
+  - type: ExaminableSolution
+    exactVolume: true
 
 - type: entity
   parent: BaseFoodCondimentPacket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index b226620953..6d17f4fbbb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -31,10 +31,10 @@
   id: FoodBreadBunBottom
   parent: FoodBreadSliceBase
   name: bottom bun
-  description: It's time to start building the burger tower. 
+  description: It's time to start building the burger tower.
   components:
   - type: Item
-    size: Normal #patch until there is an adequate resizing system in place 
+    size: Normal #patch until there is an adequate resizing system in place
   - type: Food
   - type: Sprite
     drawdepth: Mobs
@@ -83,7 +83,7 @@
   - type: FoodSequenceElement
     entries:
       Burger: BunTopBurger
-  
+
 # Base
 
 - type: entity
@@ -95,8 +95,6 @@
     flavors:
       - bun
       - meaty
-  - type: Food
-    transferAmount: 5
   - type: Sprite
     sprite: Objects/Consumable/Food/burger.rsi
   - type: SolutionContainerManager
@@ -499,7 +497,7 @@
         - ReagentId: Vitamin
           Quantity: 8
         - ReagentId: Sulfur # What you get for eating something with a flare in it
-          Quantity: 5 
+          Quantity: 5
   - type: Tag
     tags:
     - Meat
@@ -691,7 +689,7 @@
   description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it.
   components:
   - type: Food
-    trash: 
+    trash:
     - FoodKebabSkewer
   - type: FlavorProfile
     flavors:
@@ -702,7 +700,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 30 
+        maxVol: 30
         reagents:
         - ReagentId: Nutriment
           Quantity: 11
@@ -987,4 +985,4 @@
   - type: Tag
     tags:
     - Meat
-    
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
index ddacf71a03..6ba1895548 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -2,14 +2,14 @@
 # Base component for edible food-like items
 #
 - type: entity
+  abstract: true
   parent: BaseItem
   id: EdibleBase
-  abstract: true
   components:
   - type: FlavorProfile
     flavors:
       - food
-  - type: Food
+  - type: Edible
   - type: Sprite
   - type: StaticPrice
     price: 0
@@ -19,9 +19,9 @@
 # that should be cleaned up in space
 #
 - type: entity
+  abstract: true
   parent: EdibleBase
   id: FoodBase
-  abstract: true
   components:
   - type: SpaceGarbage
 
@@ -30,9 +30,9 @@
 # But it might in future also mean drawing with a syringe, so this is a base prototype just in case.
 
 - type: entity
+  abstract: true
   parent: FoodBase
   id: FoodInjectableBase
-  abstract: true
   components:
   - type: InjectableSolution
     solution: food
@@ -42,8 +42,8 @@
 # usable by any food that can be opened
 # handles appearance with states "icon" and "icon-open"
 - type: entity
-  id: FoodOpenableBase
   abstract: true
+  id: FoodOpenableBase
   components:
   - type: Appearance
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 4fc61f9830..a50e0fa004 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -10,13 +10,16 @@
   - type: Sprite
     state: produce
   # let cows eat raw produce like wheat and oats
-  - type: Food
-    requiredStomachs: 2
+  - type: Edible
+    requiresSpecialDigestion: true
   - type: Produce
   - type: PotencyVisuals
   - type: Appearance
   - type: Extractable
     grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Ruminant
 
 # For produce that can be immediately eaten
 
@@ -57,6 +60,7 @@
   - type: Tag
     tags:
     - Wheat
+    - Ruminant
 
 - type: entity
   name: meatwheat bushel
@@ -90,6 +94,8 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/oat.rsi
+  - type: Item
+    heldPrefix: produce
   - type: SolutionContainerManager
     solutions:
       food:
@@ -174,6 +180,7 @@
   - type: Tag
     tags:
     - Vegetable
+    - Ruminant
 
 - type: entity
   name: tower-cap log
@@ -321,7 +328,7 @@
   - type: FlavorProfile
     flavors:
       - banana
-  - type: Food
+  - type: Edible
     trash:
     - TrashBananaPeel
   - type: SolutionContainerManager
@@ -363,7 +370,7 @@
     flavors:
       - banana
       - nothing
-  - type: Food
+  - type: Edible
     trash:
     - TrashMimanaPeel
   - type: SolutionContainerManager
@@ -435,6 +442,9 @@
     - Recyclable
     - Trash
     - BananaPeel
+    - Ruminant
+    - WhitelistChameleon
+    - HamsterWearable
   - type: SolutionContainerManager
     solutions:
       food:
@@ -445,14 +455,23 @@
   - type: Extractable
     grindableSolutionName: food
   - type: SpaceGarbage
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
+  - type: Clothing
+    sprite: Objects/Specific/Hydroponics/banana.rsi
+    equippedState: peel-equipped-HELMET
+    slots:
+    - HEAD
+    quickEquip: false
 
 - type: entity
   name: baked banana peel
   parent: TrashBananaPeel
   id: TrashBakedBananaPeel
   components:
+  - type: Clothing
+    sprite: Objects/Specific/Hydroponics/banana.rsi
+    equippedState: baked-peel-equipped-HELMET
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
     state: baked-peel
@@ -481,6 +500,9 @@
   - type: Item
     sprite: Objects/Specific/Hydroponics/mimana.rsi
     heldPrefix: peel
+  - type: Clothing
+    sprite: Objects/Specific/Hydroponics/mimana.rsi
+    equippedState: equipped-HELMET
   - type: Slippery
     slipSound:
       path: /Audio/Effects/slip.ogg
@@ -499,6 +521,9 @@
     sprite: Objects/Materials/materials.rsi
     heldPrefix: peel
   - type: Slippery
+  - type: Clothing
+    sprite: Objects/Materials/materials.rsi
+    equippedState: peel-equipped-HELMET
 
 - type: entity
   name: carrot
@@ -1070,6 +1095,8 @@
           Quantity: 4
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/apple.rsi
+  - type: Item
+    heldPrefix: produce
   - type: Produce
     seedId: apple
   - type: Extractable
@@ -1169,7 +1196,7 @@
   - type: FlavorProfile
     flavors:
       - corn
-  - type: Food
+  - type: Edible
     trash:
     - FoodCornTrash
   - type: SolutionContainerManager
@@ -1874,7 +1901,7 @@
     sprite: Objects/Specific/Hydroponics/gatfruit.rsi
   - type: Produce
     seedId: gatfruit
-  - type: Food
+  - type: Edible
     trash:
     - WeaponRevolverPython
   - type: Tag
@@ -1909,7 +1936,7 @@
     heldPrefix: produce
   - type: Produce
     seedId: realCapfruit
-  - type: Food
+  - type: Edible
     trash:
     - RevolverCapGun
   - type: Tag
@@ -1928,7 +1955,7 @@
   components:
   - type: Produce
     seedId: fakeCapfruit
-  - type: Food
+  - type: Edible
     trash:
     - RevolverCapGunFake
 
@@ -2332,7 +2359,7 @@
   - type: FlavorProfile
     flavors:
       - bungo
-  - type: Food
+  - type: Edible
     trash:
     - FoodBungoPit
   - type: SolutionContainerManager
@@ -2567,7 +2594,7 @@
   - type: FlavorProfile
     flavors:
       - cotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -2599,7 +2626,7 @@
   - type: FlavorProfile
     flavors:
       - pyrotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -2633,7 +2660,7 @@
   - type: FlavorProfile
     flavors:
       - cherry
-  - type: Food
+  - type: Edible
     trash:
     - TrashCherryPit
   - type: SolutionContainerManager
@@ -2673,6 +2700,7 @@
   - type: Item
     sprite: Objects/Specific/Hydroponics/cherry.rsi
     heldPrefix: pit
+    size: Tiny
   - type: Tag
     tags:
     - Recyclable
@@ -2707,7 +2735,7 @@
     heldPrefix: produce
   - type: Produce
     seedId: anomalyBerry
-  - type: Food
+  - type: Edible
     trash:
     - EffectAnomalyFloraBulb # Random loot
   - type: SolutionContainerManager
@@ -2728,3 +2756,78 @@
     entries:
       Taco: AnomalyBerry
       Burger: AnomalyBerryBurger
+
+- type: entity
+  name: bloonion bulb
+  description: A strange floating bulb.. Nothing worth crying over.
+  parent: BaseStructureDynamic
+  id: FoodBloonion
+  components:
+  - type: Appearance
+  - type: Sprite
+    drawdepth: Items
+    noRot: true
+    sprite: Objects/Specific/Hydroponics/bloonion.rsi
+    state: produce
+  - type: Item
+    size: Small
+    sprite: Objects/Specific/Hydroponics/bloonion.rsi
+    heldPrefix: produce
+  - type: Produce
+    seedId: bloonion
+  - type: Tag
+    tags:
+    - Vegetable
+  - type: PotencyVisuals
+  - type: FlavorProfile
+    flavors:
+    - onion
+    - strange
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        canReact: false
+        reagents:
+        - ReagentId: Potassium
+          Quantity: 1
+        - ReagentId: Phosphorus
+          Quantity: 1
+        - ReagentId: Sugar
+          Quantity: 1
+        - ReagentId: Allicin
+          Quantity: 4
+  - type: Extractable
+    grindableSolutionName: food
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 0.001
+    intensitySlope: 1
+    totalIntensity: 0.1
+  - type: Damageable
+    damageContainer: Biological
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:SpillBehavior
+        solution: food
+      - !type:TriggerBehavior
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: InteractionOutline
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.20
+          position: 0, 0.35
+        density: 80
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
index 84813154a8..39baa36b8b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
@@ -74,8 +74,8 @@
   components:
   - type: Vape
     damage:
-      groups:
-        Burn: 2
+      types:
+        Heat: 2
   - type: SolutionContainerManager
     solutions:
       smokable:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
index 24843f608a..87bef747d8 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
@@ -10,6 +10,11 @@
   - type: IgnitionSource
     temperature: 800
   - type: IgniteOnTrigger
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: WelderOn
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition
   - type: TriggerOnSignal
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index 0cc82da7e2..49b43caa44 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -10,6 +10,10 @@
     sprite: Objects/Devices/signaller.rsi
     state: signaller
   - type: Signaller
+  - type: SignalOnTrigger
+    port: Pressed
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition
   - type: UseDelay
   - type: StaticPrice
     price: 40
@@ -19,6 +23,7 @@
   - type: Tag
     tags:
     - Payload
+    - RemoteSignaller
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
index b551d74771..b416a2f1bf 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -22,7 +22,13 @@
     price: 40
   - type: PayloadTrigger
     components:
-    - type: OnUseTimerTrigger
+    - type: TriggerOnUse
+      keyOut: startTimer
+    - type: TimerTrigger
+      keysIn:
+      - startTimer
+      # use the default trigger key so it can activate any inserted payload
+      keyOut: trigger
       delay: 5
       delayOptions: [3, 5, 10, 15, 30]
       initialBeepDelay: 0
@@ -47,14 +53,19 @@
     - SignalTrigger
   - type: PayloadTrigger
     components:
-    - type: TimerStartOnSignal
     - type: DeviceNetwork
       deviceNetId: Wireless
       receiveFrequencyId: BasicDevice
     - type: WirelessNetworkConnection
       range: 200
     - type: DeviceLinkSink
-    - type: OnUseTimerTrigger
+    - type: TriggerOnSignal
+      keyOut: startTimer
+    - type: TimerTrigger
+      keysIn:
+      - startTimer
+      # use the default trigger key so it can activate any inserted payload
+      keyOut: trigger
       delay: 3
       initialBeepDelay: 0
       beepSound:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
index 78009f1042..13b12c5111 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, BaseSyndicateContraband ]
   id: NukeOpsDeclarationOfWar
   name: war declarator
   description: Use to send a declaration of hostilities to the target, delaying your shuttle departure while they prepare for your assault. Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. Must be used at start of mission, or your benefactors will lose interest.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml b/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
index d5f8352baa..526d297f60 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
@@ -9,6 +9,7 @@
     state: icon
   - type: TriggerOnUse
   - type: PolymorphOnTrigger
+    targetUser: true
     polymorph: VoidPocket
   - type: UseDelay
     delay: 220 # long delay to ensure it can't be spammed, use it wisely
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index 45689958cf..8f7f6957b2 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -29,6 +29,24 @@
   - type: Access
     groups:
     - Command
+  - type: DoorRemote
+
+- type: entity
+  parent: [DoorRemoteDefault, BaseCommandContraband]
+  id: DoorRemoteCustom
+  name: custom door remote
+  description: A gadget which can open and bolt doors remotely. This advanced variant does not have built-in access, instead inheriting the ID access of the user.
+  components:
+  - type: Sprite
+    layers:
+    - state: door_remotebase
+    - state: door_remotelightscolour
+      color: "#0077FF"
+    - state: door_remotescreencolour
+      color: "#0033EE"
+  - type: Access
+  - type: DoorRemote
+    includeUserAccess: true
 
 - type: entity
   parent: [DoorRemoteDefault, BaseCommandContraband]
@@ -155,6 +173,8 @@
       color: "#2eba22"
     - state: door_remotescreencolour
       color: "#22871a"
+  - type: DoorRemote
+    includeUserAccess: true
   - type: Access
     groups:
     - AllAccess
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 47a48a98c6..a7872fb18d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -52,6 +52,27 @@
         disableEject: true
         swap: false
 
+- type: entity
+  parent: Holoprojector
+  id: HoloprojectorClownBorg
+  name: holopeel projector
+  description: A holopeel projector that creates a slippery, hard light banana peel. It recharges, so that the fun never ends!
+  suffix: borg
+  components:
+  - type: HolosignProjector
+    signProto: HoloPeel
+    chargeUse: 240
+  - type: Sprite
+    sprite: Objects/Devices/Holoprojectors/peel.rsi
+    state: icon
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMicroreactor
+        disableEject: true
+        swap: false
+
 - type: entity
   parent: Holoprojector
   id: HolofanProjector
@@ -68,7 +89,7 @@
     tags:
       - HolofanProjector
   - type: StaticPrice
-    price: 80
+    price: 50
   - type: GuideHelp
     guides:
     - AtmosTools
@@ -89,7 +110,7 @@
   parent: HolofanProjector
   id: HolofanProjectorBorg
   name: integrated holofan
-  description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it  recharges over time.
+  description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it recharges over time.
   components:
   - type: ItemSlots
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index 04349c3a1c..f7be194370 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -8,32 +8,37 @@
       sprite: Objects/Devices/mousetrap.rsi
       drawdepth: SmallMobs # if mice can hide under tables, so can mousetraps
       layers:
-        - state: mousetrap
-          map: ["base"]
+      - state: mousetrap
+        map: ["enum.ToggleableVisuals.Layer"]
     - type: StepTrigger
       intersectRatio: 0.2
       requiredTriggeredSpeed: 2
     - type: Mousetrap
+    - type: ItemToggle
+      soundActivate: "/Audio/Items/Handcuffs/cuff_end.ogg"
+      soundDeactivate: "/Audio/Items/snap.ogg"
+      popupActivate: mousetrap-on-activate
+      popupDeactivate: mousetrap-on-deactivate
+    - type: UseDelay
+    - type: ItemToggleOnTrigger
+      canActivate: false
+      showPopup: false # only show the popup when arming/disarming the trap in your hand
     - type: TriggerOnStepTrigger
     - type: PreventableStepTrigger
-    - type: DamageUserOnTrigger
+    - type: DamageOnTrigger
+      targetUser: true
       damage:
         types:
           Blunt: 2 # base damage, scales based on mass
-    - type: EmitSoundOnUse
-      sound: "/Audio/Items/Handcuffs/cuff_end.ogg"
-      handle: false
-    - type: EmitSoundOnTrigger
-      sound: "/Audio/Items/snap.ogg"
     - type: Item
       sprite: Objects/Devices/mousetrap.rsi
     - type: Appearance
     - type: GenericVisualizer
       visuals:
-        enum.MousetrapVisuals.Visual:
-          base:
-            Armed: { state: mousetraparmed }
-            Unarmed: { state: mousetrap }
+        enum.ToggleableVisuals.Enabled:
+          enum.ToggleableVisuals.Layer:
+            True: {state: mousetraparmed}
+            False: {state: mousetrap}
     - type: Physics
       bodyType: Dynamic
     - type: CollisionWake
@@ -66,6 +71,6 @@
   - type: Sprite
     layers:
     - state: mousetraparmed
-      map: ["base"]
-  - type: Mousetrap
-    isActive: true
+      map: ["enum.ToggleableVisuals.Layer"]
+  - type: ItemToggle
+    activated: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
index 69be5605e9..e5dc07c7c1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -36,12 +36,6 @@
   - type: ExplodeOnTrigger
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 25
-      behaviors:
-      - !type:ExplodeBehavior
     - trigger:
         !type:DamageTrigger
         damage: 50
@@ -100,3 +94,4 @@
     - type: EmitSoundOnTrigger
       sound:
         path: "/Audio/Effects/flash_bang.ogg"
+      positional: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index f894605686..4fdfb2ebf9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -220,7 +220,7 @@
     state: pda-internmed
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: BaseSecurityPDA
@@ -480,6 +480,13 @@
     accentVColor: "#a23e3e"
   - type: Icon
     state: pda-qm
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NanoTaskCartridge
+    - NewsReaderCartridge
+    - AstroNavCartridge
 
 - type: entity
   parent: BasePDA
@@ -776,7 +783,7 @@
     state: pda-medical
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: MedicalPDA
@@ -952,6 +959,7 @@
     id: CentcomIDCard
     penSlot:
       startingItem: PenCentcom
+      priority: -1
       whitelist:
         tags:
         - Write
@@ -1572,3 +1580,14 @@
     borderColor: "#7F3300"
   - type: Icon
     state: pda-wizard
+
+- type: entity
+  parent: ClearPDA
+  id: ScurretPDA
+  description: A temporary PDA granted to scurret temps. Doesn't do much. Wawa!
+  components:
+  - type: Pda
+    id: VisitorIDCard
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index 58f0a31a05..c85358663e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -169,7 +169,7 @@
   id: PinpointerMothership
   name: core pinpointer
   suffix: Mothership
-  description: A handheld tracking device that leads to the direction of the mothership core.
+  description: A handheld tracking device that leads to the direction of the Mothership core.
   components:
   - type: Sprite
     layers:
@@ -197,4 +197,4 @@
     state: pinpointer-station
   - type: Pinpointer
     component: XenoborgMothership
-    targetName: the mothership
+    targetName: the Mothership
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 569fd47d00..870e66654f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -456,6 +456,70 @@
   - type: NavMapBeacon
     defaultText: station-beacon-solars
 
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsN
+  suffix: Solars, North
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-N
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsNE
+  suffix: Solars, Northeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-NE
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsE
+  suffix: Solars, East
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-E
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsSE
+  suffix: Solars, Southeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-SE
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsS
+  suffix: Solars, South
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-S
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsSW
+  suffix: Solars, Southwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-SW
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsW
+  suffix: Solars, West
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-W
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsNW
+  suffix: Solars, Northwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-NW
+
 - type: entity
   parent: DefaultStationBeaconEngineering
   id: DefaultStationBeaconGravGen
@@ -706,6 +770,70 @@
   - type: NavMapBeacon
     defaultText: station-beacon-escape-pod
 
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodN
+  suffix: Escape Pod, North
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-N
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodNE
+  suffix: Escape Pod, Northeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-NE
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodE
+  suffix: Escape Pod, East
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-E
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodSE
+  suffix: Escape Pod, Southeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-SE
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodS
+  suffix: Escape Pod, South
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-S
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodSW
+  suffix: Escape Pod, Southwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-SW
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodW
+  suffix: Escape Pod, West
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-W
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodNW
+  suffix: Escape Pod, Northwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-NW
+
 - type: entity
   parent: DefaultStationBeacon
   id: DefaultStationBeaconVox
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index 2f894cdaf2..3247728b5f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -106,6 +106,8 @@
     program: 79
   - type: Sprite
     sprite: Objects/Fun/Instruments/ocarina.rsi
+  - type: Item
+    size: Small
 
 - type: entity
   parent: BaseWoodwindInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index c4be0aa453..f124be8a42 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -229,3 +229,4 @@
       - MobMover
   - type: SpawnOnTrigger
     proto: EffectGravityPulse
+    predicted: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 32df1f402d..132f92212e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -127,7 +127,8 @@
       path: /Audio/Effects/glass_step.ogg
     slipData:
       launchForwardsMultiplier: 0
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
+    targetUser: true
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Objects/Fun/error.yml b/Resources/Prototypes/Entities/Objects/Fun/error.yml
index 6f157d4fed..eb1e4d524a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/error.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/error.yml
@@ -17,7 +17,7 @@
           Quantity: 5
   - type: Slippery
     slipData:
-      paralyzeTime: 3
+      knockdownTime: 3
       launchForwardsMultiplier: 3
   - type: StepTrigger
     intersectRatio: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
index dbbe86678f..6c466ea7c0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -133,3 +133,62 @@
       - id: ToyFigurineHamlet
         prob: 0.20
         orGroup: SpacemenFig
+
+- type: entity
+  parent: BaseItem
+  id: MysteryLighterBox
+  name: Novelty lighter mystery box
+  suffix: Filled
+  description: A box of discontinued promotional lighters, many of which have since been declared "contraband".
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/figurines.rsi
+    layers:
+    - state: fig_box
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: NanotrasenFlippo
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+        weight: 0.35
+      - id: HonkCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+
+- type: entity
+  parent: MysteryLighterBox
+  id: UplinkLighterBox
+  suffix: Uplink
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index c99df854d2..7575457f4d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -19,6 +19,8 @@
     - Figurine
   - type: UseDelay
     delay: 5
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition # prevent spam
   - type: TriggerOnActivate
   - type: TriggerOnSignal
   - type: Speech
diff --git a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
index 7cc6aaaeaf..f04fa19a04 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
@@ -17,7 +17,7 @@
   - type: Tag
     tags:
     - Figurine
-    
+
 #Ripley APLU
 - type: entity
   parent: BaseFigurineMech
@@ -27,6 +27,24 @@
   components:
   - type: Sprite
     state: ripley
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#d5c644"
+      - state: inhand-left-trim
+        color: "#524c14"
+      - state: inhand-left-visor
+        color: "#7aef83"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#d5c644"
+      - state: inhand-right-trim
+        color: "#524c14"
+      - state: inhand-right-visor
+        color: "#7aef83"
 
 #Fire Ripley
 - type: entity
@@ -37,6 +55,24 @@
   components:
   - type: Sprite
     state: fireripley
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#819a73"
+      - state: inhand-left-trim
+        color: "#486b2f"
+      - state: inhand-left-visor
+        color: "#5a150e"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#819a73"
+      - state: inhand-right-trim
+        color: "#486b2f"
+      - state: inhand-right-visor
+        color: "#5a150e"
 
 #Death Ripley
 - type: entity
@@ -47,6 +83,24 @@
   components:
   - type: Sprite
     state: deathripley
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#575757"
+      - state: inhand-left-trim
+        color: "#b3001b"
+      - state: inhand-left-visor
+        color: "#e1131e"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#575757"
+      - state: inhand-right-trim
+        color: "#b3001b"
+      - state: inhand-right-visor
+        color: "#e1131e"
 
 #Ggygax
 - type: entity
@@ -57,6 +111,24 @@
   components:
   - type: Sprite
     state: gygax
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#e76241"
+      - state: inhand-left-trim
+        color: "#4f5359"
+      - state: inhand-left-visor
+        color: "#00ff33"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#e76241"
+      - state: inhand-right-trim
+        color: "#4f5359"
+      - state: inhand-right-visor
+        color: "#00ff33"
 
 #Durand
 - type: entity
@@ -67,6 +139,24 @@
   components:
   - type: Sprite
     state: durand
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#a8abb3"
+      - state: inhand-left-trim
+        color: "#686d78"
+      - state: inhand-left-visor
+        color: "#8cc865"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#a8abb3"
+      - state: inhand-right-trim
+        color: "#686d78"
+      - state: inhand-right-visor
+        color: "#8cc865"
 
 #H.O.N.K
 - type: entity
@@ -77,6 +167,24 @@
   components:
   - type: Sprite
     state: honk
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#ed1c24"
+      - state: inhand-left-trim
+        color: "#ffffff"
+      - state: inhand-left-visor
+        color: "#ff040b"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#ed1c24"
+      - state: inhand-right-trim
+        color: "#ffffff"
+      - state: inhand-right-visor
+        color: "#ff040b"
 
 #Marauder
 - type: entity
@@ -87,6 +195,24 @@
   components:
   - type: Sprite
     state: marauder
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#9da6be"
+      - state: inhand-left-trim
+        color: "#557a48"
+      - state: inhand-left-visor
+        color: "#00ff33"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#9da6be"
+      - state: inhand-right-trim
+        color: "#557a48"
+      - state: inhand-right-visor
+        color: "#00ff33"
 
 #Seraph
 - type: entity
@@ -97,6 +223,24 @@
   components:
   - type: Sprite
     state: seraph
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#878c97"
+      - state: inhand-left-trim
+        color: "#943226"
+      - state: inhand-left-visor
+        color: "#f31a33"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#878c97"
+      - state: inhand-right-trim
+        color: "#943226"
+      - state: inhand-right-visor
+        color: "#f31a33"
 
 #Mauler
 - type: entity
@@ -107,6 +251,24 @@
   components:
   - type: Sprite
     state: mauler
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#2b2b2b"
+      - state: inhand-left-trim
+        color: "#660000"
+      - state: inhand-left-visor
+        color: "#ff0000"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#2b2b2b"
+      - state: inhand-right-trim
+        color: "#660000"
+      - state: inhand-right-visor
+        color: "#ff0000"
 
 #Odysseus
 - type: entity
@@ -117,6 +279,24 @@
   components:
   - type: Sprite
     state: odysseus
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#ffffff"
+      - state: inhand-left-trim
+        color: "#7d7f97"
+      - state: inhand-left-visor
+        color: "#857149"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#ffffff"
+      - state: inhand-right-trim
+        color: "#7d7f97"
+      - state: inhand-right-visor
+        color: "#857149"
 
 #Phazon
 - type: entity
@@ -127,6 +307,24 @@
   components:
   - type: Sprite
     state: phazon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#4d79a0"
+      - state: inhand-left-trim
+        color: "#f38233"
+      - state: inhand-left-visor
+        color: "#f38233"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#4d79a0"
+      - state: inhand-right-trim
+        color: "#f38233"
+      - state: inhand-right-visor
+        color: "#f38233"
 
 #Reticence
 - type: entity
@@ -137,3 +335,21 @@
   components:
   - type: Sprite
     state: reticence
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+      - state: inhand-left-body
+        color: "#d9d9d9"
+      - state: inhand-left-trim
+        color: "#8b8b8b"
+      - state: inhand-left-visor
+        color: "#1f1f1f"
+      right:
+      - state: inhand-right-base
+      - state: inhand-right-body
+        color: "#d9d9d9"
+      - state: inhand-right-trim
+        color: "#8b8b8b"
+      - state: inhand-right-visor
+        color: "#1f1f1f"
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index f8a51b00b2..bdc1c905e3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -111,6 +111,12 @@
       components:
         - SecretStash
         - WrappedParcel
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
+  - type: Tag
+    tags:
+    - SiliconEmotes
 
 - type: entity
   parent: [ PersonalAI, BaseSyndicateContraband]
@@ -147,6 +153,9 @@
           On: { state: syndicate-pai-on-overlay }
   - type: StaticPrice
     price: 500
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconSyndicate
   # Sunrise-Edit
   - type: StationAiVision
     enabled: false
@@ -160,6 +169,23 @@
     - Thief
   # Sunrise-End
 
+- type: entity
+  parent: PersonalAI
+  id: GoldenPersonalAI
+  name: golden personal ai device
+  description: Your electronic pal who's fun to be with! Special golden edition!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/pai.rsi
+    layers:
+    - state: golden-pai-base
+    - state: pai-off-overlay
+      shader: unshaded
+      map: ["screen"]
+  - type: Appearance
+  - type: StaticPrice
+    price: 5000
+
 - type: entity
   parent: PersonalAI
   id: PotatoAI
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index f29841ea08..c0718d022b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -6,26 +6,24 @@
   id: BasePlushie
   components:
   - type: EmitSoundOnUse
-    sound:
+    sound: &BasePlushieSound
       collection: ToySqueak
+      params:
+        volume: -4
   - type: EmitSoundOnActivate
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnCollide
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnLand
-    sound:
-      collection: ToyFall
+    sound: *BasePlushieSound
   - type: EmitSoundOnTrigger
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: UseDelay
-    delay: 1.0
+    delay: 3.0
   - type: MeleeWeapon
+    attackRate: 0.333
     wideAnimationRotation: 180
-    soundHit:
-      collection: ToySqueak
+    soundHit: *BasePlushieSound
     damage:
       types:
         Blunt: 0
@@ -37,8 +35,7 @@
     price: 5
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      collection: ToySqueak
+    useSound: *BasePlushieSound
     delay: 2
   - type: SolutionContainerManager
     solutions:
@@ -127,6 +124,7 @@
     noRot: true
   - type: Item
     size: Normal
+  - type: MultiHandedItem
   - type: Construction
     graph: PlushieGhostRevenant
     node: plushie
@@ -202,6 +200,15 @@
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/hampter.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.04"
   - type: FoodSequenceElement
     entries:
       CottonBurger: HamptrPlushie
@@ -240,6 +247,15 @@
   - type: Sprite
     sprite: Objects/Fun/Plushies/nukie.rsi
     state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/nukie.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.03"
   - type: FoodSequenceElement
     entries:
       CottonBurger: NukiePlushie
@@ -254,6 +270,15 @@
     sprite: Objects/Fun/Plushies/rouny.rsi
     state: icon
   - type: Rotatable
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/rouny.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.03"
   - type: FoodSequenceElement
     entries:
       CottonBurger: RounyPlushie
@@ -307,6 +332,11 @@
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/arachnid.rsi
+    slots:
+    - HEAD
   - type: FoodSequenceElement
     entries:
       CottonBurger: ArachnidPlushie
@@ -323,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:
@@ -394,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:
@@ -482,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:
@@ -528,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:
@@ -586,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:
@@ -650,6 +661,15 @@
         - LowImpassable
   - type: CollisionWake
     enabled: false
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/diona.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.09"
   - type: FoodSequenceElement
     entries:
       CottonBurger: DionaPlushie
@@ -739,7 +759,7 @@
   parent: BasePlushie
   id: PlushieRatvar
   name: ratvar plushie
-  description: A small stuffed doll of the elder god Ratvar.
+  description: A large stuffed doll of the elder god Ratvar.
   components:
   - type: Sprite
     sprite: Objects/Fun/Plushies/ratvar.rsi
@@ -747,6 +767,12 @@
   - type: Item
     size: Normal
     sprite: Objects/Fun/Plushies/ratvar.rsi
+  - type: MultiHandedItem
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/ratvar.rsi
+    slots:
+    - neck
   - type: FoodSequenceElement
     entries:
       CottonBurger: RatvarPlushie
@@ -755,7 +781,7 @@
   parent: BasePlushie
   id: PlushieNar
   name: nar'sie plushie
-  description: A small stuffed doll of the elder goddess Nar'Sie.
+  description: A large stuffed doll of the elder goddess Nar'Sie.
   components:
   - type: Sprite
     sprite: Objects/Fun/Plushies/narsie.rsi
@@ -763,6 +789,12 @@
   - type: Item
     size: Normal
     sprite: Objects/Fun/Plushies/narsie.rsi
+  - type: MultiHandedItem
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/narsie.rsi
+    slots:
+    - neck
   - type: FoodSequenceElement
     entries:
       CottonBurger: NarPlushie
@@ -822,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
@@ -856,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
@@ -885,6 +939,11 @@
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Voice/Slime/slime_squish.ogg
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/slime.rsi
+    slots:
+    - HEAD
   - type: FoodSequenceElement
     entries:
       CottonBurger: SlimePlushie
@@ -985,28 +1044,33 @@
     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
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.09"
   - type: FoodSequenceElement
     entries:
       CottonBurger: VoxPlushie
@@ -1020,6 +1084,15 @@
   - type: Sprite
     sprite: Objects/Fun/Plushies/atmosian.rsi
     state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/atmosian.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.04"
   - type: FoodSequenceElement
     entries:
       CottonBurger: AtmosianPlushie
@@ -1036,28 +1109,33 @@
   - 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
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.03"
   - type: FoodSequenceElement
     entries:
       CottonBurger: XenoPlushie
@@ -1071,6 +1149,11 @@
   - type: Sprite
     sprite: Objects/Fun/Plushies/penguin.rsi
     state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/penguin.rsi
+    slots:
+    - HEAD
   - type: FoodSequenceElement
     entries:
       CottonBurger: PenguinPlushie
@@ -1085,27 +1168,46 @@
     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
+    slots:
+    - HEAD
   - type: FoodSequenceElement
     entries:
       CottonBurger: HumanPlushie
@@ -1141,6 +1243,11 @@
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Voice/Moth/moth_chitter.ogg
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/Plushies/moth.rsi
+    slots:
+    - HEAD
   - type: FoodSequenceElement
     entries:
       CottonBurger: MothPlushie
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 6e3d98ade2..8f446a036c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -155,6 +155,15 @@
   - type: Sprite
     sprite: Objects/Fun/AI.rsi
     state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/AI.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.06"
 
 - type: entity
   parent: BaseFigurineCheapo
@@ -165,6 +174,15 @@
   - type: Sprite
     sprite: Objects/Fun/toy_nuke.rsi
     state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/toy_nuke.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.12"
   - type: Tag
     tags:
     - Payload
@@ -198,6 +216,15 @@
   - type: Sprite
     sprite: Objects/Fun/toy_ian.rsi
     state: icon
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/toy_ian.rsi
+    slots:
+      - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.06"
   - type: Item
     size: Tiny
   - type: EmitSoundOnUse
@@ -369,6 +396,20 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/basketball.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.8 # bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
@@ -387,6 +428,23 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/football.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.5 # a little bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: Item
     size: Small
     sprite: Objects/Fun/Balls/football.rsi
@@ -400,6 +458,21 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/beach_ball.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.1 # not bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
@@ -478,11 +551,17 @@
     sprite: Objects/Fun/toy_singularity.rsi
     state: icon
   - type: SingularityDistortion
-    intensity: 700 #Sunrise-edit
-    falloffPower: 6.5 #Sunrise-edit
+    intensity: 25
+    falloffPower: 2.6
   - type: Item
     size: Normal
-    sprite: Objects/Fun/icon.rsi
+    inhandVisuals:
+      left:
+      - state: singu-inhand-left
+        shader: unshaded
+      right:
+      - state: singu-inhand-right
+        shader: unshaded
 
 - type: entity
   parent: BaseItem
@@ -492,9 +571,17 @@
   components:
   - type: Sprite
     sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
-    shader: unshaded
     layers:
     - state: tesla_projectile
+      shader: unshaded
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: tesla-inhand-left
+        shader: unshaded
+      right:
+      - state: tesla-inhand-right
+        shader: unshaded
   - type: PointLight
     enabled: true
     radius: 5
@@ -518,8 +605,9 @@
   components:
   - type: Sprite
     sprite: Objects/Fun/pondering_orb.rsi
-    state: icon
-    shader: unshaded
+    layers:
+    - state: icon
+      shader: unshaded
   - type: PointLight
     radius: 2
     color: "#00CCFF"
@@ -641,6 +729,22 @@
     - state: base
       map: [ "enum.DamageStateVisualLayers.Base" ]
     - state: visor
+  - type: Clothing
+    sprite: Objects/Fun/pequeno.rsi
+    slots:
+    - HEAD
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET-body
+      - state: equipped-HELMET-vis
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-body
+      - state: inhand-left-vis
+      right:
+      - state: inhand-right-body
+      - state: inhand-right-vis
   - type: RandomSprite
     available:
     - enum.DamageStateVisualLayers.Base:
@@ -674,6 +778,44 @@
     shape:
     - 0,0,0,2
 
+- type: entity
+  parent: BaseItem
+  id: CardSword
+  name: cardboard sword
+  description: A cardboard tube thats been fashioned into a sword.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/card_sword.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Fun/card_sword.rsi
+    slots:
+    - Back
+    - SuitStorage
+  - type: StaminaDamageOnHit
+    damage: 6
+  - type: Appearance
+  - type: DisarmMalus
+    malus: 0
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 1.25
+    damage:
+      types:
+        Blunt: 0.3
+    soundHit:
+      path: /Audio/Items/Toys/card_tube_bonk.ogg
+  - type: Construction
+    graph: CardSword
+    node: cardSword
+  - type: Item
+    size: Normal
+    storedSprite:
+      state: icon
+      sprite: Objects/Fun/card_sword.rsi
+    shape:
+    - 0,0,1,3
+
 - type: entity
   parent: BaseItem
   id: ClownRecorder
@@ -751,7 +893,6 @@
   - type: Sprite
     sprite: Objects/Fun/whoopie.rsi
     state: icon
-    quickEquip: false
   - type: Tag
     tags:
     - Payload
@@ -778,8 +919,11 @@
   - type: UseDelay
     delay: 0.8
   - type: Slippery
+    staminaDamage: 0
+    frictionStatusTime: 0
     slipData:
-      paralyzeTime: 0
+      stunTime: 0
+      knockdownTime: 0
       launchForwardsMultiplier: 0
     slipSound:
       collection: Parp
@@ -796,7 +940,7 @@
   - type: StepTrigger
     intersectRatio: 0.2
     requiredTriggeredSpeed: 2
-  - type: TriggerOnStepTrigger
+  - type: TriggerOnStepTrigger # for payloads
   - type: Appearance
   - type: CollisionWake
     enabled: false
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index db604f92d3..db0d3c8d51 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -69,7 +69,7 @@
   components:
     - type: Spellbook
       spellActions:
-        ActionSpawnMagicarpSpell: -1
+        ActionSpawnMagicarpSpell: null
 
 - type: entity
   id: ForceWallSpellbook
@@ -92,7 +92,7 @@
         color: gold
     - type: Spellbook
       spellActions:
-        ActionForceWall: -1
+        ActionForceWall: null
 
 - type: entity
   id: BlinkBook
@@ -113,7 +113,7 @@
         color: gold
     - type: Spellbook
       spellActions:
-        ActionBlink: -1
+        ActionBlink: null
 
 - type: entity
   id: SmiteBook
@@ -136,7 +136,7 @@
       - state: overlay_blood
     - type: Spellbook
       spellActions:
-        ActionSmiteNoReq: -1
+        ActionSmiteNoReq: null
 
 - type: entity
   id: KnockSpellbook
@@ -158,7 +158,7 @@
         color: "#98c495"
     - type: Spellbook
       spellActions:
-        ActionKnock: -1
+        ActionKnock: null
 
 - type: entity
   id: FireballSpellbook
@@ -182,7 +182,7 @@
         shader: unshaded
     - type: Spellbook
       spellActions:
-        ActionFireball: -1
+        ActionFireball: null
 
 - type: entity
   id: ScrollRunes
@@ -197,7 +197,7 @@
     - state: spell_default
   - type: Spellbook
     spellActions:
-      ActionFlashRune: -1
-      ActionExplosionRune: -1
-      ActionIgniteRune: -1
-      ActionStunRune: -1
+      ActionFlashRune: null
+      ActionExplosionRune: null
+      ActionIgniteRune: null
+      ActionStunRune: null
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 522711c700..b119e29f41 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -57,6 +57,13 @@
           Quantity: 6
   - type: Item
     heldPrefix: cardboard
+  - type: FloorTile
+    outputs:
+    - Plating
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetCard
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
   parent: MaterialCardboard
@@ -136,7 +143,7 @@
     - state: cloth_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: FlavorProfile
     flavors:
@@ -216,7 +223,7 @@
   - type: Construction
     graph: Durathread
     node: MaterialDurathread
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -456,7 +463,7 @@
     - state: cotton_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: FlavorProfile
     flavors:
@@ -515,7 +522,7 @@
     - state: pyrotton_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -575,7 +582,7 @@
   - type: FlavorProfile
     flavors:
       - banana
-  - type: Food
+  - type: Edible
     trash:
     - TrashBananiumPeel
   - type: BadFood
@@ -627,7 +634,7 @@
   - type: Stack
     count: 50
     stackType: WebSilk
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: FlavorProfile
     flavors:
@@ -770,7 +777,7 @@
     - state: cotton_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
   - type: BadFood
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index b5a1c0963b..b28fff4e42 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -72,7 +72,8 @@
     slipData:
       launchForwardsMultiplier: 0
   - type: TriggerOnStepTrigger
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
+    targetUser: true
     damage:
       types:
         Piercing: 5
@@ -100,7 +101,7 @@
   - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 4.5
@@ -136,7 +137,7 @@
     refineResult:
     - id: SheetGlass1
     - id: PartRodMetal1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5.5
@@ -172,7 +173,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetPlasma1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 6.5
@@ -211,7 +212,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetUranium1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5
@@ -246,7 +247,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetBrass1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
index 2b1c2940fe..2a289a95f8 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
@@ -110,6 +110,8 @@
     solution: Welder
   - type: ExaminableSolution
     solution: Welder
+    heldOnly: true
+    exactVolume: true
   - type: SolutionRegeneration
     solution: Welder
     generated:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index aea16bc777..83275bcfee 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -21,8 +21,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: PowerCellSlot
     cellSlotId: cell_slot
@@ -143,13 +143,13 @@
     sprite: Objects/Misc/Lights/lampint.rsi
     layers:
       - state: lamp-int
-        map: [ "enum.FlashVisuals.BaseLayer" ]
+        map: [ "enum.FlashVisualLayers.BaseLayer" ]
       - state: lamp-int-on
         shader: unshaded
         visible: false
         map: [ "light" ]
       - state: flashing
-        map: [ "enum.FlashVisuals.LightLayer" ]
+        map: [ "enum.FlashVisualLayers.LightLayer" ]
         visible: false
   - type: Item
     sprite: Objects/Misc/Lights/lampint.rsi
@@ -162,6 +162,10 @@
     energy: 0.5
     color: "#FFFFEE"
   - type: Flash
+    flashOnMelee: false
+    flashOnUse: false
+  - type: UseDelay
+    delay: 1
   - type: LimitedCharges
     maxCharges: 3
   - type: AutoRecharge
@@ -179,10 +183,10 @@
   - type: GenericVisualizer
     visuals:
       enum.FlashVisuals.Burnt:
-        enum.FlashVisuals.BaseLayer:
+        enum.FlashVisualLayers.BaseLayer:
           True: {state: burnt}
       enum.FlashVisuals.Flashing:
-        enum.FlashVisuals.LightLayer:
+        enum.FlashVisualLayers.LightLayer:
           True: {visible: true}
           False: {visible: false}
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index e5f26d0d7c..bb294eadd0 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -13,7 +13,7 @@
     - type: Implanter
       whitelist:
         components:
-        - Body # no chair microbomb
+        - MobState # no chair microbomb
       blacklist:
         components:
         - Guardian # no holoparasite macrobomb wombo combo
@@ -46,6 +46,7 @@
       - MindShieldImplant
       - FakeMindShieldImplant
       - RadioImplant
+      - ChameleonControllerImplant
       deimplantFailureDamage:
         types:
           Cellular: 50
@@ -248,8 +249,7 @@
 
 - type: entity
   id: ChameleonControllerImplanter
-  name: chameleon controller implant
-  suffix: chameleon controller
+  name: chameleon controller implanter
   parent: BaseImplantOnlyImplanterSyndi
   components:
   - type: Implanter
diff --git a/Resources/Prototypes/Entities/Objects/Misc/intermediate_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/intermediate_parts.yml
new file mode 100644
index 0000000000..b0774a1c2c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/intermediate_parts.yml
@@ -0,0 +1,15 @@
+### For items thare are used as intermediate steps on a crafting recipe but have no use outside of it.
+- type: entity
+  parent: BaseItem
+  id: MoproachShoes
+  name: moproach shoes
+  description: Three pairs of tiny mopshoes, perfectly fit for a moproach.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/moproach_shoes.rsi
+    state: mopshoes
+  - type: Construction
+    graph: MoproachShoes
+    node: shoes
+  - type: Item
+    size: Tiny
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index e35e915b09..6c01a2a8dd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -90,7 +90,7 @@
         components:
         - IgnoreKudzu
     - type: Food
-      requiredStomachs: 2 # ruminants have 4 stomachs but i dont care to give them literally 4 stomachs. 2 is good
+      requiresSpecialDigestion: true
       delay: 0.5
     - type: FlavorProfile
       flavors:
@@ -101,6 +101,9 @@
           reagents:
           - ReagentId: Nutriment
             Quantity: 2
+    - type: Tag
+      tags:
+      - Ruminant
 
 - type: entity
   id: WeakKudzu
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 7ed1b657ea..a3a2b60401 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -64,7 +64,8 @@
   name: kick mine
   parent: BaseLandMine
   components:
-  - type: GhostKickUserOnTrigger
+  - type: GhostKickOnTrigger
+    targetUser: true
   - type: DeleteOnTrigger
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index bead4786b1..a9329b6782 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -42,6 +42,20 @@
     damage:
       types:
         Piercing: 3
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+          - -0.3,0.1
+          - -0.1,0.3
+          - 0.3,-0.1
+          - 0.1,-0.3
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
deleted file mode 100644
index 8dbab8c45f..0000000000
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-- type: entity
-  id: SpiderWeb
-  name: spider web
-  description: It's stringy and sticky.
-  placement:
-    mode: SnapgridCenter
-    snap:
-      - Wall
-  components:
-    - type: MeleeSound
-      soundGroups:
-        Brute:
-          path:
-            "/Audio/Weapons/slash.ogg"
-    - type: Sprite
-      sprite: Objects/Misc/spiderweb.rsi
-      layers:
-        - state: spider_web_1
-          map: ["spiderWebLayer"]
-      drawdepth: WallMountedItems
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.SpiderWebVisuals.Variant:
-          spiderWebLayer:
-            1:  {state: spider_web_1}
-            2:  {state: spider_web_2}
-    - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
-    - type: Fixtures
-      fixtures:
-        fix1:
-          hard: false
-          density: 7
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.5,0.5"
-          layer:
-          - MidImpassable
-    - type: Damageable
-      damageModifierSet: Wood
-    - type: Destructible
-      thresholds:
-      - trigger: # Excess damage, don't spawn entities
-          !type:DamageTrigger
-          damage: 50
-        behaviors:
-        - !type:DoActsBehavior
-          acts: ["Destruction"]
-      - trigger:
-          !type:DamageTrigger
-          damage: 10
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-        - !type:SpawnEntitiesBehavior
-          spawn:
-            MaterialWebSilk:
-              min: 0
-              max: 1
-    - type: Temperature
-      heatDamage:
-        types:
-          Heat: 5
-      coldDamage: {}
-      coldDamageThreshold: 0
-    - type: Flammable
-      fireSpread: true
-      damage:
-        types:
-          Heat: 5
-    - type: Reactive
-      groups:
-        Flammable: [Touch]
-        Extinguish: [Touch]
-    - type: SpiderWebObject
-    - type: SpeedModifierContacts
-      walkSpeedModifier: 0.5
-      sprintSpeedModifier: 0.5
-      ignoreWhitelist:
-        components:
-            - IgnoreSpiderWeb
-
-- type: entity
-  id: SpiderWebClown
-  name: clown spider web
-  description: It's stringy and slippy.
-  placement:
-    mode: SnapgridCenter
-    snap:
-      - Wall
-  components:
-    - type: MeleeSound
-      soundGroups:
-        Brute:
-          path:
-            "/Audio/Weapons/slash.ogg"
-    - type: Sprite
-      sprite: Objects/Misc/spiderweb.rsi
-      layers:
-        - state: spider_web_clown_1
-          map: ["spiderWebLayer"]
-      drawdepth: WallMountedItems
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.SpiderWebVisuals.Variant:
-          spiderWebLayer:
-            1:  {state: spider_web_clown_1}
-            2:  {state: spider_web_clown_2}
-    - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Slippery
-    - type: StepTrigger
-      intersectRatio: 0.2
-    - type: Physics
-    - type: Fixtures
-      fixtures:
-        slips:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.4,-0.3,0.4,0.3"
-          hard: false
-          layer:
-          - SlipLayer
-        fix1:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.4,-0.3,0.4,0.3"
-          density: 1000
-          mask:
-          - ItemMask
-    - type: Damageable
-      damageModifierSet: Wood
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 10
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - type: Temperature
-      heatDamage:
-        types:
-          Heat: 5
-      coldDamage: {}
-      coldDamageThreshold: 0
-    - type: Flammable
-      fireSpread: true
-      damage:
-        types:
-          Heat: 5
-    - type: Reactive
-      groups:
-        Flammable: [Touch]
-        Extinguish: [Touch]
-    - type: SpiderWebObject
-    - type: FlavorProfile
-      flavors:
-        - sweet
-    - type: Food
-      delay: 2
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          reagents:
-          - ReagentId: Sugar
-            Quantity: 2
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 30efd7c1ee..d98a4b7bad 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -67,37 +67,18 @@
   description: This implant lets the user honk anywhere at any time.
   #categories: [ HideSpawnMenu ]  Sunrsie-Edit
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateHonkImplant
-    - type: TriggerImplantAction
-    - type: EmitSoundOnTrigger
-      sound:
-        collection: BikeHorn
-        params:
-          variation: 0.125
-    - type: Tag
-      tags:
-      - BikeHorn
-      - SubdermalImplant # Sunrsie-Edit
-
-#Sunrise-Start
-- type: entity
-  parent: BaseSubdermalImplant
-  id: CreepyLaughImplant
-  name: creepy laugh implant
-  description: This implant lets the user laugh like borg anywhere at any time.
-  components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateBorgLaughImplant
-    - type: TriggerImplantAction
-    - type: EmitSoundOnTrigger
-      sound:
-        path: /Audio/Voice/Silicon/syndieborg_laugh.ogg
-    - type: Tag
-      tags:
-      - CreepyLaugh
-      - SubdermalImplant
-#Sunrise-End
+  - type: SubdermalImplant
+    implantAction: ActionActivateHonkImplant
+  - type: TriggerOnActivateImplant
+  - type: EmitSoundOnTrigger
+    predicted: true
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
+  - type: Tag
+    tags:
+    - BikeHorn
 
 #Security implants
 
@@ -207,11 +188,14 @@
   description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore.
   #categories: [ HideSpawnMenu ]  Sunrsie-Edit
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateFreedomImplant
-      whitelist:
-        components:
-        - Cuffable # useless if you cant be cuffed
+  - type: SubdermalImplant
+    implantAction: ActionActivateFreedomImplant
+    whitelist:
+      components:
+      - Cuffable # useless if you cant be cuffed
+  - type: TriggerOnActivateImplant
+  - type: UncuffOnTrigger
+    targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -258,13 +242,13 @@
   description: This implant creates an electromagnetic pulse when activated.
   #categories: [ HideSpawnMenu ]  Sunrsie-Edit
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateEmpImplant
-    - type: TriggerImplantAction
-    - type: EmpOnTrigger
-      range: 2.75
-      energyConsumption: 50000
-      disableDuration: 10
+  - type: SubdermalImplant
+    implantAction: ActionActivateEmpImplant
+  - type: TriggerOnActivateImplant
+  - type: EmpOnTrigger
+    range: 2.75
+    energyConsumption: 50000
+    disableDuration: 10
 
 #Sunrise-start #PR Wiz #31782
 - type: entity
@@ -291,10 +275,11 @@
   description: This implant randomly teleports the user within a large radius when activated.
   #categories: [ HideSpawnMenu ]  Sunrsie-Edit
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateScramImplant
-    - type: TriggerImplantAction
-    - type: ScramImplant
+  - type: SubdermalImplant
+    implantAction: ActionActivateScramImplant
+  - type: TriggerOnActivateImplant
+  - type: ScramOnTrigger
+    targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -303,11 +288,15 @@
   description: This implant lets the user randomly change their appearance and name once.
   #categories: [ HideSpawnMenu ]  Sunrsie-Edit
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateDnaScramblerImplant
-      whitelist:
-        components:
-        - HumanoidAppearance # syndies cant turn hamlet into a human
+  - type: SubdermalImplant
+    implantAction: ActionActivateDnaScramblerImplant
+    whitelist:
+      components:
+      - HumanoidAppearance # syndies cant turn hamlet into a human
+  - type: TriggerOnActivateImplant
+  - type: DnaScrambleOnTrigger
+    targetUser: true
+  - type: DeleteOnTrigger
 
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
@@ -335,26 +324,28 @@
   description: This implant detonates the user upon activation or upon death.
   #categories: [ HideSpawnMenu ]  Sunrsie-Edit
   components:
-    - type: SubdermalImplant
-      #permanent: true Sunrsie-Edit
-      implantAction: ActionActivateMicroBomb
-    - type: TriggerOnMobstateChange
-      mobState:
-      - Dead
-    - type: TriggerImplantAction
-    - type: ExplodeOnTrigger
-    - type: GibOnTrigger
-      deleteItems: true
-    - type: Explosive
-      explosionType: MicroBomb
-      totalIntensity: 120
-      intensitySlope: 5
-      maxIntensity: 30
-      canCreateVacuum: false
-    - type: Tag
-      tags:
-        - SubdermalImplant
-        - MicroBomb
+  - type: SubdermalImplant
+    #permanent: true Sunrsie-Edit
+    implantAction: ActionActivateMicroBomb
+  - type: TriggerOnMobstateChange
+    mobState:
+    - Dead
+  - type: TriggerOnActivateImplant
+  - type: ExplodeOnTrigger
+  - type: GibOnTrigger
+    targetUser: true
+    deleteItems: true
+  - type: Explosive
+    explosionType: MicroBomb
+    totalIntensity: 120
+    intensitySlope: 5
+    maxIntensity: 30
+    canCreateVacuum: false
+  - type: Tag
+    tags:
+    - SubdermalImplant
+    - HideContextMenu
+    - MicroBomb
 
 
 - type: entity
@@ -366,20 +357,24 @@
   components:
     - type: SubdermalImplant
       #permanent: true Sunrsie-Edit
-    - type: TriggerOnMobstateChange #Chains with OnUseTimerTrigger
+    - type: TriggerOnMobstateChange #activates the timer
       mobState:
       - Dead
       preventSuicide: true
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 7
-      initialBeepDelay: 0
       beepSound:
         path: /Audio/Machines/Nuke/general_beep.ogg
         params:
           volume: -2
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     - type: GibOnTrigger
+      targetUser: true
       deleteItems: true
+      keysIn:
+      - timer
     - type: Explosive
       explosionType: Default
       totalIntensity: 3500
@@ -404,11 +399,13 @@
   - type: TriggerOnMobstateChange
     mobState:
     - Dead
-  - type: TriggerImplantAction
+  - type: TriggerOnActivateImplant
   - type: GibOnTrigger
+    targetUser: true
     deleteItems: true
   - type: SpawnOnTrigger
     proto: Acidifier
+    predicted: true
   - type: Tag
     tags:
     - SubdermalImplant
@@ -430,7 +427,8 @@
       mobState:
       - Critical
       - Dead
-    - type: Rattle
+    - type: RattleOnTrigger
+      targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -489,5 +487,5 @@
   description: This implant will inform the Centcomm radio channel should the user fall into critical condition or die.
   categories: [ HideSpawnMenu ]
   components:
-  - type: Rattle
+  - type: RattleOnTrigger
     radioChannel: CentCom
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 4078ab2edb..b622ef1b07 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -1626,6 +1626,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
@@ -1675,7 +1759,7 @@
     stackType: FloorTileXenoSteelCorner
 
 - type: entity
-  name: xeno techmaint
+  name: xeno techmaint floor
   parent: FloorTileItemBase
   id: FloorTileItemXenoMaint
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index ac636a3978..b695922ba1 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -292,6 +292,61 @@
     - type: StaticPrice
       price: 150
 
+- type: entity
+  name: cardboard shield
+  parent: BaseShield
+  id: CardShield
+  description: A shield that wont shield you from much.
+  components:
+    - type: Sprite
+      state: cardshield-icon
+    - type: Item
+      heldPrefix: cardshield
+    - type: StaminaResistance
+      damageCoefficient: 0.95
+      worn: true
+    - type: Blocking
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 1
+          Slash: 2
+          Piercing: 0.6
+          Heat: 3
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.9
+          Slash: 1.8
+          Piercing: 0.5
+          Heat: 2.5
+        flatReductions:
+          Blunt: 0.5
+    - type: Construction
+      graph: CardShield
+      node: cardShield
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 25
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 10 #Very very weak shield
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound: /Audio/Items/Toys/ToyFall2.ogg
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            MaterialCardboard:
+              min: 2
+              max: 4
+    - type: StaticPrice
+      price: 20
+
 - type: entity
   name: makeshift shield
   parent: BaseShield
@@ -657,7 +712,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 d232abbce1..ba62efcfdd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -120,3 +120,58 @@
     useDelay: 1
   - type: InstantAction
     event: !type:SummonActionEvent
+
+- type: entity
+  parent: Bible
+  name: tanakh
+  description: "For God's chosen crewmembers"
+  id: BibleTanakh
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/tanakh.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/tanakh.rsi
+
+- type: entity
+  parent: Bible
+  name: druidic tablet
+  description: "It's the mystery of the druids!"
+  id: BibleDruid
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi
+
+- type: entity
+  parent: Bible
+  name: communist manifesto
+  description: "Remove the mask of humanity from Capital."
+  id: BibleCommunistManifesto
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/communistmanifesto.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/communistmanifesto.rsi
+
+- type: entity
+  parent: Bible
+  name: satanic bible
+  description: "What could possibly go wrong?"
+  id: BibleSatanic
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/satanicbible.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/satanicbible.rsi
+
+- type: entity
+  parent: Bible
+  name: codex nanotrasimus
+  description: "A familiar book containing the Sacred Operating Procedures."
+  id: BibleNanoTrasen
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi
+  - type: Item
+    sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 1777d8675c..ca6270ab64 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -762,3 +762,13 @@
       seedId: anomalyBerry
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of bloonion seeds
+  id: BloonionSeeds
+  components:
+  - type: Seed
+    seedId: bloonion
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/bloonion.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 857bb80fad..da08bb24d9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -26,6 +26,7 @@
   - type: Spillable
     solution: absorbed
     spillWhenThrown: false
+    preventMelee: false
   - type: DrainableSolution
     solution: absorbed
   - type: Wieldable
@@ -84,6 +85,7 @@
     - type: Spillable
       solution: absorbed
       spillWhenThrown: false
+      preventMelee: false
     - type: DrainableSolution
       solution: absorbed
     - type: Wieldable
@@ -181,24 +183,31 @@
       path: /Audio/Effects/beep_landmine.ogg
       params:
         maxDistance: 10
-  - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60
     maxIntensity: 10 # about a ~67.5 total damage
     totalIntensity: 30 # about a ~3 tile radius
     canCreateVacuum: false
+  - type: ExplodeOnTrigger
+    keysIn:
+    - timer
+    - trigger # directly explode from the landmine
   - type: DeleteOnTrigger
-  - type: OnUseTimerTrigger
-    useVerbInstead: true
+    keysIn:
+    - timer
+    - trigger
+  - type: TimerTrigger
     beepInterval: .25
     beepSound:
       path: /Audio/Items/Janitor/floor_sign_beep.ogg
       params:
         volume: 1
     examinable: false
+  - type: TriggerOnVerb
+    text: trigger-on-verb-detonation
   - type: Tag
     tags: # ignore "WhitelistChameleon" tag
-      - WetFloorSign
+    - WetFloorSign
 
 - type: entity
   name: plunger
@@ -240,7 +249,7 @@
       projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+          bounds: "-0.2,-0.4,0.2,-0.1"
         hard: false
         mask:
         - Impassable
@@ -248,6 +257,7 @@
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/pop.ogg
     embedOnThrow: True
+    offset: "0,-0.1"
   - type: ThrowingAngle
     angle: 0
   - type: LandAtCursor
@@ -270,6 +280,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
@@ -301,6 +314,7 @@
     SpacemenFigureSpawner: 28
     SpawnMobCockroach: 5
     MaintenanceToolSpawner: 5
+    SpawnMobMoproach: 2
 
 - type: entity
   parent: BaseItem
@@ -352,3 +366,39 @@
     - type: Fiber
       fiberColor: fibers-white
     - type: DnaSubstanceTrace
+
+- type: entity
+  parent: BaseItem
+  id: WireBrush
+  name: wire brush
+  description: A bristly steel wire brush, perfect for scraping away even the toughest patches of rust.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/wirebrush.rsi
+    state: icon
+  - type: Item
+    storedSprite:
+      sprite: Objects/Specific/Janitorial/wirebrush.rsi
+      state: storage
+    size: Small
+  - type: Tag
+    tags:
+    - WireBrush
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+      Plastic: 50
+  - type: Tool
+    qualities:
+    - Brushing
+    useSound:
+      path: /Audio/Items/wirebrushing.ogg
+  - type: StaticPrice
+    price: 22
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Piercing: 3
+    soundHit:
+      path: "/Audio/Weapons/bladeslice.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 36a70885e0..cb05e06105 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -128,8 +128,9 @@
   - type: SolutionContainerVisuals
     fillBaseName: syndie-
   - type: Slippery
+    staminaDamage: 50
     slipData:
-      paralyzeTime: 3
+      knockdownTime: 3
       launchForwardsMultiplier: 3
   - type: Item
     heldPrefix: syndie
@@ -156,11 +157,9 @@
     layers:
     - state: syndie-soaplet
   - type: Slippery
-    slipData:
-      paralyzeTime: 1.5 # these things are tiny
-      launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.04
+  - type: TriggerOnStepTrigger
   - type: Item
     heldPrefix: syndie
   - type: Fixtures
@@ -181,10 +180,12 @@
         - ItemMask
   - type: DeleteOnTrigger
   - type: EmitSoundOnTrigger
+    predicted: true
+    positional: true
     sound:
       path: "/Audio/Effects/Fluids/splat.ogg"
       params:
-        volume: -20
+        volume: -8
 
 - type: entity
   name: soap
@@ -223,8 +224,9 @@
   - type: SolutionContainerVisuals
     fillBaseName: omega-
   - type: Slippery
+    staminaDamage: 50
     slipData:
-      paralyzeTime: 5.0
+      knockdownTime: 5.0
       launchForwardsMultiplier: 3.0
   - type: Item
     heldPrefix: omega
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index b692f20dd9..9ed5972754 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -42,6 +42,7 @@
     solution: spray
   - type: ExaminableSolution
     solution: spray
+    exactVolume: true
 
 - type: entity
   name: mega spray bottle
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
index 1b9f32009a..5fc9883306 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -73,7 +73,6 @@
   description: Get out there and slang some dogs.
   components:
     - type: Sprite
-      netSync: false
       noRot: true
       sprite: Objects/Specific/Kitchen/food_carts.rsi
       layers:
@@ -154,7 +153,6 @@
   description: It's the Ice Cream Man! It's the Ice Cream Man!
   components:
     - type: Sprite
-      netSync: false
       noRot: true
       sprite: Objects/Specific/Kitchen/food_carts.rsi
       layers:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index eb07b695aa..894454b05c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -39,7 +39,7 @@
       price: 30
     - type: GuideHelp
       guides:
-      - Medical Doctor
+      - MedicalDoctor
 
 - type: entity
   id: Defibrillator
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 17c2908fb5..334548e99e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -265,7 +265,7 @@
       types:
         Bloodloss: -0.5 #lowers bloodloss damage
         Mangleness: 0.1 #SUNRISE-EDIT
-    ModifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
+    modifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
     healingBeginSound:
       path: "/Audio/Items/Medical/brutepack_begin.ogg"
       params:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index cc38f81af8..17725dfa26 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -42,7 +42,7 @@
           False: { visible: false }
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   id: HandheldHealthAnalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 3b7d0c6dda..c04cf8c067 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -22,6 +22,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay
@@ -63,6 +64,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay
@@ -144,6 +146,7 @@
         maxVol: 15
   - type: ExaminableSolution
     solution: pen
+    exactVolume: true
   - type: Hypospray
     solutionName: pen
     transferAmount: 15
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index c67d566669..5fb76e79b9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -445,6 +445,7 @@
     items:
     - BorgFireExtinguisher
     - BorgHandheldGPSBasic
+    - HandheldStationMapUnpowered
     - HandHeldMassScannerBorg
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: extinguisher-module }
@@ -903,6 +904,26 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
 
+- type: entity
+  id: BorgModuleAdvancedClowning
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: advanced clowning cyborg module
+  description: Advanced service module for only the silliest cyborgs! Comes with a built-in oven that bakes pies automatically over time, a holopeel projector, and a push horn.
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: icon-clown-adv
+  - type: ItemBorgModule
+    items:
+    - HoloprojectorClownBorg
+    - BorgLauncherCreamPie
+    - ClownRecorder
+    - PushHorn
+    - BikeHornInstrument
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-clowning-module }
+
 #syndicate modules
 - type: entity
   id: BorgModuleSyndicateWeapon
@@ -1033,7 +1054,7 @@
   parent: [ BaseXenoborgModuleGeneric, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleBasic
   name: basic xenoborg module
-  description: Essential items for any xenoborg.
+  description: Essential items for any Xenoborg.
   components:
   - type: Sprite
     layers:
@@ -1051,7 +1072,7 @@
   parent: [ BaseXenoborgModuleGeneric, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleTool
   name: tool xenoborg module
-  description: Simple tools for most xenoborgs.
+  description: Simple tools for most Xenoborgs.
   components:
   - type: Sprite
     layers:
@@ -1152,7 +1173,7 @@
   parent: [ BaseXenoborgModuleScout, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleSpaceMovement
   name: space movement xenoborg module
-  description: Module that helps a xenoborg move better in space.
+  description: Module that helps a Xenoborg move better in space.
   components:
   - type: Sprite
     layers:
@@ -1249,3 +1270,19 @@
     - CloakingDevice
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-eye-module }
+
+- type: entity
+  parent: [ BaseXenoborgModuleStealth, BaseProviderBorgModule, BaseXenoborgContraband ]
+  id: XenoborgModuleSuperCloakDevice
+  name: cloaking device xenoborg module
+  description: Module with a device that allows xenoborgs to become truly invisible for less time.
+  components:
+  - type: Sprite
+    layers:
+    - state: xenoborg_stealth
+    - state: icon-xenoborg-cloak2
+  - type: ItemBorgModule
+    items:
+    - SuperCloakingDevice
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-eye2-module }
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index d38c29ef70..16f1efc5e9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -130,9 +130,9 @@
     - 0,0,1,1
     whitelist:
       components:
-      - Artifact
+      - XenoArtifact
   - type: Item
-    sprite: Objects/Storage/artifact_container.rsi  
+    sprite: Objects/Storage/artifact_container.rsi
     size: Huge
   - type: MeleeWeapon
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml
index 6550e21923..02036b6463 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml
@@ -2,7 +2,7 @@
   parent: [ BaseItem, BaseXenoborgContraband ]
   id: CloakingDevice
   name: cloaking device
-  description: A device that allows xenoborgs to go invisible.
+  description: A device that allows Xenoborgs to go invisible.
   components:
   - type: Sprite
     sprite: Objects/Specific/Research/anomalyscanner.rsi
@@ -29,3 +29,18 @@
         startingItem: PowerCellSmallNuclear
         disableEject: true
         swap: false
+
+- type: entity
+  parent: CloakingDevice
+  id: SuperCloakingDevice
+  name: super cloaking device
+  description: A device that allows Xenoborgs to go truly invisible.
+  components:
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: Stealth
+      minVisibility: -1
+      lastVisibility: -1
+  - type: PowerCellDraw
+    drawRate: 12 # 30 seconds
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml
index 79042fb561..d075e37a5d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml
@@ -2,7 +2,7 @@
   parent: [ BaseStorageItem, BaseXenoborgContraband ]
   id: MaterialBag
   name: material bag
-  description: A robust bag for xenoborgs to carry large amounts of materials.
+  description: A robust bag for Xenoborgs to carry large amounts of materials.
   components:
   - type: MagnetPickup
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index 94638dca5e..ae157e83d0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -26,6 +26,7 @@
       solution: beaker
     - type: ExaminableSolution
       solution: beaker
+      exactVolume: true
     - type: DrawableSolution
       solution: beaker
     - type: InjectableSolution
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index a892ee6395..0c0c1cf172 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -37,6 +37,7 @@
     solution: drink
   - type: ExaminableSolution
     solution: drink
+    exactVolume: true
   - type: DrawableSolution
     solution: drink
   - type: SolutionTransfer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
index 60441bb475..bc8207b673 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -43,6 +43,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: SolutionTransfer
@@ -137,6 +138,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: SolutionTransfer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 08c0b6d772..c5d5a5206e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -35,6 +35,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: InjectableSolution
@@ -133,6 +134,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: InjectableSolution
@@ -189,6 +191,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: InjectableSolution
@@ -348,6 +351,7 @@
     toggleState: 1 # draw
   - type: ExaminableSolution
     solution: dropper
+    exactVolume: true
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
@@ -420,6 +424,7 @@
     injectOnly: false
   - type: ExaminableSolution
     solution: injector
+    exactVolume: true
   - type: Spillable
     solution: injector
   - type: TrashOnSolutionEmpty
@@ -473,7 +478,7 @@
     inHandsMaxFillLevels: 3
     inHandsFillBaseName: -fill-
   - type: EmbeddableProjectile
-    offset: "-0.1,0"
+    offset: "0,-0.1"
     minimumSpeed: 3
     removalTime: 0.25
     embedOnThrow: false
@@ -597,12 +602,11 @@
     size: Tiny
     sprite: Objects/Specific/Chemistry/pills.rsi
   - type: Pill
-  - type: Food
+  - type: Edible
     delay: 0.6
     forceFeedDelay: 2
     transferAmount: null
-    eatMessage: food-swallow
-    useSound: /Audio/Items/pill.ogg
+    edible: Pill
   - type: BadFood
   - type: FlavorProfile
     ignoreReagents: []
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index 52a730f773..0d8a7d49d6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -116,6 +116,15 @@
     possibleSpawns:
     - MobMothroach
 
+- type: entity
+  parent: RehydratableAnimalCube
+  id: MoproachCube
+  name: moproach cube
+  components:
+  - type: Rehydratable
+    possibleSpawns:
+    - MobMoproach
+
 - type: entity
   parent: RehydratableAnimalCube
   id: MouseCube
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index e4812dae7f..d0ac13ddfa 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -48,6 +48,8 @@
       - Security
       - Service
       - Theatre
+      - GenpopEnter
+      - GenpopLeave
       - BlueShield # Sunrise
       - BlueShieldEnsign # Sunrise
       - Ntrep # Sunrise
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index 992c3313e2..d77e6cd2b8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -1,13 +1,14 @@
 - type: entity
-  parent: BaseItem
+  parent: DrinkBase
   id: Bucket
   name: bucket
   description: It's a boring old bucket.
   components:
-  - type: Drink
-    solution: bucket
-    ignoreEmpty: true
   - type: Clickable
+  - type: Edible
+    edible: Drink
+    solution: bucket
+    destroyOnEmpty: false
   - type: Sprite
     sprite: Objects/Tools/bucket.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index c63265ef7d..6fd27c4302 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -24,8 +24,8 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
+        startValue: 0.1
+        endValue: 2.0
         isLooped: true
   - type: ToggleableVisuals
     spriteLayer: light
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index b283710cd9..9eceb288f0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -135,8 +135,8 @@
         - !type:PulseBehaviour
           interpolate: Cubic
           maxDuration: 10.0
-          minValue: 1.0
-          maxValue: 7.0
+          startValue: 1.0
+          endValue: 7.0
           isLooped: true
           property: Energy
           enabled: true
@@ -199,7 +199,7 @@
           interpolate: Nearest
           minDuration: 0.2
           maxDuration: 1.0
-          maxValue: 0.2
+          endValue: 0.2
           property: AnimatedEnable
           isLooped: true
           enabled: true
@@ -238,8 +238,8 @@
         - !type:FadeBehaviour
           interpolate: Cubic
           maxDuration: 5.0
-          minValue: 0.0
-          maxValue: 10.0
+          startValue: 0.0
+          endValue: 10.0
           isLooped: true
           property: Energy
           enabled: true
@@ -270,8 +270,8 @@
           interpolate: Cubic
           minDuration: 1.0
           maxDuration: 5.0
-          minValue: 2.0
-          maxValue: 10.0
+          startValue: 2.0
+          endValue: 10.0
           isLooped: true
           enabled: true
 
@@ -301,7 +301,7 @@
         - !type:RandomizeBehaviour
           interpolate: Nearest
           maxDuration: 0.5
-          minValue: 10.0
-          maxValue: 25.0
+          startValue: 10.0
+          endValue: 25.0
           isLooped: true
           enabled: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 3d25957851..93a0f927e1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -10,31 +10,33 @@
       radiatingBehaviourId: radiating
     - type: LightBehaviour
       behaviours:
-        - !type:FadeBehaviour
-          id: radiating
-          maxDuration: 2.0
-          startValue: 3.0
-          endValue: 2.0
-          isLooped: true
-          reverseWhenFinished: true
-        - !type:PulseBehaviour
-          id: blinking
-          interpolate: Nearest
-          maxDuration: 1.0
-          minValue: 0.1
-          maxValue: 2.0
-          isLooped: true
+      - !type:FadeBehaviour
+        id: radiating
+        maxDuration: 2.0
+        startValue: 3.0
+        endValue: 2.0
+        isLooped: true
+        reverseWhenFinished: true
+      - !type:PulseBehaviour
+        id: blinking
+        interpolate: Nearest
+        maxDuration: 1.0
+        startValue: 0.1
+        endValue: 2.0
+        isLooped: true
     - type: Sprite
       sprite: Objects/Tools/lantern.rsi
       layers:
-        - state: lantern
-        - state: lantern-on
-          shader: unshaded
-          visible: false
-          map: [ "light" ]
+      - state: lantern
+      - state: lantern-on
+        shader: unshaded
+        visible: false
+        map: [ "light" ]
     - type: Item
       sprite: Objects/Tools/lantern.rsi
       heldPrefix: off
+    - type: UseDelay
+      delay: 1
     - type: PointLight
       enabled: false
       radius: 3
@@ -62,7 +64,7 @@
       equippedPrefix: off
       quickEquip: false
       slots:
-        - Belt
+      - Belt
     - type: Tag
       tags:
       - Flashlight
@@ -76,18 +78,20 @@
       sprite: Objects/Tools/lantern.rsi
       layers:
       - state: lantern
-        map: [ "enum.FlashVisuals.BaseLayer" ]
+        map: [ "enum.FlashVisualLayers.BaseLayer" ]
       - state: lantern-on
         shader: unshaded
         visible: false
         map: [ "light" ]
       - state: flashing
-        map: [ "enum.FlashVisuals.LightLayer" ]
+        map: [ "enum.FlashVisualLayers.LightLayer" ]
         visible: false
     - type: PointLight
       radius: 5
       energy: 10
     - type: Flash
+      flashOnMelee: false
+      flashOnUse: false
     - type: LimitedCharges
       maxCharges: 15
     - type: MeleeWeapon
@@ -98,9 +102,9 @@
     - type: GenericVisualizer
       visuals:
         enum.FlashVisuals.Burnt:
-          enum.FlashVisuals.BaseLayer:
+          enum.FlashVisualLayers.BaseLayer:
             True: {state: burnt}
         enum.FlashVisuals.Flashing:
-          enum.FlashVisuals.LightLayer:
+          enum.FlashVisualLayers.LightLayer:
             True: {visible: true}
             False: {visible: false}
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 3cad212969..48516338ac 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -29,7 +29,7 @@
     activatedSize: Small
   - type: ItemToggleHot
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -71,7 +71,7 @@
         shader: unshaded
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
   - type: UseDelay
   - type: RefillableSolution
     solution: Welder
@@ -106,7 +106,7 @@
   description: "A dangerously inexpensive plastic lighter, don't burn your thumb!"
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -135,7 +135,7 @@
   description: "A rugged metal lighter, lasts quite a while."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_icon_base
       map: ["base"]
@@ -168,7 +168,7 @@
   - type: ItemToggleHot
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     heldPrefix: zippo
   - type: Appearance
   - type: GenericVisualizer
@@ -233,7 +233,7 @@
   description: "A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_engraved_icon_base
       map: ["base"]
@@ -249,3 +249,404 @@
       shader: unshaded
   - type: StealTarget
     stealGroup: FlippoEngravedLighter
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseBrandedLighter
+  components:
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Items/Lighters/zippo_open.ogg
+      params:
+        volume: -5
+    soundDeactivate:
+      path: /Audio/Items/Lighters/zippo_close.ogg
+      params:
+        volume: -5
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+            Heat: 1
+  - type: ItemToggleSize
+    activatedSize: Small
+  - type: ItemToggleHot
+  - type: Item
+    size: Tiny
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "base" ]
+    - state: top
+      map: [ "top" ]
+      visible: false
+    - state: open
+      map: [ "open" ]
+      visible: false
+    - state: flame
+      map: [ "flame" ]
+      visible: false
+      shader: unshaded
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        flame:
+          True: { visible: true }
+          False: { visible: false }
+        open:
+          True: { visible: true }
+          False: { visible: false }
+        top:
+          True: { visible: true }
+          False: { visible: false }
+        base:
+          True: { visible: false }
+          False: { visible: true }
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-lit
+        shader: unshaded
+      right:
+      - state: inhand-right-lit
+        shader: unshaded
+  - type: ItemTogglePointLight
+  - type: UseDelay
+  - type: IgnitionSource
+    ignited: false
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: SyndicateFlippo
+  name: Blood-red flippo
+  description: "A 'Valid' choice in lighters. Contains no copper."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Welder
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: Lighter
+  id: DiscountDanLighter
+  name: Discount Dan's lighter
+  description: "The worst lighter ever produced, lighterburn is inevitable, do not refuel while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/lighters.rsi
+    layers:
+    - state: icon_map
+    - state: discount_icon_base
+      map: [ "skin" ]
+    - state: basic_icon_top
+    - state: lighter_flame
+      visible: false
+      shader: unshaded
+      map: [ "flame" ]
+  - type: Welder # the single worst lighter invented by mankind
+    fuelConsumption: 0.2
+    fuelLitCost: 0.1
+    tankSafe: false
+  - type: Item
+    sprite: Objects/Tools/Lighters/lighters.rsi
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-flame
+        shader: unshaded
+      right:
+      - state: inhand-right-flame
+        shader: unshaded
+  - type: RandomSprite
+    available:
+      - skin:
+          discount_icon_base: ""
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 1.5
+    color: yellow
+  - type: ComponentToggler
+    components:
+    - type: DamageOnHolding
+      damage:
+        types:
+          Heat: 2
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 3
+        maxVol: 3
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: CybersunFlippo
+  name: CyberSun Flippo
+  description: "A Sleek black and magenta flippo lighter, bearing the logo and iconography of CyberSun Industries."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: magenta
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: InterdyneFlippo
+  name: Interdyne Flippo
+  description: "A deep blue flippo lighter, decorated with the logo of Interdyne Pharmaceuticals' 'Gene Clean' clinics. Become the master of your own cigarette."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+          Radiation: 1
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: cyan
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: NanotrasenFlippo
+  name: Nanotrasen Flippo
+  description: "A navy blue luxury flippo, generally handed out to loyal heads of staff instead of a payraise. Fueled with liquid plasma"
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 1
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: blue
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 10
+        maxVol: 10
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseCentcommContraband]
+  id: CentCommFlippo
+  name: Gilded CentComm Flippo
+  description: "An Ornate, jade embossed and gilded flippo frame containing a bluespace powered jet. The latch is secured by a miniature access reader that only responds to CentComm officials. The nicest lighter known to man."
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: ItemToggleRequiresLock
+    requireLocked: false
+  - type: Welder #
+    fuelConsumption: 0.0
+    fuelLitCost: 10
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 4 #Excessively powerful
+    color: Gold
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 999
+        maxVol: 999
+  - type: Tool
+    useSound:
+      collection: Welder
+    qualities: Welding
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 0.1
+  - type: Lock
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseMajorContraband]
+  id: SpiderclanFlippo
+  name: Spider-Clan lighter
+  description: "A high tech jet lighter, engineered to function even in deep space. Runs on a tiny microfusion cell."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Welder #
+    fuelConsumption: 0
+    fuelLitCost: 0
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: WaffleCoFlippo
+  name: Waffle Co. flippo
+  description: "A robust mass produced lighter. The Waffle Co. logo turns the spark wheel when pushed up, minimising risk of lighter burns for even the most inept user."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.05
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: brown
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: HonkCoFlippo
+  name: Honk Co. flippo
+  description: "A slippery gag lighter produced by Honk Co. hidden inside of a real banana peel."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: ComponentToggler
+    components:
+    - type: Slippery
+    - type: StepTrigger
+      intersectRatio: 0.2
+    - type: CollisionWake
+      enabled: false
+    - type: Physics
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures:
+        slips:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          layer:
+          - SlipLayer
+          hard: false
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          density: 10
+          mask:
+          - ItemMask
+  - type: Welder #
+    fuelConsumption: 0.1
+    fuelLitCost: 1
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: yellow
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: DonkcoLighter
+  name: Donk Co. flippo
+  description: "The flippo of choice for the seasoned traitor. A Breaded novelty lighter made by Donk Co. Somehow edible while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Welder #
+    fuelConsumption: 0.02
+    fuelLitCost: 0.1
+    tankSafe: true
+  - type: Tag
+    tags:
+    - DonkPocket
+    - Meat
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Omnizine
+          Quantity: 10
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - meaty
+      - cheap
+  - type: ComponentToggler
+    components:
+    - type: Food
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: orange
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 80ab07976b..987e3cbc13 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -119,3 +119,43 @@
     sound:
       path: /Audio/_Sunrise/Items/Handling/matchbox_drop.ogg
   # Sunrise edit end
+
+- type: entity
+  parent: [Matchbox, BaseSyndicateContraband]
+  id: GorlexMatchbox
+  name: Gorlex match box
+  description: "A pneumatic match box styled after the Gorlex Marauders' equipment. Contains 24 matches."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Storage
+    grid:
+    - 0,0,11,1
+  - type: StorageFill
+    contents:
+      - id: GorlexMatchstick
+        amount: 24
+  - type: Matchbox
+
+- type: entity
+  name: match stick
+  parent: [Matchstick, BaseSyndicateContraband]
+  id: GorlexMatchstick
+  description: A military grade match stick, used for lighting fine smokables and noncombatants alike.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    layers:
+      - state: match_unlit
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    heldPrefix: unlit
+    size: Tiny
+  - type: PointLight
+    enabled: false
+    radius: 3
+    color: green
+  - type: Matchstick
+    duration: 30
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index 679c6f22fe..23d7b68d37 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: SprayPainter
   name: spray painter
-  description: A spray painter for painting airlocks and pipes.
+  description: A spray painter for painting airlocks, pipes, and other items.
   components:
   - type: Sprite
     sprite: Objects/Tools/spray_painter.rsi
@@ -32,6 +32,45 @@
       mix: '#947507'
   - type: StaticPrice
     price: 40
+  - type: LimitedCharges
+    maxCharges: 15
+    lastCharges: 15
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
+
+- type: entity
+  parent: SprayPainter
+  id: SprayPainterRecharging
+  suffix: Admeme
+  components:
+  - type: AutoRecharge
+    rechargeDuration: 1
+
+- type: entity
+  parent: SprayPainter
+  id: SprayPainterEmpty
+  suffix: Empty
+  components:
+  - type: LimitedCharges
+    lastCharges: -1
+
+- type: entity
+  parent: BaseItem
+  id: SprayPainterAmmo
+  name: compressed paint
+  description: A cartridge of highly compressed paint, commonly used in spray painters.
+  components:
+  - type: SprayPainterAmmo
+  - type: Sprite
+    sprite: Objects/Tools/spray_painter.rsi
+    state: ammo
+  - type: Item
+    sprite: Objects/Tools/spray_painter.rsi
+    heldPrefix: ammo
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 10
+      Plastic: 10
+  - type: StaticPrice
+    price: 30
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
index 23f5cc4362..fec2cca3ab 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -16,7 +16,8 @@
     - state: wires
   - type: Item
     sprite: Objects/Weapons/Bombs/ied.rsi
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 5
     examinable: false
     initialBeepDelay: 0
@@ -34,6 +35,8 @@
     maxIntensity: 3
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Appearance
   - type: AnimationPlayer
   - type: TimerTriggerVisuals
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 27a6188584..298b9d7c12 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -23,13 +23,16 @@
       damage:
         types:
           Blunt: 5
-    - type: OnUseTimerTrigger
+    - type: TriggerOnUse
+    - type: TimerTrigger
       delay: 120
       beepSound:
         path: /Audio/Machines/Nuke/general_beep.ogg
         params:
           volume: -2
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     - type: Explosive
       explosionType: Default
       maxIntensity: 50
@@ -37,6 +40,8 @@
       totalIntensity: 100
       canCreateVacuum: false
     - type: DeleteOnTrigger
+      keysIn:
+      - timer
     - type: HotPotato
     - type: DamageOnHolding
       enabled: false
@@ -49,7 +54,7 @@
         enum.Trigger.TriggerVisuals.VisualState:
           base:
             Primed: { state: activated }
-            Unprimed: { state: complete }
+            Unprimed: { state: icon }
 
 - type: entity
   id: HotPotatoEffect
@@ -102,6 +107,11 @@
       - !type:TriggerBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+    - BananaPeel
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index d553b2b2a4..8de013afff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -5,7 +5,7 @@
   description: A dark ink pen.
   id: PenExploding
   components:
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 4
     examinable: false
   - type: Explosive
@@ -16,8 +16,11 @@
     canCreateVacuum: false
   - type: ActivateOnPaperOpened
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
+  - type: TriggerOnUse
   - type: TriggerOnSignal
-  - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet, when that functionality is supported.
+  - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet.
     ports:
     - Trigger
   - type: EmitSoundOnUse
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
index a39a1de671..a661224f31 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
@@ -10,7 +10,8 @@
     - state: base
       map: ["enum.TriggerVisualLayers.Base"]
     - state: wires
-  - type: OnUseTimerTrigger # todo: make it activate through welder/lighter/fire instead
+  - type: TriggerOnActivate # todo: make it activate through welder/lighter/fire instead
+  - type: TimerTrigger
     delay: 5
     examinable: false
     initialBeepDelay: 0
@@ -19,6 +20,8 @@
     min: 1
     max: 10
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive # Weak explosion in a very small radius. Doesn't break underplating.
     explosionType: Default
     totalIntensity: 50
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
index 877ad7dc4c..b494fa21f2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -33,7 +33,7 @@
       enum.Trigger.TriggerVisuals.VisualState:
         base:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          Unprimed: { state: icon }
 
 - type: entity
   name: composition C-4
@@ -54,7 +54,20 @@
     quickEquip: false
     equipDelay: 3
     unequipDelay: 6
-  - type: OnUseTimerTrigger
+  - type: TriggerOnActivate
+  - type: TriggerOnSignal
+  - type: TriggerOnStuck
+    keyOut: stuck
+  - type: ToggleTriggerCondition # for toggling the start on stuck ability
+    keys:
+    - stuck
+    toggleVerb: toggle-trigger-condition-stick-verb
+    toggleOn: toggle-trigger-condition-stick-on
+    toggleOff: toggle-trigger-condition-stick-off
+  - type: TimerTrigger
+    keysIn:
+    - trigger
+    - stuck
     delay: 10
     delayOptions: [10, 30, 60, 120, 300]
     initialBeepDelay: 0
@@ -62,12 +75,9 @@
       path: /Audio/_Sunrise/c4_beep1.ogg # Sunrise-Edit
       params:
         volume: 20
-    startOnStick: true
-    canToggleStartOnStick: true
-  - type: TimerStartOnSignal
   - type: DeviceLinkSink
     ports:
-    - Timer
+    - Trigger
   - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
     explosionType: DemolitionCharge
     totalIntensity: 60
@@ -75,6 +85,8 @@
     maxIntensity: 30
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: HolidayVisuals
     holidays:
       festive:
@@ -97,7 +109,20 @@
     layers:
     - state: icon
       map: ["base"]
-  - type: OnUseTimerTrigger
+  - type: TriggerOnActivate
+  - type: TriggerOnSignal
+  - type: TriggerOnStuck
+    keyOut: stuck
+  - type: ToggleTriggerCondition # for toggling the start on stuck ability
+    keys:
+    - stuck
+    toggleVerb: toggle-trigger-condition-stick-verb
+    toggleOn: toggle-trigger-condition-stick-on
+    toggleOff: toggle-trigger-condition-stick-off
+  - type: TimerTrigger
+    keysIn:
+    - trigger
+    - stuck
     delay: 5
     delayOptions: [5, 10, 15, 20]
     initialBeepDelay: 0
@@ -105,12 +130,9 @@
       path: /Audio/Effects/Cargo/buzz_two.ogg
       params:
         volume: -6
-    startOnStick: false
-    canToggleStartOnStick: true
-  - type: TimerStartOnSignal
   - type: DeviceLinkSink
     ports:
-    - Timer
+    - Trigger
   - type: Explosive
     explosionType: Cryo
     totalIntensity: 120
@@ -118,3 +140,5 @@
     maxIntensity: 30
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
index 2e9f54c068..ff0920f01b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
@@ -12,7 +12,8 @@
     sprite: Objects/Weapons/Bombs/spidercharge.rsi
     size: Small
   - type: SpiderCharge
-  - type: OnUseTimerTrigger
+  - type: TriggerOnStuck
+  - type: TimerTrigger
     delay: 10
     delayOptions: [5, 10, 30, 60]
     initialBeepDelay: 0
@@ -20,8 +21,6 @@
       path: /Audio/_Sunrise/c4_beep1.ogg # Sunrise-Edit
       params:
         volume: 20
-    startOnStick: true
-  - type: AutomatedTimer
   - type: Sticky
     stickDelay: 5
     stickPopupStart: comp-sticky-start-stick-bomb
@@ -32,7 +31,7 @@
       components:
       - Anchorable
       - Item
-      - Body
+      - MobState
   - type: Explosive # Powerful explosion in a large radius. Will break underplating.
     explosionType: DemolitionCharge
     totalIntensity: 360
@@ -40,6 +39,8 @@
     maxIntensity: 120
     canCreateVacuum: true
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: StickyVisualizer
   - type: Appearance
   - type: GenericVisualizer
@@ -47,4 +48,4 @@
       enum.Trigger.TriggerVisuals.VisualState:
         base:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          Unprimed: { state: icon }
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index bf3685d96b..4c3207b9c5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -32,25 +32,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: BaseMagazineCaselessRifleShort
-  name: "caseless rifle short magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  abstract: true
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 10
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: BaseMagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
@@ -81,21 +62,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: MagazineCaselessRifle10x24
-  name: "box magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 50 #sunrise-edit
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-
 - type: entity
   id: MagazinePistolCaselessRifle
   name: "pistol magazine (.25 caseless)"
@@ -106,7 +72,7 @@
     proto: CartridgeCaselessRifle
     capacity: 10
   - type: Sprite
-    slayers:
+    layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
@@ -202,51 +168,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#dbdbdb"
-
-- type: entity
-  id: MagazineCaselessRifleShort
-  name: "short magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineCaselessRifleShortPractice
-  name: "short magazine (.25 caseless practice)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRiflePractice
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index 245bfd9788..4cda0e748e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -238,36 +238,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#ff6e52"
-
-- type: entity
-  id: MagazineLightRifleMaxim
-  name: "pan magazine (.30 rifle)"
-  parent: BaseMagazineLightRifle
-  components:
-  - type: Tag
-    tags:
-      - MagazineLightRiflePan
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifleSP
-    capacity: 96
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi
-
-- type: entity
-  id: MagazineLightRiflePkBox
-  name: "PK munitions box (.30 rifle)"
-  parent: BaseMagazineLightRifle
-  components:
-  - type: Tag
-    tags:
-      - MagazineLightRifleBox
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifleSP
-    capacity: 80
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 6c4d61431f..3ac9dd3f9f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -14,39 +14,6 @@
         - CartridgeMagnum
     capacity: 7
 
-- type: entity
-  id: BaseMagazineMagnumSubMachineGun
-  name: SMG magazine (.45 magnum)
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-      - MagazineMagnumSubMachineGun
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    whitelist:
-      tags:
-        - CartridgeMagnum
-    capacity: 25
-  - type: Item
-    size: Small
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: MagazineMagnumEmpty
   name: pistol magazine (.45 magnum any)
@@ -203,122 +170,3 @@
       - state: inhand-right-mag
       - state: inhand-right-stripe
         color: "#540000"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunEmpty
-  name: SMG magazine (.45 magnum any)
-  suffix: empty
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: null
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineMagnumSubMachineGun
-  name: SMG magazine (.45 magnum)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumFMJ
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      right:
-      - state: inhand-right-mag
-
-- type: entity
-  id: MagazineMagnumSubMachineGunPractice
-  name: SMG magazine (.45 magnum practice)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumPractice
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#dbdbdb"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#dbdbdb"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#dbdbdb"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunUranium
-  name: SMG magazine (.45 magnum uranium)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumUranium
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#00cd42"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#00cd42"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#00cd42"
-
-- type: entity
-  id: MagazineMagnumSubMachineGunPiercing
-  name: SMG magazine (.45 magnum armour-piercing)
-  parent: BaseMagazineMagnumSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumAP
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: stripe
-      color: "#540000"
-  - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left-mag
-      - state: inhand-left-stripe
-        color: "#540000"
-      right:
-      - state: inhand-right-mag
-      - state: inhand-right-stripe
-        color: "#540000"
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 3f7dbe3170..02aab56f7b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -69,7 +69,5 @@
     damage:
       types:
         Piercing: 5
-  - type: StaminaDamageOnCollide # Sunrise-Add
-    damage: 10  # Sunrise-Add
   - type: TimedDespawn
     lifetime: 0.25
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml
index f50c8a6d8d..ffe8af3e0f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml
@@ -18,6 +18,7 @@
     proto: ProjectileHealingBolt
     capacity: 10
     count: 10
+  - type: PacifismAllowedGun
 
 - type: entity
   name: staff of entrance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 872f5c770a..e5a50c2774 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -125,7 +125,7 @@
 
 - type: entity
   name: svalinn laser pistol
-  parent: [ BaseWeaponPowerCellSmall, BaseSecurityContraband ]
+  parent: [BaseWeaponPowerCellSmall, BaseSecurityContraband]
   id: WeaponLaserSvalinn
   description: A cheap and widely used laser pistol.
   components:
@@ -146,7 +146,7 @@
 
 - type: entity
   name: retro laser blaster
-  parent: [ BaseWeaponBatterySmall, BaseMajorContraband ]
+  parent: [BaseWeaponBatterySmall, BaseMajorContraband]
   id: WeaponLaserGun
   description: A weapon using light amplified by the stimulated emission of radiation.
   components:
@@ -169,7 +169,7 @@
 
 - type: entity
   name: makeshift laser pistol
-  parent: BaseWeaponBatterySmall
+  parent: [BaseWeaponBatterySmall, BaseMinorContraband]
   id: WeaponMakeshiftLaser
   description: Better pray it won't burn your hands off.
   components:
@@ -197,7 +197,7 @@
 
 - type: entity
   name: tesla gun
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseMajorContraband]
   id: WeaponTeslaGun
   description: The power of the primordial element of lightning in your hands.
   components:
@@ -270,7 +270,7 @@
 
 # - type: entity #  Sunrise-Edit Moved to _Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
 #   name: pulse pistol
-#   parent: BaseWeaponBatterySmall
+#   parent: [BaseWeaponBatterySmall, BaseCentcommContraband]
 #   id: WeaponPulsePistol
 #   description: A state of the art energy pistol favoured as a sidearm by the NT operatives.
 #   components:
@@ -341,7 +341,7 @@
 
 # - type: entity
 #   name: pulse rifle
-#   parent: [BaseWeaponBattery, BaseGunWieldable]
+#   parent: [BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband]
 #   id: WeaponPulseRifle
 #   description: A weapon that is almost as infamous as its users.
 #   components:
@@ -405,7 +405,7 @@
 
 - type: entity
   name: portable particle decelerator
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseEngineeringContraband]
   id: WeaponParticleDecelerator
   description: A portable particle decelerator capable of decomposing a tesla or singularity.
   components:
@@ -503,7 +503,7 @@
 
 - type: entity
   name: disabler
-  parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ]
+  parent: [WeaponDisablerPractice, BaseSecurityCommandContraband]
   id: WeaponDisabler
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
   components:
@@ -531,7 +531,7 @@
 
 - type: entity
   name: disabler SMG
-  parent: [ BaseWeaponBattery, BaseSecurityContraband ]
+  parent: [BaseWeaponBattery, BaseSecurityContraband]
   id: WeaponDisablerSMG
   description: Advanced weapon that exhausts organic targets, weakening them until they collapse.
   components:
@@ -569,9 +569,9 @@
 
 - type: entity
   name: taser
-  parent: [ BaseWeaponBatterySmall, BaseSecurityContraband ]
+  parent: [BaseWeaponBatterySmall, BaseSecurityContraband]
   id: WeaponTaser
-  description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
+  description: A low-capacity, energy-based stun gun used by security teams to subdue targets at close range.
   components:
   - type: Tag
     tags:
@@ -604,6 +604,23 @@
     zeroVisible: true
   - type: Appearance
 
+- type: entity
+  name: elite taser
+  parent: [ BaseCentcommContraband, WeaponTaser ]
+  id: WeaponTaserSuper
+  suffix: ADMEME
+  description: A low-capacity, energy-based stun gun used by elite security teams to disable even the toughest of targets.
+  components:
+  - type: Gun
+    fireRate: 0.5
+    soundGunshot:
+      path: /Audio/Effects/tesla_collapse.ogg # The wrath of god...
+      params:
+        volume: -6
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletTaserSuper
+    fireCost: 200
+
 - type: entity
   name: antique laser pistol
   parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
@@ -650,7 +667,7 @@
 
 - type: entity
   name: advanced laser pistol
-  parent: [ BaseWeaponBatterySmall, BaseSecurityContraband]
+  parent: [BaseWeaponBatterySmall, BaseSecurityContraband]
   id: WeaponAdvancedLaser
   description: An experimental high-energy laser pistol with a self-charging nuclear battery.
   components:
@@ -734,7 +751,7 @@
   name: experimental C.H.I.M.P. handcannon
   parent: [WeaponPistolCHIMP, BaseSyndicateContraband]
   id: WeaponPistolCHIMPUpgraded
-  description: This C.H.I.M.P. seems to have a greater punch than is usual...
+  description: This C.H.I.M.P. seems to have a greater punch than usual...
   components:
   - type: BatteryWeaponFireModes
     fireModes:
@@ -835,7 +852,7 @@
 
 - type: entity
   name: temperature gun
-  parent: [BaseWeaponBattery, BaseGunWieldable]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponTemperatureGun
   description: An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime.
   components:
@@ -879,12 +896,12 @@
 
 - type: entity
   name: xenoborg laser gun
-  parent: [ WeaponAdvancedLaser, BaseXenoborgContraband ]
+  parent: [WeaponAdvancedLaser, BaseXenoborgContraband]
   id: XenoborgLaserGun
 
 - type: entity
   name: xenoborg heavy laser gun
-  parent: [ WeaponAdvancedLaser, BaseXenoborgContraband ]
+  parent: [WeaponAdvancedLaser, BaseXenoborgContraband]
   id: XenoborgHeavyLaserGun
   components:
   - type: HitscanBatteryAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 4820683508..e4d257a7db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -8,6 +8,11 @@
   - type: Sprite
   - type: Item
     size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: HeldSpeedModifier
   - type: Gun
     fireRate: 20
     selectedMode: FullAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 2c770adaa0..1e61fa3295 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -20,7 +20,7 @@
       projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+          bounds: "-0.1,-0.3,0.1,-0.1"
         hard: false
         mask:
         - Impassable
@@ -185,3 +185,28 @@
   - type: Construction
     graph: ImprovisedArrowCarp
     node: ImprovisedArrowCarp
+
+- type: entity
+  parent: BaseArrow
+  id: ArrowCard
+  name: cardboard arrow
+  description: Cant kill no matter how hard you try.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi
+    layers:
+    - state: tail
+      color: white
+    - state: rod
+      color: brown
+    - state: tip
+      color: brown
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 1
+  - type: StaminaDamageOnCollide
+    damage: 10
+  - type: Construction
+    graph: CardArrow
+    node: CardArrow
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index c587787d48..d1b50429f9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -93,7 +93,7 @@
     disableWhenFirstOpened: true
     whitelist:
       components:
-        - Body
+        - MobState
   - type: LockVisuals
     stateLocked: cursed_door
     stateUnlocked: decursed_door
@@ -161,6 +161,7 @@
 
 - type: entity
   id: ProjectilePolyboltBase
+  abstract: true
   parent: BaseBullet
   categories: [ HideSpawnMenu ]
   components:
@@ -175,6 +176,8 @@
         Poison: 5
   - type: TriggerOnCollide
     fixtureID: projectile
+  - type: PolymorphOnTrigger
+    targetUser: true
 
 - type: entity
   id: ProjectilePolyboltCarp
@@ -185,10 +188,10 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: WizardForcedCarp
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
 
 - type: entity
   id: ProjectilePolyboltMonkey
@@ -199,10 +202,10 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: WizardForcedMonkey
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
 
 - type: entity
   id: ProjectilePolyboltDoor
@@ -218,8 +221,8 @@
       color: brown
   - type: PolymorphOnTrigger
     polymorph: WizardWallDoor
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
       - Airlock
       - Firelock
@@ -269,10 +272,10 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: WizardForcedCluwne
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
 
 - type: entity
   id: ProjectileIcicle
@@ -299,7 +302,7 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: BreadMorph
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 8d0f73eae7..16fb962122 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -216,12 +216,46 @@
   - type: Projectile
     damage:
       types:
-        Heat: 1 #Sunrise-Edit
+        Shock: 1
     soundHit:
       path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
     forceSound: true
+  - type: TimedDespawn
+    lifetime: 0.170 # Very short range
   - type: StunOnCollide
-    knockdownAmount: 0.5 #Sunrise-Edit
+    stunAmount: 0
+    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong
+    slowdownAmount: 2.5
+    walkSpeedModifier: 0.5
+    sprintSpeedModifier: 0.5
+
+- type: entity
+  parent: BulletTaser
+  id: BulletTaserSuper
+  categories: [ HideSpawnMenu ]
+  name: taser bolt
+  description: If you can see this, you've probably been stun-meta'd
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
+    color: "#ffff33"
+    layers:
+    - state: tesla_projectile
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#ffff33"
+    radius: 2.0
+    energy: 7.01
+  - type: TimedDespawn
+    lifetime: 1.0 # Not so short range
+  - type: StunOnCollide
+    stunAmount: 5
+    knockdownAmount: 10
+    slowdownAmount: 10
+    walkSpeedModifier: 0.5
+    sprintSpeedModifier: 0.5
 
 - type: entity
   name : disabler bolt
@@ -500,7 +534,7 @@
     impactEffect: BulletImpactEffectKinetic
     damage:
       types:
-        Blunt: 25
+        Blunt: 15
         Structural: 30
   # Short lifespan
   - type: TimedDespawn
@@ -557,8 +591,8 @@
         - MobState
     damage:
       types:
-        Blunt: 20
-        Slash: 5
+        Blunt: 18
+        Slash: 4
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
@@ -568,6 +602,21 @@
   - type: TimedDespawn
     lifetime: 0.4
 
+  # Deals less damage, glaive has better HP recovery
+- type: entity
+  id: BulletChargeGlaive
+  name: leech bolt
+  parent: BulletCharge
+  components:
+  - type: DamageMarkerOnCollide
+    whitelist:
+      components:
+        - MobState
+    damage:
+      types:
+        Blunt: 1
+        Slash: 5
+
 - type: entity
   parent: BaseBullet
   id: AnomalousParticleDelta
@@ -835,11 +884,8 @@
     range: 7
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
-  - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: DeleteOnTrigger
 
-# This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity
   id: BulletGrenadeFragContact
   name: frag grenade
@@ -874,8 +920,6 @@
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
     - state: cleanade
-  - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: SmokeOnTrigger
     duration: 3.5
     spreadAmount: 30
@@ -884,7 +928,7 @@
       reagents:
       - ReagentId: SpaceCleaner
         Quantity: 30
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: ExplodeOnTrigger
   - type: Explosive
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index df7997f152..27cf800fc4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -219,6 +219,71 @@
     graph: LecterSecurity
     node: start   # Sunrise-end
 
+- type: entity
+  name: Estoc DMR
+  parent: [BaseWeaponRifle, BaseSyndicateContraband]
+  id: WeaponRifleEstoc
+  description: A designated marksman rifle, favored for medium-to-long range engagements. Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Rifles/estoc.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Rifles/estoc.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/estocshot.ogg
+    minAngle: 30
+    maxAngle: 43
+    shotsPerBurst: 3
+    selectedMode: Burst
+    availableModes:
+    - Burst
+    - SemiAuto
+    burstFireRate: 14
+  - type: GunWieldBonus
+    minAngle: -28
+    maxAngle: -25
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+          - MagazineRifle
+        whitelistFailPopup: gun-magazine-whitelist-fail
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifle
+        priority: 1
+        whitelist:
+          tags:
+          - CartridgeRifle
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.75
+    sprintModifier: 0.75
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 2
+    pvsIncrease: 0.2
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+
 - type: entity
   name: Foam Force Astro Ace
   parent: [BaseWeaponShotgun, BaseGunWieldable]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 477aa5a934..72a2a1f828 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -214,7 +214,7 @@
 
 - type: entity
   name: WT550
-  parent: [ BaseWeaponSubMachineGun, BaseSecurityContraband ]
+  parent: [BaseWeaponSubMachineGun, BaseSecurityContraband]
   id: WeaponSubMachineGunWt550
   description: A truly unique firearm, the WT550 was designed by Nanotrasen's Small Arms Division as a compact submachine gun fully controllable with one hand. It contains an exotic internal recoil buffer and feeds from special top-mounted .35 magazines.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 354ec96a67..2b805fa06c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -138,8 +138,8 @@
     fireRate: 3
     soundGunshot:
       collection: m3 # Sunrise-Edit
-  - type: GunSpreadModifier # Sunrise-add #Port WZ #37731
-    spread: 0.6 # Sunrise-add
+  - type: GunSpreadModifier
+    spread: 0.6
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -232,8 +232,8 @@
     fireRate: 3
     soundGunshot:
       collection: m3 # Sunrise-Edit
-  - type: GunSpreadModifier # Sunrise-add #Port WZ #37731
-    spread: 1.4 # Sunrise-add
+  - type: GunSpreadModifier
+    spread: 1.4
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 6e2675a6b3..f88cf79763 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -70,6 +70,45 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+    layers:
+    - state: base
+    - state: base1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: base
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Piercing: 12
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: MeleeRequiresWield
+  - type: AltFireMelee
+    attackType: Heavy
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 2
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 2
+  - type: Sharp
+    butcherDelayModifier: 2 #It's a bayonet
   - type: GunRequiresWield
   - type: StaticPrice
     price: 500
@@ -95,7 +134,7 @@
   name: Hristov
   parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband]
   id: WeaponSniperHristov
-  description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
+  description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
index c930b57a27..79f5aa220a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
@@ -47,7 +47,7 @@
   - type: Repairable
     qualityNeeded: "Anchoring"
     doAfterDelay: 3
-  - type: TriggerWhenEmpty
+  - type: TriggerOnEmptyGunshot
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_energy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_energy.yml
index 077d5dc5fd..40c67c898d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_energy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_energy.yml
@@ -144,6 +144,7 @@
   components:
   - type: AccessReader
     access: [["StationAi"], ["ResearchDirector"]]
+  - type: StationAiTurret
   - type: TurretTargetSettings
     exemptAccessLevels:
     - Borg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index b528ee7a97..95fc02658b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -105,6 +105,40 @@
     containers:
       storagebase: !type:Container
         ents: []
+
+- type: entity
+  name: experimental pie cannon
+  parent: BaseWeaponBattery
+  id: BorgLauncherCreamPie
+  description: Deliver a generous portion of cream directly to the crew! Automatically bakes pies over time.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
+    layers:
+    - state: piecannon
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Effects/thunk.ogg
+    soundEmpty:
+      path: /Audio/Items/hiss.ogg
+    clumsyProof: true
+  - type: ProjectileBatteryAmmoProvider
+    proto: FoodPieBananaCream
+    fireCost: 30
+  - type: Battery
+    maxCharge: 90
+    startingCharge: 90
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 1
+  - type: AmmoCounter
+  - type: Item
+    size: Normal
         
 - type: entity
   name: syringe gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index b09dfee840..3aa5b041f8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -23,6 +23,11 @@
         Structural: 10
   - type: Item
     size: Normal
+    shape:
+    - 0,0,0,3
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/baseball_bat.rsi
   - type: Tool
     qualities:
     - Rolling
@@ -54,6 +59,11 @@
     state: icon
   - type: Item
     size: Normal
+    shape:
+    - 0,0,0,3
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/incomplete_bat.rsi
     sprite: Objects/Weapons/Melee/incomplete_bat.rsi
   - type: Construction
     graph: WoodenBat
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 0cdc4d89e4..b1dcf6e121 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -54,7 +54,7 @@
 - type: entity
   id: FireAxeFlaming
   name: fire axe
-  parent: [ BaseSyndicateContraband, FireAxe ]
+  parent: [BaseSyndicateContraband, FireAxe]
   description: Why fight fire with an axe when you can fight with fire and axe? Now featuring rugged rubberized handle!
   components:
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 80a1c284be..589908b7d7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -120,6 +120,21 @@
     malus: 0.225
   - type: ThrowingAngle
     angle: 225
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          radius: 0.01
+          vertices:
+          - -0.4,-0.2
+          - -0.2,-0.4
+          - 0.4,0.2
+          - 0.2,0.4
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   name: survival knife
@@ -155,7 +170,7 @@
     storedSprite: null
 
 - type: entity
-  parent: ClothingHeadHatGreyFlatcap
+  parent: [ClothingHeadHatGreyFlatcap, BaseMinorContraband]
   id: BladedFlatcapGrey
   name: grey flatcap
   description: Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim.
@@ -184,7 +199,7 @@
   parent: BladedFlatcapGrey
   id: BladedFlatcapBrown
   name: brown flatcap
-  description: Stupid clown! You made me look bad! It has glass shards hidden in the brim.
+  description: "\"Stupid clown! You made me look bad!\" It has glass shards hidden in the brim."
   components:
   - type: Construction
     graph: BladedFlatcapBrown
@@ -322,3 +337,18 @@
     angle: 225
   - type: StaticPrice
     price: 500 # 2000 for a set of 4
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          radius: 0.01
+          vertices:
+          - -0.475,-0.225
+          - -0.225,-0.475
+          - 0.525,0.275
+          - 0.275,0.525
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index daabb661cf..cc09a5a378 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -106,6 +106,7 @@
     enabled: false
     radius: 4
 
+# Very high burst damage if you land a mark, while also providing a small amount of healing.
 - type: entity
   parent: [BaseWeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusher
@@ -132,7 +133,7 @@
   - type: LeechOnMarker
     leech:
       groups:
-        Brute: -10
+        Brute: -6
   - type: Gun
     soundGunshot: /Audio/Weapons/plasma_cutter.ogg
     fireRate: 1
@@ -146,25 +147,26 @@
     capacity: 1
     count: 1
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1
     wideAnimationRotation: -135
     damage:
       types:
-        Blunt: 20 #sunrise-start
-        Slash: 10 #sunrise-end
+        Blunt: 6
+        Slash: 4
     soundHit:
       collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2.5
-        Slash: 2.5
+        Blunt: 6
+        Slash: 2
         Structural: 30
   - type: GunRequiresWield
   - type: DisarmMalus
   - type: Prying
 
+# No mark ability in exchange for wideswing, autoattack, and being one-handed
 - type: entity
   parent: [ BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusherDagger
@@ -193,13 +195,28 @@
     malus: 0.225
   - type: ThrowingAngle
     angle: 225
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          radius: 0.01
+          vertices:
+          - -0.4,-0.2
+          - -0.2,-0.4
+          - 0.4,0.2
+          - 0.2,0.4
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
-# Like a crusher... but better healing
+# Less mark damage in exchange for more healing. Also has a better ratio of blunt to slash damage, but less structural.
 - type: entity
   parent: [ WeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusherGlaive
   name: crusher glaive
-  description: An early design of the proto-kinetic accelerator, in glaive form.
+  description: An early design of the proto-kinetic accelerator, in glaive form. Provides better healing in exchange for less charged damage.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_glaive.rsi
@@ -215,15 +232,27 @@
     - suitStorage
   - type: UseDelay
     delay: 1.9
+  - type: BasicEntityAmmoProvider
+    proto: BulletChargeGlaive
+    capacity: 1
+    count: 1
   - type: LeechOnMarker
     leech:
       groups:
         Brute: -21
-  - type: MeleeWeapon
-    damage: #sunrise-start
-      types:
-        Blunt: 6.5
-        Slash: 2.5 #sunrise-end
   - type: Tag
     tags:
       - Pickaxe
+  - type: MeleeWeapon
+    attackRate: 1
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 3
+        Slash: 7
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 2
+        Slash: 6
+        Structural: 20
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml
new file mode 100644
index 0000000000..1d2081fe93
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml
@@ -0,0 +1,85 @@
+- type: entity
+  parent: BaseItem
+  id: OffsetCane
+  name: standard offset cane
+  description: A standard offset cane, essential for getting around when your legs aren't up to the task. May or may not grant you the wisdom of the elderly.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/standard.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Weapons/Melee/offset_canes/standard.rsi
+#  - type: RandomSprite # Ideally I'd rather these be their own selectable item instead of randomly picked.
+#    available:
+#    - color: "#91949C"  # standard gray
+#    - color: "#000000"  # black
+#    - color: "#406BDE"  # blue
+#    - color: "#00FFFF"  # cyan
+#    - color: "#00FF00"  # green
+#    - color: "#FF69B4"  # pink
+#    - color: "#800080"  # purple
+#    - color: "#FF0000"  # red
+#    - color: "#FFFF00"  # yellow
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Blunt: 5
+  - type: StaminaDamageOnHit
+    damage: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 3
+  - type: UseDelay
+    delay: 1
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneClown
+  name: rainbow offset cane
+  description: A rainbow offset cane, perfect for clowns and those who enjoy a splash of color in their lives.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/clown.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/clown.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneMime
+  name: striped offset cane
+  description: A black and white striped cane, perfect for silent performances.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/mime.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/mime.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneNT
+  name: nanotrasen offset cane
+  description: A nanotrasen standard issue offset cane with the NT logo, favored by those who prefer a more corporate look.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/nanotrasen.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/nanotrasen.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneWood
+  name: wooden offset cane
+  description: A wooden offset cane, a classic choice for those who appreciate natural materials and a sturdy grip.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/wood.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/wood.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index 7e4071b37e..69f3700426 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -49,3 +49,13 @@
     canMoveBreakout: true
     maxEnsnares: 1
   - type: LandAtCursor
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.4
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 9d53f43437..d2500199a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -14,7 +14,8 @@
     quickEquip: false
     slots:
     - Belt
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 3
   - type: Damageable
     damageContainer: Inorganic
@@ -25,6 +26,7 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Appearance
@@ -38,6 +40,16 @@
   - type: Tag
     tags:
     - HandGrenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   name: explosive grenade
@@ -46,13 +58,15 @@
   id: ExGrenade
   components:
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default
     maxIntensity: 10
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -76,15 +90,24 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/flashbang.rsi
   - type: FlashOnTrigger
+    keysIn:
+    - timer
     range: 7
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/_Sunrise/flashbang.ogg" # Sunrise-Edit
       params:
         volume: 20
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
+    predicted: true
   - type: Appearance
   - type: TimerTriggerVisuals
     primingSound:
@@ -141,11 +164,14 @@
         damage: 45
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # immediately explode
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Minibomb
     totalIntensity: 200
@@ -175,13 +201,15 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Minibomb
     totalIntensity: 400
     intensitySlope: 30
     maxIntensity: 125
     canCreateVacuum: true
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 4.5
     beepSound:
       path: /Audio/Effects/Grenades/SelfDestruct/SDS_Charge2.ogg
@@ -199,7 +227,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/singularitygrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
     beepInterval: 0.46
     beepSound:
@@ -211,14 +239,20 @@
       path: /Audio/Effects/Grenades/Supermatter/smbeep.ogg
       params:
         volume: -5
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
-      volume: 5
+      params:
+        volume: 5
   - type: AnchorOnTrigger
+    keysIn:
+    - timer
     removeOnTrigger: true
   - type: TwoStageTrigger
+    keysIn:
+    - timer
     triggerDelay: 10.45
     components:
       - type: AmbientSound
@@ -242,12 +276,16 @@
         radius: 6
         softness: 1
         offset: "0, 0"
-      - type: SoundOnTrigger
+      - type: EmitSoundOnTrigger
         sound:
           path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
           params:
             volume: 5
+        keysIn:
+        - stageTwo
       - type: DeleteOnTrigger
+        keysIn:
+        - stageTwo
   - type: StaticPrice
     price: 1000
 
@@ -259,14 +297,20 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/whiteholegrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
     beepInterval: 0.69
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Grenades/Supermatter/whitehole_start.ogg
-      volume: 5
+      params:
+        volume: 5
+  - type: AnchorOnTrigger
+    keysIn:
+    - timer
+    removeOnTrigger: true
   - type: TwoStageTrigger
     triggerDelay: 11.14
     components:
@@ -291,12 +335,17 @@
         radius: 6
         softness: 1
         offset: "0, 0"
-      - type: SoundOnTrigger
+      - type: EmitSoundOnTrigger
+        keysIn:
+        - stageTwo
         sound:
           path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
           params:
             volume: 15
+        positional: true
       - type: DeleteOnTrigger
+        keysIn:
+        - stageTwo
   - type: StaticPrice
     price: 1000
 
@@ -308,9 +357,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/nukenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default
     totalIntensity: 20000 # ~15 tile radius.
@@ -323,6 +374,7 @@
         damage: 50
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # immediately explode
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Appearance
@@ -387,9 +439,13 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/empgrenade.rsi
   - type: EmpOnTrigger
+    keysIn:
+    - timer
     range: 11 #5.5 Sunrise-Edit
     energyConsumption: 50000
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: Appearance
   - type: TimerTriggerVisuals
     primingSound:
@@ -406,13 +462,15 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/holyhandgrenade.rsi
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default # same as macrobomb
     totalIntensity: 3500
     intensitySlope: 15
     maxIntensity: 70
     canCreateVacuum: true
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3 # by canon
   - type: PointLight
     radius: 7
@@ -433,6 +491,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/smoke.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 45 # Sunrise-Edit
     spreadAmount: 50
   - type: SoundOnTrigger
@@ -441,6 +501,8 @@
       params:
         volume: 15
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Items/smoke_grenade_prime.ogg
@@ -461,6 +523,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/janitor.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 15
     spreadAmount: 50
     smokePrototype: Foam
@@ -485,6 +549,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/tear_gas.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 10
     spreadAmount: 30
     smokePrototype: TearGasSmokeWhite
@@ -508,9 +574,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/metalfoam.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 10
     spreadAmount: 20
     smokePrototype: AluminiumMetalFoam
@@ -532,14 +600,18 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/airboom.rsi
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Items/smoke_grenade_prime.ogg
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
   - type: ReleaseGasOnTrigger
+    keysIn:
+    - timer
     removeFraction: 0.25
     air:
       volume: 1000
@@ -567,9 +639,16 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/grenade.rsi
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
-  - type: SoundOnTrigger
+    predicted: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg
   - type: Appearance
@@ -589,9 +668,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/syndgrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index 2b6c0b9196..41e6772b99 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -7,6 +7,8 @@
   - type: Damageable
     damageContainer: Inorganic
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: Destructible
     thresholds:
     - trigger:
@@ -14,6 +16,7 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
@@ -28,6 +31,16 @@
   - type: Tag
     tags:
     - HandGrenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   parent: [ProjectileGrenadeBase, BaseSecurityContraband]
@@ -44,11 +57,17 @@
     fillPrototype: PelletClusterRubber
     capacity: 30
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
-  - type: OnUseTimerTrigger
+    predicted: true
+  - type: TriggerOnUse
+  - type: TimerTrigger
     initialBeepDelay: 0
     beepInterval: 2
     delay: 3.5
@@ -77,7 +96,8 @@
   - type: ProjectileGrenade
     fillPrototype: PelletClusterIncendiary
     capacity: 30
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -86,6 +106,8 @@
     beepInterval: 2
     delay: 3.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
   - type: StaticPrice
@@ -112,7 +134,8 @@
   - type: ProjectileGrenade
     fillPrototype: PelletClusterLethal
     capacity: 30
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -121,6 +144,8 @@
     beepInterval: 2
     delay: 3.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index 0fbc9e1694..ce031ba6ff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -17,12 +17,24 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
   - type: ScatteringGrenade
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 3
   - type: Tag
     tags:
     - HandGrenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 20 # derived from base_item
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
 
 - type: entity
   parent: [ScatteringGrenadeBase, BaseSecurityContraband]
@@ -71,6 +83,8 @@
           Primed: { state: primed }
           Unprimed: { state: icon }
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
 
@@ -88,7 +102,7 @@
   - type: ScatteringGrenade
     fillPrototype: ExGrenade
     distance: 4
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -96,6 +110,8 @@
     initialBeepDelay: 0
     beepInterval: 0.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
   - type: StaticPrice
@@ -120,6 +136,8 @@
       types:
         Blunt: 10
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Items/bikehorn.ogg"
 
@@ -145,6 +163,8 @@
       types:
         Blunt: 10
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: StaticPrice
@@ -167,7 +187,7 @@
     fillPrototype: BulletFoam
     capacity: 30
     velocity: 30
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -175,5 +195,7 @@
     initialBeepDelay: 0
     beepInterval: 2
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 9448bd05e4..6c4601e698 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -151,9 +151,9 @@
       sprite: Objects/Weapons/Melee/flash.rsi
       layers:
       - state: flash
-        map: [ "enum.FlashVisuals.BaseLayer" ]
+        map: [ "enum.FlashVisualLayers.BaseLayer" ]
       - state: flashing
-        map: [ "enum.FlashVisuals.LightLayer" ]
+        map: [ "enum.FlashVisualLayers.LightLayer" ]
         visible: false
         shader: unshaded
     - type: Flash
@@ -169,16 +169,18 @@
       size: Small
       sprite: Objects/Weapons/Melee/flash.rsi
     - type: UseDelay
+      delay: 4 # has to be the same as the FlashingTime datafield in FlashComponent
+    - type: UseDelayOnMeleeHit
     - type: StaticPrice
       price: 40
     - type: Appearance
     - type: GenericVisualizer
       visuals:
         enum.FlashVisuals.Burnt:
-          enum.FlashVisuals.BaseLayer:
+          enum.FlashVisualLayers.BaseLayer:
             True: {state: burnt}
         enum.FlashVisuals.Flashing:
-          enum.FlashVisuals.LightLayer:
+          enum.FlashVisualLayers.LightLayer:
             True: {visible: true}
             False: {visible: false}
     - type: GuideHelp
@@ -206,6 +208,7 @@
   description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only.
   components:
     - type: EmitSoundOnTrigger
+      predicted: true
       sound:
         path: /Audio/Weapons/flash.ogg
     - type: FlashOnTrigger
diff --git a/Resources/Prototypes/Entities/StatusEffects/misc.yml b/Resources/Prototypes/Entities/StatusEffects/misc.yml
new file mode 100644
index 0000000000..3ce81081c0
--- /dev/null
+++ b/Resources/Prototypes/Entities/StatusEffects/misc.yml
@@ -0,0 +1,80 @@
+- type: entity
+  id: StatusEffectBase
+  abstract: true
+  components:
+  - type: StatusEffect
+  - type: Sprite
+    drawdepth: Effects
+  - type: Tag
+    tags:
+    - HideContextMenu
+
+- type: entity
+  parent: StatusEffectBase
+  id: MobStatusEffectBase
+  abstract: true
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+
+# 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 # 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: MobStatusEffectDebuff
+  id: StatusEffectDrowsiness
+  name: drowsiness
+  components:
+  - type: DrowsinessStatusEffect
+
+# Adds drugs overlay
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectSeeingRainbow
+  name: hallucinations
+  components:
+  - type: SeeingRainbowsStatusEffect
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
new file mode 100644
index 0000000000..a6cbd20724
--- /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 ea394c3c1b..4f03403e25 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BoozeDispenser
+  id: BoozeDispenserEmpty
   name: booze dispenser
-  suffix: Filled
+  suffix: Empty
   description: A booze dispenser with a single slot for a container to be filled.
   parent: ReagentDispenserBase
   components:
@@ -15,6 +15,22 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: BoozeDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+  - type: StealTarget
+    stealGroup: BoozeDispenser
+
+- type: entity
+  id: BoozeDispenser
+  suffix: Filled
+  parent: BoozeDispenserEmpty
+  components:
   - type: StorageFill
     contents:
     - id: DrinkAleBottleFullGrowler
@@ -29,23 +45,3 @@
     - id: DrinkVodkaBottleFull
     - id: DrinkWhiskeyBottleFull
     - id: DrinkWineBottleFull
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: BoozeDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-  - type: StealTarget
-    stealGroup: BoozeDispenser
-
-- type: entity
-  id: BoozeDispenserEmpty
-  suffix: Empty
-  parent: BoozeDispenser
-  components:
-  - type: Storage
-    whitelist:
-      tags:
-      - DrinkBottle
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 75a1a485aa..6df6d595d2 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -1,9 +1,9 @@
 - type: entity
   parent: ReagentDispenserBase
-  id: SodaDispenser
+  id: SodaDispenserEmpty
   name: soda dispenser
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
-  suffix: Filled
+  suffix: Empty
   components:
   - type: Rotatable
   - type: Sprite
@@ -15,6 +15,20 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: SodaDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
+- type: entity
+  parent: SodaDispenserEmpty
+  id: SodaDispenser
+  suffix: Filled
+  components:
   - type: StorageFill
     contents:
     - id: DrinkCoconutWaterJug
@@ -36,16 +50,3 @@
     - id: DrinkTeaJug
     - id: DrinkTonicWaterBottleFull
     - id: DrinkWaterMelonJuiceJug
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: SodaDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-
-- type: entity
-  parent: SodaDispenser
-  id: SodaDispenserEmpty
-  suffix: Empty
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index fc0a71127c..a5b7a9fddd 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -15,8 +15,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
-  - type: PaintableAirlock
-    department: Engineering
   - type: Wires
     layoutId: AirlockEngineering
 
@@ -35,8 +33,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
-  - type: PaintableAirlock
-    department: Cargo
   - type: Wires
     layoutId: AirlockCargo
 
@@ -67,8 +63,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/medical.rsi
-  - type: PaintableAirlock
-    department: Medical
   - type: Wires
     layoutId: AirlockMedical
 
@@ -95,8 +89,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/science.rsi
-  - type: PaintableAirlock
-    department: Science
   - type: Wires
     layoutId: AirlockScience
 
@@ -109,8 +101,6 @@
     sprite: Structures/Doors/Airlocks/Standard/command.rsi
   - type: WiresPanelSecurity
     securityLevel: medSecurity
-  - type: PaintableAirlock
-    department: Command
   - type: Wires
     layoutId: AirlockCommand
 
@@ -121,8 +111,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/security.rsi
-  - type: PaintableAirlock
-    department: Security
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -151,6 +139,8 @@
     sprite: _Sunrise/Structures/Doors/Airlocks/Standard/salvage.rsi #Sunrise-Resprite
   - type: Wires
     layoutId: AirlockCargo
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
@@ -169,6 +159,8 @@
 #  components:
 #  - type: Sprite
 #    sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
+#  - type: Paintable
+#    group: null
 
 #- type: entity
 #  parent: Airlock
@@ -177,6 +169,8 @@
 #  components:
 #  - type: Sprite
 #    sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
+#  - type: Paintable
+#    group: null
 #
 #end
 
@@ -188,8 +182,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
-  - type: PaintableAirlock
-    department: Engineering
   - type: Wires
     layoutId: AirlockEngineering
 
@@ -216,8 +208,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
-  - type: PaintableAirlock
-    department: Cargo
   - type: Wires
     layoutId: AirlockCargo
 
@@ -248,8 +238,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/medical.rsi
-  - type: PaintableAirlock
-    department: Medical
   - type: Wires
     layoutId: AirlockMedical
 
@@ -276,8 +264,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/science.rsi
-  - type: PaintableAirlock
-    department: Science
   - type: Wires
     layoutId: AirlockScience
 
@@ -288,8 +274,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/command.rsi
-  - type: PaintableAirlock
-    department: Command
   - type: WiresPanelSecurity
     securityLevel: medSecurity
   - type: Wires
@@ -302,8 +286,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/security.rsi
-  - type: PaintableAirlock
-    department: Security
   - type: Wires
     layoutId: AirlockSecurity
 
@@ -321,7 +303,9 @@
   suffix: Mining(Salvage)
   components:
   - type: Sprite
-    sprite: _Sunrise/Structures/Doors/Airlocks/Glass/salvage.rsi #Sunrise-Resprite
+    sprite: _Sunrise/Structures/Doors/Airlocks/Glass/mining.rsi
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockCommandGlass # see standard
@@ -346,9 +330,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/xeno.rsi
-  - type: IconSmooth
-    key: chitin
-    mode: NoSprite
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockGlass
@@ -357,6 +340,5 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/xeno.rsi
-  - type: IconSmooth
-    key: chitin
-    mode: NoSprite
+  - type: Paintable
+    group: null
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 00f3c7103b..0be119c9f7 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -162,12 +162,8 @@
     - board
   - type: PlacementReplacement
     key: walls
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
-  - type: PaintableAirlock
-    group: Standard
-    department: Civilian
+  - type: Paintable
+    group: AirlockStandard
   - type: StaticPrice
     price: 150
   - type: LightningTarget
@@ -227,8 +223,8 @@
   - type: Construction
     graph: Airlock
     node: glassAirlock
-  - type: PaintableAirlock
-    group: Glass
+  - type: Paintable
+    group: AirlockGlass
   - type: RadiationBlocker
     resistance: 2
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
index f6eeb9ee37..123f1ef2c7 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
@@ -10,6 +10,8 @@
     node: airlock
     containers:
     - board
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockGlass
@@ -25,3 +27,5 @@
     - board
   - type: StaticPrice
     price: 165
+  - type: Paintable
+    group: null
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index 7f5c019025..773065bea0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -16,11 +16,10 @@
       path: /Audio/Machines/airlock_deny.ogg
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/external.rsi
-  - type: PaintableAirlock
-    group: External
-    department: null
   - type: Wires
     layoutId: AirlockExternal
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: AirlockExternal
@@ -33,8 +32,6 @@
     enabled: false
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/external.rsi
-  - type: PaintableAirlock
-    group: ExternalGlass
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
index a85c39148a..66f526aa0d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -116,9 +116,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: Construction
     graph: Airlock
     node: highSecDoor
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index f01807a25a..6052b11fe5 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -53,14 +53,13 @@
   - type: Tag
     tags:
       - ForceNoFixRotations
-  - type: PaintableAirlock
-    group: Shuttle
-    department: null
   - type: Construction
     graph: AirlockShuttle
     node: airlock
   - type: StaticPrice
     price: 350
+  - type: Paintable
+    group: null
 
 - type: entity
   id: AirlockGlassShuttle
@@ -73,8 +72,6 @@
     sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
   - type: Occluder
     enabled: false
-  - type: PaintableAirlock
-    group: ShuttleGlass
   - type: Door
     occludes: false
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 180e6b8434..9eedaba5ed 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -57,9 +57,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: Occluder
   - type: BlockWeather
 
@@ -272,3 +269,82 @@
       path: /Audio/Effects/rustle1.ogg
     openSound:
       path: /Audio/Effects/rustle2.ogg
+
+
+- type: entity
+  id: CardDoor
+  parent: BaseStructure
+  name: cardboard door
+  description: A door, where will it lead?
+  components:
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Doors/MineralDoors/card_door.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: AnimationPlayer
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - FlimsyLayer
+  - type: Door
+    bumpOpen: false
+    clickOpen: true
+    canCrush: false
+    closeTimeOne: 0.2
+    closeTimeTwo: 0.6
+    openTimeOne: 0.6
+    openTimeTwo: 0.2
+    openingAnimationTime: 1.2
+    closingAnimationTime: 1.2
+    openSound:
+      path: /Audio/Effects/card_drag.ogg 
+    closeSound:
+      path: /Audio/Effects/card_drag.ogg
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/pierce.ogg"
+  - type: Appearance
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Icon
+    sprite: Structures/Doors/MineralDoors/card_door.rsi
+    state: closed
+  - type: Construction
+    graph: DoorGraph
+    node: cardDoor
+  - type: NavMapDoor
+  - type: Occluder
+  - type: BlockWeather
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index 7becad94bf..ca870d7c7d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -78,9 +78,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: DoorSignalControl
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
index 4aa959455a..cc8fd35f32 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+  - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
@@ -23,8 +24,8 @@
             min: 1
             max: 2
           SheetBrass1:
-            min: 2
-            max: 4
+            min: 0
+            max: 2
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
deleted file mode 100644
index e18d61734f..0000000000
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-- type: AirlockGroup
-  id: Standard
-  iconPriority: 100
-  stylePaths:
-    atmospherics: Structures/Doors/Airlocks/Standard/atmospherics.rsi
-    basic:       Structures/Doors/Airlocks/Standard/basic.rsi
-    cargo:       Structures/Doors/Airlocks/Standard/cargo.rsi
-    chemistry:   _Sunrise/Structures/Doors/Airlocks/Standard/chemistry.rsi #Sunrise-Resprite
-    command:     Structures/Doors/Airlocks/Standard/command.rsi
-    engineering: Structures/Doors/Airlocks/Standard/engineering.rsi
-    freezer:     Structures/Doors/Airlocks/Standard/freezer.rsi
-    hydroponics: _Sunrise/Structures/Doors/Airlocks/Standard/hydroponics.rsi #Sunrise-Resprite
-    maintenance: Structures/Doors/Airlocks/Standard/maint.rsi
-    medical:     Structures/Doors/Airlocks/Standard/medical.rsi
-    salvage:     Structures/Doors/Airlocks/Standard/salvage.rsi
-    science:     Structures/Doors/Airlocks/Standard/science.rsi
-    security:    Structures/Doors/Airlocks/Standard/security.rsi
-    virology:    Structures/Doors/Airlocks/Standard/virology.rsi
-
-- type: AirlockGroup
-  id: Glass
-  iconPriority: 90
-  stylePaths:
-    atmospherics: Structures/Doors/Airlocks/Glass/atmospherics.rsi
-    basic:       Structures/Doors/Airlocks/Glass/basic.rsi
-    cargo:       Structures/Doors/Airlocks/Glass/cargo.rsi
-    command:     Structures/Doors/Airlocks/Glass/command.rsi
-    chemistry:   _Sunrise/Structures/Doors/Airlocks/Glass/chemistry.rsi #Sunrise-Resprite
-    science:     Structures/Doors/Airlocks/Glass/science.rsi
-    engineering: Structures/Doors/Airlocks/Glass/engineering.rsi
-    glass:       Structures/Doors/Airlocks/Glass/glass.rsi
-    hydroponics: _Sunrise/Structures/Doors/Airlocks/Glass/hydroponics.rsi #Sunrise-Resprite
-    maintenance: Structures/Doors/Airlocks/Glass/maint.rsi
-    medical:     Structures/Doors/Airlocks/Glass/medical.rsi
-    salvage:     Structures/Doors/Airlocks/Glass/salvage.rsi
-    security:    Structures/Doors/Airlocks/Glass/security.rsi
-    virology:    Structures/Doors/Airlocks/Glass/virology.rsi
-
-- type: AirlockGroup
-  id: Windoor
-  iconPriority: 80
-  stylePaths:
-    basic:       Structures/Doors/Airlocks/Glass/glass.rsi
-
-- type: AirlockGroup
-  id: External
-  iconPriority: 70
-  stylePaths:
-    external:    Structures/Doors/Airlocks/Standard/external.rsi
-
-- type: AirlockGroup
-  id: ExternalGlass
-  iconPriority: 60
-  stylePaths:
-    external:    Structures/Doors/Airlocks/Glass/external.rsi
-
-- type: AirlockGroup
-  id: Shuttle
-  iconPriority: 50
-  stylePaths:
-    shuttle:     Structures/Doors/Airlocks/Standard/shuttle.rsi
-
-- type: AirlockGroup
-  id: ShuttleGlass
-  iconPriority: 40
-  stylePaths:
-    shuttle:     Structures/Doors/Airlocks/Glass/shuttle.rsi
-
-# fun
-- type: airlockDepartments
-  id: Departments
-  departments:
-    atmospherics: Engineering
-    basic: Civilian
-    cargo: Cargo
-    chemistry: Medical
-    command: Command
-    engineering: Engineering
-    freezer: Civilian
-    glass: Civilian
-    hydroponics: Civilian
-    maintenance: Civilian
-    medical: Medical
-    salvage: Cargo
-    science: Science
-    security: Security
-    virology: Medical
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 52b06cdd11..a2adf9f81f 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -300,6 +300,61 @@
     footstepSoundCollection:
       collection: FootstepTile
 
+- type: entity
+  id: TableCard
+  parent: TableBase
+  name: cardboard table
+  description: Cardboard sheets wrapped around a metal table frame.
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/card.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/card.rsi
+  - type: GlassTable #they named it that cause 'it would never be used elsewhere' or something, smh
+    climberDamage:
+      types:
+        Blunt: 6
+    tableDamage:
+      types:
+        Blunt: 15
+    tableMassLimit: 40
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 45 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound: /Audio//Weapons/pierce.ogg
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound: /Audio//Weapons/pierce.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 1
+            max: 2
+      - !type:ChangeConstructionNodeBehavior
+        node: TableFrame
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: cardtable
+  - type: Construction
+    graph: Table
+    node: TableCard
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepTile
+
 - type: entity
   id: TableReinforcedGlass
   parent: TableBase
@@ -643,6 +698,9 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepFloor
+  - type: Construction
+    graph: Table
+    node: TableXeno
 
 # Fancy tables
 
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index 6bd28042b0..d97c402db5 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -96,7 +96,7 @@
     node: medicalbed
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
   - type: CanSleepOnBuckle # Sunrise-Edit
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
index 37b00c096d..345d15f0ef 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -373,3 +373,60 @@
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
   - type: TrayScanReveal
+
+#cardpet
+
+- type: entity
+  id: CarpetCard
+  parent: BaseStructure
+  name: cardboard "carpet"
+  description: "Even lino is better."
+  components:
+  - type: Sprite
+    drawdepth: FloorTiles
+    sprite: Structures/Furniture/Carpets/card_carpet.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Carpets/card_carpet.rsi
+    state: full
+  - type: IconSmooth
+    key: cardpets
+    additionalKeys:
+    - cards
+    base: carpet_
+  - type: Tag
+    tags:
+    - Carpet
+    - ForceFixRotations
+  - type: Physics
+    canCollide: false
+  - type: Clickable
+  - type: Fixtures
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              MaterialCardboard:
+                min: 1
+                max: 1
+  - type: Butcherable
+    butcheringType: Knife
+    butcherDelay: 1
+    spawned:
+    - id: MaterialCardboard1
+      amount: 1
+  - type: TrayScanReveal
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 41d1962c71..2930e3b063 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -411,6 +411,40 @@
     size: 200
   # Sunrise-End
 
+- type: entity
+  name: cardboard stool
+  id: CardStool
+  parent: UnanchoredChairBase
+  description: Make sure you sit *really* gently.
+  components:
+  - type: Sprite
+    state: card-stool
+  - type: Construction
+    graph: Seat
+    node: stoolCard
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
 - type: entity
   name: wooden bench
   id: WoodenBench
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 1ef1b5bd71..5de8b1a361 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -247,7 +247,7 @@
       - id: ClothingHeadHatAnimalHeadslime
         prob: 0.03
         orGroup: dresserthirdloot
-      - id: ClothingNeckHeadphones
+      - id: ClothingMultipleHeadphones
         prob: 0.03
         orGroup: dresserthirdloot
       - id: ClothingUnderSocksCoder
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 1b5ac30a9c..a6753766d5 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -75,6 +75,9 @@
     autoDrain: false
   - type: StaticPrice
     price: 100
+  - type: ActivatableUI
+    key: enum.DisposalUnitUiKey.Key
+    verbOnly: true # Not strictly needed, but we want E to toggle lid
   - type: UserInterface
     interfaces:
       enum.DisposalUnitUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index b510a7aec0..651f62fd66 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -51,6 +51,44 @@
   - type: Airtight
     noAirWhenFullyAirBlocked: false
 
+- type: entity
+  id: HoloPeel
+  parent: HolosignWetFloor
+  name: holopeel
+  description: A banana peel made of slippery hard light, watch your step!
+  components:
+  - type: Sprite
+    sprite: Structures/Holo/peel.rsi
+    state: icon
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: Slippery
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        layer:
+        - SlipLayer
+  - type: TimedDespawn
+    lifetime: 30
+  - type: Clickable
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+
 - type: entity
   id: HolosignSecurity
   parent: HolosignWetFloor
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
rename to Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index d57e1c4bf8..84df160258 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -170,10 +170,12 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: SpaceVillainArcadeComputerCircuitboard
-  - type: Advertise
-    pack: SpaceVillainAds
-    minimumWait: 60 # Arcades are noisy
-    maximumWait: 240
+  - type: Vocalizer
+    minVocalizeInterval: 1m # Arcades are noisy
+    maxVocalizeInterval: 4m
+    hideChat: true
+  - type: DatasetVocalizer
+    dataset: SpaceVillainAds
   - type: SpeakOnUIClosed
     pack: SpaceVillainGoodbyes
 
@@ -215,9 +217,11 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: BlockGameArcadeComputerCircuitboard
-  - type: Advertise
-    pack: BlockGameAds
-    minimumWait: 60 # Arcades are noisy
-    maximumWait: 240
+  - type: Vocalizer
+    minVocalizeInterval: 1m # Arcades are noisy
+    maxVocalizeInterval: 4m
+    hideChat: true
+  - type: DatasetVocalizer
+    dataset: BlockGameAds
   - type: SpeakOnUIClosed
     pack: BlockGameGoodbyes
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 03923dbaa5..78c3f56bc7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -755,6 +755,7 @@
   - type: CommunicationsConsole
     title: comms-console-announcement-title-station
   - type: DeviceNetwork
+    deviceNetId: Wireless    
     transmitFrequencyId: ShuttleTimer
   - type: ActivatableUI
     key: enum.CommunicationsConsoleUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
new file mode 100644
index 0000000000..b542687b57
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: ComputerSurveillanceWirelessCameraMonitor
+  id: ComputerTelevision
+  name: wooden television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: SmallObjects
+    layers:
+    - map: ["computerLayerBody"]
+      state: television
+    - map: ["computerLayerScreen"]
+      state: detective_television
+  - type: Computer
+    board: ComputerTelevisionCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 200
+        mask:
+          - TabletopMachineMask
+        layer:
+          - TabletopMachineLayer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index ae1490c951..d147417f9e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -87,7 +87,6 @@
         whitelist:
           components:
             - FitsInDispenser
-  - type: ItemToggle
   - type: HealthAnalyzer
     scanDelay: 0
   - type: UserInterface
@@ -110,6 +109,8 @@
       - scanner-body
   - type: CryoPod
   - type: CryoPodAir
+  - type: Climbable # so that ejected bodies don't get stuck
+    vaultable: false
   - type: ContainerTemperatureDamageThresholds
     coldDamageThreshold: 10
   - type: GuideHelp
@@ -117,7 +118,7 @@
     - Cryogenics
 
 - type: entity
-  parent: BaseStructure
+  parent: BaseMachine
   id: CryoPodDestroyed
   name: destroyed cryo pod
   description: A cryo pod that has seen better days. It's entirely inoperable; not good for anything but scrap.
@@ -128,22 +129,17 @@
     noRot: true
     offset: 0, 0.5
     state: pod-cracked
-  - type: Transform
-    noRot: true
   - type: Fixtures
     fixtures:
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.90"
+          bounds: "-0.5,-0.5,0.5,0.5"
         density: 200
         mask:
         - MachineMask
         layer:
         - MachineLayer
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index d533edaf32..21228f2cbb 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -23,9 +23,11 @@
       intensitySlope: 5
       maxIntensity: 4
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     # If you nerf the syndicate bomb in any major way, this should probably drop down to at least 100s (not 90s to compensate for slower movement speed & less lag in SS14)
     # Unless, of course, you want the 90 seconds regardless. I can't stop you.
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 180
       delayOptions: [180, 240, 300, 600, 900]
       initialBeepDelay: 0
@@ -154,6 +156,6 @@
   components:
     - type: Defusable
       disposable: true
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 10
       delayOptions: [10, 20, 30, 60, 90, 120, 150, 180, 210, 240, 270, 300]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
index 770a17a8ff..c4b26e043b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -101,8 +101,11 @@
   - type: Appearance
   - type: Speech
     speechVerb: Robotic
-  - type: Advertise
-    pack: FatExtractorFacts
+  - type: Vocalizer
+    hideChat: true
+  - type: VocalizerRequiresPower
+  - type: DatasetVocalizer
+    dataset: FatExtractorFacts
   - type: StaticPrice
     price: 1000
   - type: ResistLocker
diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 748b3426c4..788febc014 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -5,8 +5,11 @@
   description: A refrigerated storage unit for keeping items cold and fresh.
   components:
   - type: StationAiWhitelist
-  - type: Advertise
-    pack: SmartFridgeAds
+  - type: Vocalizer
+    hideChat: true
+  - type: VocalizerRequiresPower
+  - type: DatasetVocalizer
+    dataset: SmartFridgeAds
   - type: Speech
   - type: Appearance
   - type: Sprite
@@ -18,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
@@ -102,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/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
index c10f8a2e61..1152abfad9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -19,8 +19,13 @@
     - state: icon
     - state: unlit
       shader: unshaded
-      map: ["enum.StasisBedVisualLayers.IsOn"]
-  - type: StasisBedVisuals
+      map: ["unlit"]
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        unlit:
+          True: { visible: true }
+          False: { visible: false }
   - type: Appearance
   - type: ApcPowerReceiver
     powerLoad: 1000
@@ -61,6 +66,6 @@
         - LowImpassable
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
   - type: PowerSwitch
   - type: CanSleepOnBuckle # Sunrise-Edit
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 58d05aabdb..e28c45b08c 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
@@ -73,6 +75,11 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Vending
+  - type: Vocalizer
+    minVocalizeInterval: 8m
+    maxVocalizeInterval: 10m
+    hideChat: true
+  - type: VocalizerRequiresPower
   - type: SpookySpeaker
     messageSet: SpookySpeakerMessagesGeneric
     speakChance: 0.2
@@ -103,6 +110,72 @@
   - type: TTS
     voice: Portal2FactCore  # Sunrise-TTS
 
+- type: entity
+  id: VendingMachineWallmount
+  parent: BaseWallmountMachine
+  name: vending machine
+  abstract: true
+  components:
+  - type: StationAiWhitelist
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 3
+    enabled: false
+    sound:
+      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+      - !type:EjectVendorItems
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+  - type: Repairable
+    doAfterDelay: 8
+  - type: ActivatableUI
+    key: enum.VendingMachineUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: UserInterface
+    interfaces:
+      enum.VendingMachineUiKey.Key:
+        type: VendingMachineBoundUserInterface
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
+  - type: WiresPanel
+  - type: Wires
+    boardName: wires-board-name-vendingmachine
+    layoutId: Vending
+  - type: PointLight
+    enabled: false
+    castShadows: false
+    radius: 1.5
+  - type: LitOnPowered
+  - type: Appearance
+  - type: WiresVisuals
+  - type: Electrified
+    enabled: false
+    usesApcPower: true
+  - type: Rotatable
+
+# Vending machines
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineCondiments
@@ -129,8 +202,8 @@
         layer:
         - MachineLayer
         density: 190
-  - type: Advertise
-    pack: CondimentVendAds
+  - type: DatasetVocalizer
+    dataset: CondimentVendAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Transform
@@ -148,8 +221,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: AmmoVendAds
+  - type: DatasetVocalizer
+    dataset: CondimentVendAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -176,8 +249,8 @@
     normalState: normal-unshaded
     denyState: deny-unshaded
     loopDeny: false
-  - type: Advertise
-    pack: BoozeOMatAds
+  - type: DatasetVocalizer
+    dataset: BoozeOMatAds
   - type: SpeakOnUIClosed
     pack: BoozeOMatGoodbyes
   - type: Sprite
@@ -210,8 +283,8 @@
     normalState: normal-unshaded
     denyState: deny-unshaded
     loopDeny: false
-  - type: Advertise
-    pack: BruiseOMatAds
+  - type: DatasetVocalizer
+    dataset: BruiseOMatAds
   - type: SpeakOnUIClosed
     pack: BruiseOMatGoodbyes
   - type: Sprite
@@ -273,8 +346,8 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
-  - type: Advertise
-    pack: ChefvendAds
+  - type: DatasetVocalizer
+    dataset: ChefvendAds
   - type: SpeakOnUIClosed
     pack: ChefvendGoodbyes
   - type: Sprite
@@ -309,8 +382,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: CigaretteMachineAds
+  - type: DatasetVocalizer
+    dataset: CigaretteMachineAds
   - type: SpeakOnUIClosed
     pack: CigaretteMachineGoodbyes
   - type: Sprite
@@ -337,8 +410,8 @@
     brokenState: broken
     normalState: normal-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: ClothesMateAds
+  - type: DatasetVocalizer
+    dataset: ClothesMateAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -368,8 +441,8 @@
     brokenState: broken
     normalState: normal-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: ClothesMateAds
+  - type: DatasetVocalizer
+    dataset: ClothesMateAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -406,8 +479,8 @@
     ejectDelay: 5
     soundVend: /Audio/Machines/machine_vend_hot_drink.ogg
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: HotDrinksMachineAds
+  - type: DatasetVocalizer
+    dataset: HotDrinksMachineAds
   - type: SpeakOnUIClosed
     pack: HotDrinksMachineGoodbyes
   - type: Sprite
@@ -446,8 +519,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: RobustSoftdrinksAds
+  - type: DatasetVocalizer
+    dataset: RobustSoftdrinksAds
   - type: SpeakOnUIClosed
     pack: RobustSoftdrinksGoodbyes
   - type: Sprite
@@ -592,8 +665,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: RobustSoftdrinksAds
+  - type: DatasetVocalizer
+    dataset: RobustSoftdrinksAds
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi
     layers:
@@ -627,8 +700,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: RobustSoftdrinksAds
+  - type: DatasetVocalizer
+    dataset: RobustSoftdrinksAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -664,8 +737,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: DrGibbAds
+  - type: DatasetVocalizer
+    dataset: DrGibbAds
   - type: SpeakOnUIClosed
     pack: DrGibbGoodbyes
   - type: Sprite
@@ -711,8 +784,8 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: SmiteAds
+  - type: DatasetVocalizer
+    dataset: SmiteAds
   - type: SpeakOnUIClosed
     pack: SmiteGoodbyes
   - type: PointLight
@@ -732,8 +805,8 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
-  - type: Advertise
-    pack: DinnerwareAds
+  - type: DatasetVocalizer
+    dataset: DinnerwareAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -764,8 +837,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: MagiVendAds
+  - type: DatasetVocalizer
+    dataset: MagiVendAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -797,8 +870,8 @@
     brokenState: broken
     normalState: normal-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: DiscountDansAds
+  - type: DatasetVocalizer
+    dataset: DiscountDansAds
   - type: SpeakOnUIClosed
     pack: DiscountDansGoodbyes
   - type: Sprite
@@ -861,8 +934,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 0.6
-  - type: Advertise
-    pack: NanoMedAds
+  - type: DatasetVocalizer
+    dataset: NanoMedAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -889,7 +962,7 @@
     color: "#9dc5c9"
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: VendingMachine
@@ -904,8 +977,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: NutriMaxAds
+  - type: DatasetVocalizer
+    dataset: NutriMaxAds
   - type: SpeakOnUIClosed
     pack: NutriMaxGoodbyes
   - type: Sprite
@@ -938,8 +1011,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: SecTechAds
+  - type: DatasetVocalizer
+    dataset: SecTechAds
   - type: SpeakOnUIClosed
     pack: SecTechGoodbyes
   - type: Sprite
@@ -977,8 +1050,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: MegaSeedAds
+  - type: DatasetVocalizer
+    dataset: MegaSeedAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1020,8 +1093,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: GetmoreChocolateCorpAds
+  - type: DatasetVocalizer
+    dataset: GetmoreChocolateCorpAds
   - type: SpeakOnUIClosed
     pack: GetmoreChocolateCorpGoodbyes
   - type: Sprite
@@ -1167,8 +1240,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: BodaAds
+  - type: DatasetVocalizer
+    dataset: BodaAds
   - type: SpeakOnUIClosed
     pack: BodaGoodbyes
   - type: Sprite
@@ -1202,8 +1275,8 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     screenState: screen
-  - type: Advertise
-    pack: AutoDrobeAds
+  - type: DatasetVocalizer
+    dataset: AutoDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1237,8 +1310,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: VendomatAds
+  - type: DatasetVocalizer
+    dataset: VendomatAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1269,8 +1342,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: VendomatAds
+  - type: DatasetVocalizer
+    dataset: VendomatAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1334,8 +1407,8 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     ejectDelay: 1.8
-  - type: Advertise
-    pack: GoodCleanFunAds
+  - type: DatasetVocalizer
+    dataset: GoodCleanFunAds
   - type: SpeakOnUIClosed
     pack: GoodCleanFunGoodbyes
   - type: Sprite
@@ -1367,8 +1440,8 @@
     brokenState: broken
     normalState: normal-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: ChangAds
+  - type: DatasetVocalizer
+    dataset: ChangAds
   - type: SpeakOnUIClosed
     pack: ChangGoodbyes
   - type: Sprite
@@ -1433,8 +1506,8 @@
     brokenState: broken
     normalState: normal-unshaded
     initialStockQuality: 0.33
-  - type: Advertise
-    pack: DonutAds
+  - type: DatasetVocalizer
+    dataset: DonutAds
   - type: SpeakOnUIClosed
     pack: DonutGoodbyes
   - type: Sprite
@@ -1453,65 +1526,6 @@
     color: "#d4ab33"
   - type: PlayerCountDependentStock  # Sunrise-vend
 
-# wallmounted machines
-
-- type: entity
-  id: VendingMachineWallmount
-  parent: VendingMachine
-  name: vending machine
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Sprite
-    drawdepth: WallMountedItems
-    snapCardinals: false
-  - type: Rotatable
-  - type: WallMount
-    arc: 175
-  - type: Transform
-    noRot: false
-
-- type: entity
-  parent: VendingMachineWallmount
-  id: VendingMachineWallMedical
-  name: NanoMed
-  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
-  components:
-  - type: VendingMachine
-    pack: NanoMedInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-    denyState: deny-unshaded
-  - type: Sprite
-    sprite: Structures/Machines/VendingMachines/wallmed.rsi
-    layers:
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: PointLight
-    radius: 1.3
-    energy: 1.6
-    color: "#43ccb5"
-  - type: AccessReader
-    access: [["Medical"]]
-    # Sunrise-start
-    alertAccesses:
-      red: RedAlertAccesses
-      blue: BlueAlertAccessesHOS
-      gamma: GammaAlertAccesses
-    # Sunrise-end
-  - type: GuideHelp
-    guides:
-    - Medical
-
 # job clothing
 
 - type: entity
@@ -1525,8 +1539,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: HyDrobeAds
+  - type: DatasetVocalizer
+    dataset: HyDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1557,8 +1571,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: LawDrobeAds
+  - type: DatasetVocalizer
+    dataset: LawDrobeAds
   - type: SpeakOnUIClosed
     pack: LawDrobeGoodbyes
   - type: Sprite
@@ -1585,8 +1599,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: SecDrobeAds
+  - type: DatasetVocalizer
+    dataset: SecDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1617,8 +1631,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: BarDrobeAds
+  - type: DatasetVocalizer
+    dataset: BarDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1673,8 +1687,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: CargoDrobeAds
+  - type: DatasetVocalizer
+    dataset: CargoDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1705,8 +1719,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: MediDrobeAds
+  - type: DatasetVocalizer
+    dataset: MediDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1733,8 +1747,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: ChemDrobeAds
+  - type: DatasetVocalizer
+    dataset: ChemDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1761,8 +1775,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: CuraDrobeAds
+  - type: DatasetVocalizer
+    dataset: CuraDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1789,8 +1803,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: AtmosDrobeAds
+  - type: DatasetVocalizer
+    dataset: AtmosDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1821,8 +1835,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: EngiDrobeAds
+  - type: DatasetVocalizer
+    dataset: EngiDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1853,8 +1867,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: ChefDrobeAds
+  - type: DatasetVocalizer
+    dataset: ChefDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1881,8 +1895,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: DetDrobeAds
+  - type: DatasetVocalizer
+    dataset: DetDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1909,8 +1923,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: JaniDrobeAds
+  - type: DatasetVocalizer
+    dataset: JaniDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1941,8 +1955,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: SciDrobeAds
+  - type: DatasetVocalizer
+    dataset: SciDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -1969,8 +1983,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: SyndieDrobeAds
+  - type: DatasetVocalizer
+    dataset: SyndieDrobeAds
   - type: SpeakOnUIClosed
     pack: SyndieDrobeGoodbyes
   - type: Sprite
@@ -2001,8 +2015,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: RoboDrobeAds
+  - type: DatasetVocalizer
+    dataset: RoboDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -2029,8 +2043,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: GeneDrobeAds
+  - type: DatasetVocalizer
+    dataset: GeneDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -2057,8 +2071,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: ViroDrobeAds
+  - type: DatasetVocalizer
+    dataset: ViroDrobeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite
@@ -2133,8 +2147,8 @@
     radius: 1.5
     energy: 1.6
     color: "#3c5eb5"
-  - type: Advertise
-    pack: HappyHonkAds
+  - type: DatasetVocalizer
+    dataset: HappyHonkAds
   - type: SpeakOnUIClosed
     pack: HappyHonkGoodbyes
   - type: AccessReader
@@ -2153,8 +2167,8 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
-  - type: Advertise
-    pack: PrideDrobeAds
+  - type: DatasetVocalizer
+    dataset: PrideDrobeAds
   - type: SpeakOnUIClosed
     pack: PrideDrobeGoodbyes
   - type: Speech
@@ -2260,6 +2274,44 @@
   - type: AccessReader
     access: [["SyndicateAgent"]]
 
+# wallmount
+- type: entity
+  parent: VendingMachineWallmount
+  id: VendingMachineWallMedical
+  name: NanoMed
+  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
+  components:
+  - type: VendingMachine
+    pack: NanoMedInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/wallmed.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.3
+    energy: 1.6
+    color: "#43ccb5"
+  - type: AccessReader
+    access: [["Medical"]]
+    # Sunrise-start
+    alertAccesses:
+      red: RedAlertAccesses
+      blue: BlueAlertAccessesHOS
+      gamma: GammaAlertAccesses
+    # Sunrise-end
+  - type: GuideHelp
+    guides:
+    - Medical
   #Sunrise-Start
 - type: entity
   parent: VendingMachineChemicals
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
index 1f4ab085f1..62d90657a9 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 6ef814ad24..6f1d69a86c 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:
@@ -101,7 +106,7 @@
   name: volumetric gas pump
   description: A pump that moves gas by volume.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
     - type: ExtensionCableReceiver
     - type: LightningTarget
@@ -122,6 +127,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:
@@ -171,13 +181,74 @@
         VentCrawTube: !type:Container
     # Sunrise-end
 
+- type: entity
+  parent: GasBinaryBase
+  id: GasPressureRegulator
+  name: inlet pressure regulator
+  description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
+  placement:
+    mode: AlignAtmosPipeLayers
+  components:
+  - type: Rotatable
+  - type: Transform
+    noRot: false
+  - type: SubFloorHide
+    visibleLayers:
+    - enum.SubfloorLayers.FirstLayer
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: pipeStraight
+      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:
+      enum.PressureRegulatorVisuals.State:
+        enabled:
+          True: { state: pumpPressureRegulatorOn }
+          False: { state: pumpPressureRegulator }
+  - type: PipeColorVisuals
+  - type: GasPressureRegulator
+    enabled: false
+    threshold: 4500
+  - type: Construction
+    graph: GasBinary
+    node: pressureregulator
+  - type: ActivatableUI
+    key: enum.GasPressureRegulatorUiKey.Key
+    blockSpectators: true
+  - type: ActivatableUIRequiresAnchor
+  - type: UserInterface
+    interfaces:
+      enum.GasPressureRegulatorUiKey.Key:
+        type: GasPressureRegulatorBoundUserInterface
+  - type: AmbientSound
+    enabled: false
+    volume: -9
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/gas_hiss.ogg
+  - type: AtmosMonitoringConsoleDevice
+    navMapBlip: GasFlowRegulator
+  - type: GuideHelp
+    guides:
+    - PressureRegulator
+
 - type: entity
   parent: GasBinaryBase
   id: GasPassiveGate
   name: passive gate
   description: A one-way air valve that does not require power.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
     - type: SubFloorHide
       visibleLayers:
@@ -190,6 +261,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
@@ -222,7 +298,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
@@ -236,6 +312,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:
@@ -286,7 +367,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
@@ -300,6 +381,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 c70b33639e..92466f3231 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/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
index 1e439ddae4..d57af0a41c 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -77,10 +77,10 @@
       - GhostOnlyWarp
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/singularity_1.rsi
-    shader: unshaded
     layers:
     - map: [ "VisualLevel" ]
       state: singularity_1
+      shader: unshaded
   - type: GenericVisualizer
     visuals:
       enum.SingularityAppearanceKeys.Singularity:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
index d31f7526ab..52e82847cb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
@@ -101,9 +101,9 @@
   - type: Sprite
     drawdepth: Effects
     sprite: Structures/Power/Generation/Tesla/energy_ball.rsi
-    shader: unshaded
     layers:
     - state: energy_ball
+      shader: unshaded
   - type: EmitSoundOnSpawn
     sound:
       path: /Audio/Effects/tesla_collapse.ogg
@@ -149,8 +149,8 @@
   - type: Sprite
     drawdepth: Effects
     sprite: Structures/Power/Generation/Tesla/energy_miniball.rsi
-    shader: unshaded
     layers:
     - state: tesla_projectile
+      shader: unshaded
   - type: Electrified
     requirePower: false
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index 2be509e8e6..410df05021 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -96,11 +96,9 @@
 - type: entity
   abstract: true
   id: BaseGeneratorWallmount
-  parent: BaseGenerator
+  parent: [ BaseGenerator, BaseWallmount ]
   name: wallmount generator
   description: A high efficiency thermoelectric generator stuffed in a wall cabinet.
-  placement:
-    mode: SnapgridCenter
   components:
   - type: AmbientOnPowered
   - type: AmbientSound
@@ -114,12 +112,6 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-    canCollide: false
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -142,7 +134,6 @@
     supplyRate: 3000
     supplyRampRate: 500
     supplyRampTolerance: 500
-  - type: WallMount
   - type: GuideHelp
     guides:
     - ShuttleCraft
@@ -150,20 +141,12 @@
 # Construction Frames
 
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: BaseGeneratorWallmountFrame
   name: wallmount generator frame
   description: A construction frame for a wallmount generator.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -172,7 +155,6 @@
   - type: Construction
     graph: WallmountGenerator
     node: frame
-  - type: WallMount
 
 # Generators in use
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 6fe749b7dd..75f61e7534 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -1,4 +1,5 @@
 - type: entity
+  parent: BaseWallmount
   categories: [ HideSpawnMenu ]
   id: BaseAPC
   name: APC
@@ -19,12 +20,8 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
@@ -89,6 +86,8 @@
     interfaces:
       enum.ApcUiKey.Key:
         type: ApcBoundUserInterface
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
   - type: ActivatableUI
     inHandsOnly: false
     key: enum.ApcUiKey.Key
@@ -102,6 +101,10 @@
     supplyRampRate: 500
   - type: WallMount
   - type: WiresPanel
+  - type: Wires
+    alwaysRandomize: true
+    boardName: wires-board-name-apc
+    layoutId: APC
   - type: WiresVisuals
   - type: Damageable
     damageContainer: StructuralInorganic
@@ -150,6 +153,7 @@
 
 # APC under construction
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: APCFrame
   name: APC frame
@@ -157,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/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index 53e2c4a91f..2a4f1c7f1c 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -173,7 +173,6 @@
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_0
   - type: Icon
-    color: Green
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_4
   - type: NodeContainer
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index e529708abb..75e38f1187 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -193,7 +193,7 @@
           - PotatoBattery
 
 - type: entity
-  parent: BaseItemRecharger
+  parent: [ BaseItemRecharger, BaseWallmount ]
   id: WallWeaponCapacitorRecharger
   name: wall recharger
   components:
@@ -205,7 +205,6 @@
     - map: ["enum.PowerChargerVisualLayers.Light"]
       state: "light-off"
       shader: "unshaded"
-  - type: WallMount
   - type: Charger
     chargeRate: 25
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index 5f30f1ae4d..04cbb509e1 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -129,33 +129,90 @@
   - type: Anchorable
 
 - type: entity
-  id: DebugSMES
   parent: BaseSMES
-  suffix: DEBUG
-  categories: [ Debug ] # Sunrise added
+  id: DebugSMES
+  suffix: DEBUG, Empty
   components:
   - type: Tag
     tags:
-      - Debug
+    - Debug
+
+- type: entity
+  parent: BaseSMES
+  id: DebugSMESRecharging
+  suffix: DEBUG, AutoRecharge
+  categories: [ Debug ] # Sunrise added
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
 
 - type: entity
-  id: DebugSubstation
   parent: BaseSubstation
-  suffix: DEBUG
+  id: DebugSubstation
+  suffix: DEBUG, Empty
   components:
   - type: Tag
     tags:
-      - Debug
+    - Debug
 
 - type: entity
-  id: DebugAPC
-  parent: BaseAPC
-  suffix: DEBUG
-  categories: [ Debug ] # Sunrise added
+  parent: BaseSubstation
+  id: DebugSubstationRecharging
+  suffix: DEBUG, AutoRecharge
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
+
+- type: entity
+  parent: BaseSubstationWall
+  id: DebugSubstationWall
+  suffix: DEBUG, Empty
   components:
   - type: Tag
     tags:
-      - Debug
+    - Debug
+
+- type: entity
+  parent: BaseSubstationWall
+  id: DebugSubstationWallRecharging
+  suffix: DEBUG, AutoRecharge
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
+
+- type: entity
+  parent: BaseAPC
+  id: DebugAPC
+  suffix: DEBUG, Empty
+  components:
+  - type: Tag
+    tags:
+    - Debug
+
+- type: entity
+  parent: BaseAPC
+  id: DebugAPCRecharging
+  suffix: DEBUG, AutoRecharge
+  categories: [ Debug ] # Sunrise added
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
 
 - type: entity
   id: DebugPowerReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
index d3104b3c28..aa55e65b57 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -364,7 +364,7 @@
 - type: entity
   parent: ShuttleGunBase
   id: ShuttleGunKineticOld
-  name: xenomorphic dematerializer
+  name: exomorphic dematerializer
   description: An ancient ship gun, utilizing biomechanical systems to store and release energy. While unique in its design, it has been rendered obsolete due to its inferior charging and firing speed compared to mechanical constructions.
   components:
   - type: Sprite
@@ -409,10 +409,3 @@
   - type: DeviceLinkSink
     ports:
     - Trigger
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
-        density: 1800
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 2b046b0182..cb25f9199b 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -72,6 +72,8 @@
   - type: Anomaly
     corePrototype: AnomalyCorePyroclastic
     coreInertPrototype: AnomalyCorePyroclasticInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyPyroSupercritical
   - type: Sprite
     sprite: Structures/Specific/Anomalies/pyro_anom.rsi
     layers:
@@ -124,6 +126,9 @@
   - type: Anomaly
     corePrototype: AnomalyCoreGravity
     coreInertPrototype: AnomalyCoreGravityInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyGravitySupercritical
+    supercriticalDuration: 15s
   - type: Sprite
     layers:
     - state: anom2
@@ -156,6 +161,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreElectricity
     coreInertPrototype: AnomalyCoreElectricityInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyElectricitySupercritical
   - type: Sprite
     layers:
     - state: anom3
@@ -181,6 +188,8 @@
     coreInertPrototype: AnomalyCoreFleshInert
     minPulseLength: 180
     maxPulseLength: 300
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyFleshSupercritical
   - type: Sprite
     layers:
     - state: anom5
@@ -306,6 +315,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreBluespace
     coreInertPrototype: AnomalyCoreBluespaceInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyBluespaceSupercritical
     pulseSound:
       collection: RadiationPulse
       params:
@@ -332,6 +343,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreIce
     coreInertPrototype: AnomalyCoreIceInert
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyIceSupercritical
   - type: ExplosionAnomaly
     supercriticalExplosion: Cryo
     explosionTotalIntensity: 300
@@ -376,6 +389,8 @@
     coreInertPrototype: AnomalyCoreRockInert
     minPulseLength: 180
     maxPulseLength: 300
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyRockSupercritical
   - type: Sprite
     layers:
     - state: anom6
@@ -778,6 +793,8 @@
     coreInertPrototype: AnomalyCoreFloraInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyFloraSupercritical
   - type: TileSpawnAnomaly
     entries:
     - settings:
@@ -881,6 +898,8 @@
     coreInertPrototype: AnomalyCoreLiquidInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyFluidSupercritical
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -960,6 +979,8 @@
     solution: anomaly
   - type: ExaminableSolution
     solution: anomaly
+    exactVolume: true
+    locVolume: "examinable-solution-on-examine-volume-no-max"
   - type: RefillableSolution
     solution: anomaly
   - type: InjectableSolution
@@ -994,6 +1015,8 @@
     maxPulseLength: 120
     animationTime: 4
     offset: "-0.1,0.1"
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyShadowSupercritical
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -1054,6 +1077,8 @@
     coreInertPrototype: AnomalyCoreTechInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyTechSupercritical
   - type: TechAnomaly
   - type: DeviceLinkSource
     ports:
@@ -1112,6 +1137,8 @@
     coreInertPrototype: AnomalyCoreSantaInert
     minPulseLength: 60
     maxPulseLength: 120
+    supercriticalSoundAtAnimationStart:
+      collection: AnomalyPresentSupercritical
   - type: EntitySpawnAnomaly
     entries:
     - settings:
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
index a5f6f32128..0ad1aa17f4 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
@@ -47,6 +47,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCorePyroclastic
         coreInertPrototype: AnomalyCorePyroclasticInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyPyroSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionPyroclastic
         startMessage: inner-anomaly-start-message-pyro
@@ -77,6 +79,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreElectricity
         coreInertPrototype: AnomalyCoreElectricityInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyElectricitySupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionElectric
         startMessage: inner-anomaly-start-message-shock
@@ -107,6 +111,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreShadow
         coreInertPrototype: AnomalyCoreShadowInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyShadowSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionShadow
         startMessage: inner-anomaly-start-message-shadow
@@ -137,6 +143,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreIce
         coreInertPrototype: AnomalyCoreIceInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyIceSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionIce
         startMessage: inner-anomaly-start-message-frost
@@ -167,6 +175,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreFlora
         coreInertPrototype: AnomalyCoreFloraInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyFloraSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionFlora
         startMessage: inner-anomaly-start-message-flora
@@ -197,6 +207,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreBluespace
         coreInertPrototype: AnomalyCoreBluespaceInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyBluespaceSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionBluespace
         startMessage: inner-anomaly-start-message-bluespace
@@ -227,6 +239,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreFlesh
         coreInertPrototype: AnomalyCoreFleshInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyFleshSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionFlesh
         startMessage: inner-anomaly-start-message-flesh
@@ -257,6 +271,9 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreGravity
         coreInertPrototype: AnomalyCoreGravityInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyGravitySupercritical
+        supercriticalDuration: 15
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionGravity
         startMessage: inner-anomaly-start-message-grav
@@ -287,6 +304,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreTech
         coreInertPrototype: AnomalyCoreTechInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyTechSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionTech
         startMessage: inner-anomaly-start-message-tech
@@ -318,6 +337,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreRock
         coreInertPrototype: AnomalyCoreRockInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyRockSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionRock
         startMessage: inner-anomaly-start-message-rock
@@ -348,6 +369,8 @@
         maxPointsPerSecond: 100
         corePrototype: AnomalyCoreSanta
         coreInertPrototype: AnomalyCoreSantaInert
+        supercriticalSoundAtAnimationStart:
+          collection: AnomalyPresentSupercritical
       - type: InnerBodyAnomaly
         injectionProto: AnomalyInjectionSanta
         startMessage: inner-anomaly-start-message-santa
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index c095951d96..3be6fb7d6f 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/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 9b409dcaed..1983209b4a 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -122,6 +122,8 @@
     - type: GuideHelp
       guides:
       - GasCanisters
+    - type: Paintable
+      group: Canisters
 
 - type: entity
   parent: GasCanister
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 8e2d1a6e54..a30ae00e96 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -54,6 +54,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: Locker
 
 - type: entity
   id: LockerBaseSecure
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 53e31a26c7..25b9a47a11 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -17,6 +17,8 @@
       path: /Audio/Effects/woodenclosetclose.ogg
     openSound:
       path: /Audio/Effects/woodenclosetopen.ogg
+  - type: Paintable
+    group: null # not shaped like other lockers
 
 # Basic
 - type: entity
@@ -220,6 +222,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: null
 
 - type: entity
   id: LockerFreezer
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 4f245f238e..f29ad00b72 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -134,26 +134,21 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: Closet
 
 #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
@@ -178,9 +173,6 @@
     containers:
       entity_storage: !type:Container
         ents: []
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -215,6 +207,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: WallCloset
 
 #Wall locker
 - type: entity
@@ -238,6 +232,8 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+  - type: Paintable
+    group: WallLocker
 
 #Base suit storage unit
 #I am terribly sorry for duplicating the closet almost-wholesale, but the game malds at me if I don't so here we are.
@@ -326,7 +322,7 @@
             max: 1
   - type: Appearance
   - type: EntityStorageVisuals
-    stateBase: base
+    # stateBase: base  // This field does not exist. this is probably a bug. TODO
     stateDoorOpen: base
     stateDoorClosed: door
   - type: LockVisuals
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 55f4dee041..635cdee16e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -154,3 +154,5 @@
     - Energy
     reflectProb: 0.2
     spread: 90
+  - type: Paintable
+    group: CrateSecure
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 823fa3bbd5..7295017729 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -12,6 +12,8 @@
     - Energy
     reflectProb: 0.2
     spread: 90
+  - type: Paintable
+    group: CrateSteel
   - type: RadiationBlockingContainer
     resistance: 2.5
 
@@ -31,6 +33,8 @@
     - entity_storage
   - type: StaticPrice
     price: 100
+  - type: Paintable
+    group: CratePlastic
 
 - type: entity
   parent: CratePlastic
@@ -49,6 +53,8 @@
     node: done
     containers:
     - entity_storage
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: CratePlastic
@@ -883,6 +889,8 @@
       sprite: Structures/Storage/Crates/labels.rsi
       offset: "0.0,0.03125"
       map: ["enum.PaperLabelVisuals.Layer"]
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: CrateBaseSecure
@@ -909,6 +917,8 @@
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Paintable
+    group: null
     # Sunrise-start
     alertAccesses:
       red: RedAlertAccesses
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
similarity index 66%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
index 24e5cfda2a..c8d5840889 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
@@ -1,15 +1,9 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: BoxingBell
   name: boxing bell
   description: Ding ding!
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Transform
-    anchored: true
-  - type: WallMount
   - type: Sprite
     sprite: Structures/Wallmounts/bell.rsi
     layers:
@@ -18,22 +12,12 @@
     successChance: 1
     interactSuccessSound:
       path: /Audio/Weapons/boxingbell.ogg
-  - type: Clickable
   - type: MeleeSound
     soundGroups:
       Brute:
         path:
           "/Audio/Weapons/boxingbell.ogg"
   - type: Appearance
-  - type: Rotatable
-  - type: CollisionWake
-    enabled: false
-  - type: Physics
-    canCollide: false
-    bodyType: Static
-  - type: Fixtures
-  - type: Damageable
-    damageContainer: Inorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
new file mode 100644
index 0000000000..c32a2731cd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
@@ -0,0 +1,43 @@
+- 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: Sprite
+    sprite: Structures/Wallmounts/mirror.rsi
+    state: mirror
+  - type: MagicMirror #instant and silent
+    changeHairSound: null
+    addSlotTime: 0
+    removeSlotTime: 0
+    selectSlotTime: 0
+    changeSlotTime: 0
+  - type: ActivatableUI
+    key: enum.MagicMirrorUiKey.Key
+    singleUser: true
+  - type: UserInterface
+    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
+  id: MirrorModern
+  suffix: rectangle
+  components:
+  - type: Sprite
+    state: rectangle-mirror
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
index 76e17b3040..7f38f6c5ab 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
@@ -1,11 +1,9 @@
 - type: entity
+  parent: BaseWallmount
   id: NoticeBoard
   name: notice board
   description: Is there a job for a witcher?
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: WallMount
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/noticeboard.rsi
@@ -17,10 +15,6 @@
     maxFillLevels: 6
     fillBaseName: notice
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index f00216393b..a28b9db277 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, BaseWallmountMachine ]
   name: bar sign
   abstract: true
   components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/barsign.rsi
     state: empty
-  - type: ApcPowerReceiver
-  - type: ExtensionCableReceiver
   - type: BarSign
-  - type: InteractionOutline
   - type: AccessReader
     access: [["Bar"]]
   - type: ActivatableUIRequiresPower
@@ -31,8 +23,6 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: Appearance
-  - type: Damageable
-    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
index 35281d0383..68693f41cd 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,8 +16,9 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signs.rsi
     snapCardinals: true
   - type: StaticPrice
     price: 20
+  - type: Transform
+    anchored: false
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index 992f7a71e6..21076f9f07 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -3,10 +3,7 @@
   id: BaseFlag
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/flags.rsi
 
 - type: entity
@@ -35,7 +32,7 @@
   components:
   - type: Sprite
     state: syndie_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: LGBTQFlag
@@ -44,7 +41,7 @@
   components:
   - type: Sprite
     state: lgbtq_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: PirateFlag
@@ -52,4 +49,4 @@
   description: Raise the jolly roger, scallywags!
   components:
   - type: Sprite
-    state: pirate_flag
\ No newline at end of file
+    state: pirate_flag
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
index 4f26432c60..cc43241d83 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -3,10 +3,7 @@
   id: PaintingBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/paintings.rsi
 
 - type: entity
@@ -187,4 +184,4 @@
   description: This painting is a sad clown! It sparks joy.
   components:
   - type: Sprite
-    state: painting19  
+    state: painting19
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index b9a2191def..774667ce66 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -3,12 +3,8 @@
   id: PosterBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/posters.rsi
-    snapCardinals: true
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
@@ -1123,6 +1119,15 @@
   - type: Sprite
     state: poster54_legit
 
+- type: entity
+  parent: PosterBase
+  id: PosterLegitHelio
+  name: Helio Logistics ad
+  description: "A poster advertising Helio Logistics and their adorable mascot. The slogan reads 'Come rain or shine, we deliver on time.'"
+  components:
+  - type: Sprite
+    state: poster55_legit
+
 #maps
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
new file mode 100644
index 0000000000..69433c3a7d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: [BaseWallmountMetallic, BaseItemCabinet]
+  id: BaseWallmountCabinet
+  abstract: true
+
+- type: entity
+  parent: [BaseWallmountGlass, BaseItemCabinetGlass]
+  id: BaseWallmountCabinetGlass
+  abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
similarity index 86%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
index 3e5c2486ea..0ca51b5c78 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
@@ -1,18 +1,12 @@
 # TODO: same as other wallmount cabinets they should use a base structure prototype
 - type: entity
-  parent: BaseItemCabinet
+  parent: BaseWallmountCabinet
   id: DefibrillatorCabinet
   name: defibrillator cabinet
   description: A small wall mounted cabinet designed to hold a defibrillator.
   placement:
     mode: SnapgridCenter
   components:
-  - type: WallMount
-    arc: 175
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/defib_cabinet.rsi
     noRot: false
@@ -30,9 +24,6 @@
         whitelist:
           components:
           - Defibrillator
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: !type:DamageTrigger
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
index 6c812254ba..cbf11468f2 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
       layers:
@@ -30,9 +20,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 83%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
index 1f478d25f1..ebeeb1302a 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 78d4e70427..c41505f4c9 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
@@ -1,23 +1,15 @@
 # Parents
 - type: entity
-  abstract: true
+  parent: BaseWallmount
   id: ShelfBase
+  abstract: true
   name: shelf
   description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Clickable
-  - type: Tag
-    tags:
-    - Structure
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Storage/Shelfs/wood.rsi
     state: base
-  - type: Transform
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
@@ -32,7 +24,6 @@
           collection: WoodDestroyHeavy
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: WallMount
   - type: Storage
     grid:
     - 0,0,3,1
@@ -42,7 +33,6 @@
     interfaces:
      enum.StorageUiKey.Key:
       type: StorageBoundUserInterface
-  - type: InteractionOutline
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
similarity index 82%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
index 945bfb1a6c..962963c341 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
@@ -1,25 +1,12 @@
 - type: entity
-  id: CleanerDispenser
-  name: space cleaner dispenser
-  description: Wallmount reagent dispenser.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
+  parent: BaseWallmountMetallic
+  id: BaseDispenser
+  abstract: true
   components:
-  - type: WallMount
-    arc: 175
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
     state: cleanerdispenser
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -53,12 +40,6 @@
           collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: SolutionContainerManager
-    solutions:
-      tank:
-        reagents:
-        - ReagentId: SpaceCleaner
-          Quantity: 5000
   - type: DrainableSolution
     solution: tank
   - type: ReagentTank
@@ -66,7 +47,7 @@
     solution: tank
 
 - type: entity
-  parent: CleanerDispenser
+  parent: BaseDispenser
   id: FuelDispenser
   name: fuel dispenser
   components:
@@ -86,3 +67,16 @@
     weldingDamage:
       types:
         Heat: 20
+
+- type: entity
+  parent: BaseDispenser
+  id: CleanerDispenser
+  name: space cleaner dispenser
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 5000
+  - type: ReagentTank
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
index ff7e9a6849..e3973a2a90 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,37 @@
     - Status
     lastSignals:
       Status: false
-  - type: Tag
-    tags:
-    - Structure
+  - type: Transform
+    anchored: false
+  - 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 +74,6 @@
   - type: Construction
     graph: SignalButtonGraph
     node: SignalButtonNode
-  - type: Fixtures
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
@@ -79,130 +81,60 @@
   - type: DeviceLinkSource
     ports:
       - Pressed
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+  - type: Transform
+    anchored: false
   - 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: Tag
-    tags:
-    - Structure
+    - trigger:
+        !type:DamageTrigger
+        damage: 80
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -8
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: ApcNetSwitch
   name: apc net switch
   description: It's a switch for toggling lights that are connected to the same apc.
-  placement:
-    mode: SnapgridCenter
-    snap:
-      - Wallmount
   components:
-    - type: WallMount
-      arc: 360
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-      canCollide: false
-    - type: Transform
-      anchored: true
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Structures/Wallmounts/switch.rsi
-      state: on
-    - type: Rotatable
-    - type: ExtensionCableReceiver
-    - type: DeviceNetwork
-      deviceNetId: Apc
-      transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
-    - type: ApcNetworkConnection
-    - type: ApcNetSwitch
-    - type: Construction
-      graph: LightSwitchGraph
-      node: LightSwitchNode
-    - type: Fixtures
-    - type: Tag
-      tags:
-      - Structure
-
-- type: entity
-  id: TwoWayLever
-  name: two way lever
-  description: A two way lever.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: StationAiWhitelist
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      drawdepth: HighFloorObjects
-      sprite: Structures/conveyor.rsi
-      noRot: true
-      layers:
-        - state: switch-off
-          map: ["enabled", "enum.TwoWayLeverState.Middle"]
-    - type: TwoWayLever
-    - type: UseDelay
-      delay: 0.2 # prevent light-toggling auto-clickers.
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.TwoWayLeverVisuals.State:
-          enabled:
-            Right: { state: switch-fwd }
-            Middle: { state: switch-off }
-            Left: { state: switch-rev }
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 100
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - type: Construction
-      graph: LeverGraph
-      node: LeverNode
-    - type: DeviceNetwork
-      deviceNetId: Wireless
-    - type: WirelessNetworkConnection
-      range: 200
-    - type: DeviceLinkSource
-      ports:
-        - Left
-        - Right
-        - Middle
-    - type: Tag
-      tags:
-      - Structure
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch.rsi
+    state: on
+  - type: Rotatable
+  - type: ExtensionCableReceiver
+  - type: DeviceNetwork
+    deviceNetId: Apc
+    transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
+  - type: ApcNetworkConnection
+  - type: ApcNetSwitch
+  - type: Transform
+    anchored: false
+  - type: Construction
+    graph: LightSwitchGraph
+    node: LightSwitchNode
 
 #directional
 
 - type: entity
+  parent: SignalSwitch
   id: SignalSwitchDirectional
   name: signal switch
   suffix: directional
-  parent: SignalSwitch
   components:
   - type: WallMount
     arc: 175
@@ -211,10 +143,10 @@
     node: SignalSwitchDirectionalNode
 
 - type: entity
+  parent: SignalButton
   id: SignalButtonDirectional
   name: signal button
   suffix: directional
-  parent: SignalButton
   components:
   - type: WallMount
     arc: 175
@@ -223,10 +155,10 @@
     node: SignalButtonDirectionalNode
 
 - type: entity
+  parent: ApcNetSwitch
   id: ApcNetSwitchDirectional
   name: apc net switch
   suffix: directional
-  parent: ApcNetSwitch
   components:
   - type: WallMount
     arc: 175
@@ -237,9 +169,9 @@
 # lockable buttons
 
 - type: entity
+  parent: SignalButtonDirectional
   id: LockableButton
   name: lockable button
-  parent: SignalButtonDirectional
   categories: [ HideSpawnMenu ]
   components:
   - type: Appearance
@@ -256,57 +188,57 @@
       shader: unshaded
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonCaptain
   suffix: Captain
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Captain"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonHeadOfPersonnel
   suffix: HeadOfPersonnel
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonChiefEngineer
   suffix: ChiefEngineer
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonChiefMedicalOfficer
   suffix: ChiefMedicalOfficer
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonHeadOfSecurity
   suffix: HeadOfSecurity
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonResearchDirector
   suffix: ResearchDirector
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonCommand
   suffix: Command
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Command"]]
@@ -318,9 +250,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonCryogenics
   suffix: Cryogenics
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Cryogenics"]]
@@ -332,41 +264,41 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonSecurity
   suffix: Security
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Security"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonDetective
   suffix: Detective
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Detective"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonArmory
   suffix: Armory
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Armory"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonBrig
   suffix: Brig
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Brig"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonLawyer
   suffix: Lawyer
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Lawyer"]]
@@ -378,9 +310,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonEngineering
   suffix: Engineering
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Engineering"]]
@@ -392,9 +324,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonMedical
   suffix: Medical
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Medical"]]
@@ -406,17 +338,17 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonQuartermaster
   suffix: Quartermaster
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonSalvage
   suffix: Salvage
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Salvage"]]
@@ -428,9 +360,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonCargo
   suffix: Cargo
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Cargo"]]
@@ -442,9 +374,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonResearch
   suffix: Research
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Research"]]
@@ -456,9 +388,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonService
   suffix: Service
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Service"]]
@@ -470,9 +402,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonMaintenance
   suffix: Maintenance
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Maintenance"]]
@@ -484,9 +416,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonExternal
   suffix: External
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["External"]]
@@ -498,9 +430,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonJanitor
   suffix: Janitor
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Janitor"]]
@@ -512,9 +444,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonTheatre
   suffix: Theatre
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Theatre"]]
@@ -526,9 +458,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonBar
   suffix: Bar
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Bar"]]
@@ -540,9 +472,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonChemistry
   suffix: Chemistry
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Chemistry"]]
@@ -554,9 +486,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonKitchen
   suffix: Kitchen
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Kitchen"]]
@@ -568,9 +500,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonChapel
   suffix: Chapel
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Chapel"]]
@@ -582,9 +514,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonHydroponics
   suffix: Hydroponics
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
@@ -596,9 +528,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonAtmospherics
   suffix: Atmospherics
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
@@ -610,9 +542,9 @@
     # Sunrise-end
 
 - type: entity
+  parent: LockableButton
   id: LockableButtonCentcomm
   suffix: CentComm
-  parent: LockableButton
   components:
   - type: AccessReader
     access: [["CentralCommand"]]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
new file mode 100644
index 0000000000..ed585aa185
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
@@ -0,0 +1,83 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelescreen
+  suffix: camera monitor
+  name: telescreen
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+  - type: Construction
+    graph: WallmountTelescreen
+    node: Telescreen
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: DeviceNetworkRequiresPower
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: WallmountTelescreenFrame
+  name: telescreen frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelescreen
+    node: TelescreenFrame
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
new file mode 100644
index 0000000000..b600ece985
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
@@ -0,0 +1,96 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelevision
+  suffix: entertainment
+  name: television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: Television
+  - type: Sprite
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceNetworkRequiresPower
+  - type: Speech
+  - type: SurveillanceCameraSpeaker
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
+  - type: StationAiWhitelist
+
+- type: entity
+  parent: BaseWallmountGlass
+  id: WallmountTelevisionFrame
+  name: television frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: TelevisionFrame
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index ede1680daa..da3955d402 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
@@ -88,8 +82,6 @@
       map: ["airAlarmState"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Transform
-    anchored: true
   - type: Construction
     graph: AirAlarm
     node: air_alarm
@@ -121,17 +113,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:
@@ -149,11 +135,29 @@
     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
   parent: AirAlarm
-  name: air alarm
   description: An alien air alarm. Hopefully they didn't breathe poison.
   components:
   - type: Sprite
@@ -163,17 +167,11 @@
       map: ["airAlarmBase"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Construction
 
 - type: entity
   id: AirAlarmAssemblyXeno
   parent: AirAlarmAssembly
-  name: air alarm assembly
   description: An alien air alarm. Why are the wires pulsating?...
   components:
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
-    layers:
-    - state: alarm_b1
-      map: [ "enum.ConstructionVisuals.Layer" ]
-  - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
similarity index 84%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
index 391a98e8fb..1f2a20dc30 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
@@ -1,10 +1,11 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: FireAlarm
   name: fire alarm
   description: A fire alarm. Spicy!
   components:
-  - type: WallMount
-  - type: ApcPowerReceiver
+  - type: LightningTarget
+    priority: 0
   - type: Electrified
     enabled: false
     usesApcPower: true
@@ -39,8 +40,6 @@
   - type: Tag
     tags:
       - FireAlarm
-  - type: Clickable
-  - type: InteractionOutline
   - type: FireAlarm
   - type: AtmosAlertsDevice
     group: FireAlarm
@@ -108,19 +107,13 @@
               params:
                 volume: -4
   - type: StationAiWhitelist
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: FireAlarmAssembly
   name: fire alarm assembly
   description: A fire alarm assembly. Very mild.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
@@ -136,39 +129,38 @@
   - 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
   parent: FireAlarm
-  name: fire alarm
   description: An alien fire alarm. Works just the same!
   components:
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
-    layers:
-    - state: fire0
-      map: ["fireAlarmBase"]
-    - state: fire_off
-      map: ["fireAlarmState"]
-    - state: fire_b2
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - type: Construction
 
 - type: entity
   id: FireAlarmAssemblyXeno
   parent: FireAlarmAssembly
-  name: fire alarm assembly
   description: An alien fire alarm assembly. Good luck with the wires.
   components:
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
-    layers:
-    - state: fire_b1
-      map: [ "enum.ConstructionVisuals.Layer" ]
-  - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
index 7a343ab6ad..6d04ada47c 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
@@ -1,12 +1,11 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: BaseIntercom
   name: intercom
   description: An intercom. For when the station just needs to know something.
   abstract: true
   components:
   - type: StationAiWhitelist
-  - type: WallMount
-  - type: ApcPowerReceiver
   - type: Electrified
     enabled: false
     usesApcPower: true
@@ -27,9 +26,6 @@
   - type: VoiceOverride # This is for the wire that makes an electricity zapping noise.
     speechVerbOverride: Electricity
     enabled: false
-  - type: ExtensionCableReceiver
-  - type: Clickable
-  - type: InteractionOutline
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanelSecurity
@@ -60,9 +56,6 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
       visible: false
-  - type: Transform
-    noRot: false
-    anchored: true
   - type: WiresPanel
   - type: Wires
     boardName: wires-board-name-intercom
@@ -83,9 +76,6 @@
     containers:
     - board
     - key_slots
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -123,19 +113,12 @@
         enum.RadioDeviceVisualLayers.Speaker:
           True: { visible: true }
           False: { visible: false }
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
   id: IntercomAssembly
   name: intercom assembly
   description: An intercom. It doesn't seem very helpful right now.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/intercom.rsi
@@ -154,12 +137,6 @@
   - type: Construction
     graph: Intercom
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 # this weird inheritance BS exists for construction shitcode
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
similarity index 71%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index cd9b3a6ca4..e39a3d5ca7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -1,19 +1,9 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: Screen
   name: screen
   description: Displays text or time.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Transform
-    anchored: true
-  - type: WallMount
-    arc: 360
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Appearance
   - type: Rotatable
   - type: TextScreenVisuals
     textOffset: 0,3
@@ -24,14 +14,20 @@
     sprite: Structures/Wallmounts/screen.rsi
     state: screen
     noRot: true
-  - type: Construction
-    graph: Timer
-    node: screen
+  - type: Appearance
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: ApcPowerReceiver
     powerLoad: 100
-  - type: Electrified
-    enabled: false
-    usesApcPower: true
   - type: ExtensionCableReceiver
   - type: Screen
   - type: DeviceNetwork
@@ -42,6 +38,7 @@
   id: ArrivalsShuttleTimer
   parent: Screen
   name: arrivals screen
+  description: Displays time of arrivals shuttle ETA.
   components:
   - type: DeviceNetwork
     deviceNetId: Private
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
similarity index 62%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
index becdfc7f65..39643fb850 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
@@ -1,22 +1,15 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapBroken
   name: station map
   description: A virtual map of the surrounding station.
   suffix: Wall broken
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: InteractionOutline
-    - type: Clickable
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       drawdepth: WallMountedItems
       layers:
         - state: station_map_broken
-    - type: Damageable
-      damageContainer: StructuralInorganic
     - type: Destructible
       thresholds:
         - trigger:
@@ -30,24 +23,22 @@
               acts: [ "Destruction" ]
 
 - type: entity
+  parent: BaseWallmountMachine
   id: StationMap
   name: station map
-  parent: BaseComputer
   description: A virtual map of the surrounding station.
   suffix: Wall
-  placement:
-    mode: SnapgridCenter
   components:
+    - type: WallMount
+      arc: 360
+    - type: Appearance
     - type: StationMap
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       layers:
-      - map: ["computerLayerBody"]
-        state: station_map0
-      - map: ["computerLayerScreen"]
-        state: unshaded
+      - state: station_map0
+      - state: unshaded
+        shader: unshaded
     - type: Icon
       sprite: Structures/Machines/station_map.rsi
       state: station_map0
@@ -59,9 +50,6 @@
         board: !type:Container
     - type: ApcPowerReceiver
       powerLoad: 200
-    - type: WallMount
-      arc: 360
-    - type: ExtensionCableReceiver
     - type: Construction
       graph: StationMap
       node: station_map
@@ -70,42 +58,52 @@
       key: enum.StationMapUiKey.Key
     - type: Destructible
       thresholds:
-        - trigger: # Excess damage, don't spawn entities
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:PlaySoundBehavior
-              sound:
-                collection: GlassBreak
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 100
-          behaviors:
-            - !type:PlaySoundBehavior
-              sound:
-                collection: GlassBreak
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                StationMapBroken:
-                  min: 1
-                  max: 1
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
+      - trigger: # Excess damage, don't spawn entities
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: GlassBreak
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: GlassBreak
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            StationMapBroken:
+              min: 1
+              max: 1
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
     - type: UserInterface
       interfaces:
         enum.StationMapUiKey.Key:
           type: StationMapBoundUserInterface
+    - type: EmitSoundOnUIOpen
+      sound:
+        collection: Keyboard
+        params:
+          volume: -1
+          variation: 0.10
+          pitch: 1.10  # low pitch keyboard sounds feel kinda weird
+      blacklist:
+        tags:
+        - NoConsoleSound
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapAssembly
   name: station map assembly
   description: A station map assembly.
   components:
   - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
+    arc: 360
   - type: Sprite
     sprite: Structures/Machines/station_map.rsi
     layers:
@@ -122,9 +120,3 @@
   - type: Construction
     graph: StationMap
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
similarity index 85%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
index 1f2a5ebeb0..a9003f7e79 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
@@ -1,24 +1,28 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: SignalTimer
   name: signal timer
   description: It's a timer for sending timed signals to things.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
   - type: StationAiWhitelist
-  - type: Transform
-    anchored: true
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
     state: on
   - type: Appearance
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: Rotatable
   - type: SignalTimer
     canEditLabel: false
@@ -35,12 +39,9 @@
     interfaces:
       enum.SignalTimerUiKey.Key:
         type: SignalTimerBoundUserInterface
-  - type: ApcPowerReceiver
-    powerLoad: 100
   - type: Electrified
     enabled: false
     usesApcPower: true
-  - type: ExtensionCableReceiver
   - type: ActivatableUIRequiresPower
   - type: Construction
     graph: Timer
@@ -66,7 +67,7 @@
     color: FloralWhite
     textOffset: 0,6
     timerOffset: 0,6
-    textLength: 5
+    # textLength: 5 This field does not exist. Bug?
     rows: 1
   - type: Sprite
     drawdepth: WallMountedItems
@@ -102,17 +103,10 @@
 # Construction Frame
 
 - type: entity
-  categories: [ HideSpawnMenu ]
   id: TimerFrame
   name: timer frame
   description: A construction frame for a timer.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signalscreen.rsi
@@ -121,3 +115,4 @@
     graph: Timer
     node: frame
   - type: WallMount
+    arc: 360
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
new file mode 100644
index 0000000000..49e4a62fd4
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
@@ -0,0 +1,53 @@
+- type: entity
+  id: BaseWallmount
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+  - type: Physics
+    canCollide: false
+  - 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/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
deleted file mode 100644
index 2c076fdff4..0000000000
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-- type: entity
-  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
-# Sunrise-Edit
-#  - type: MagicMirror #instant and silent
-#    changeHairSound: null
-#    addSlotTime: 0
-#    removeSlotTime: 0
-#    selectSlotTime: 0
-#    changeSlotTime: 0
-#  - type: ActivatableUI
-#    key: enum.MagicMirrorUiKey.Key
-#    singleUser: true
-#  - type: UserInterface
-#    interfaces:
-#      enum.MagicMirrorUiKey.Key:
-#        type: MagicMirrorBoundUserInterface
-
-- type: entity
-  parent: Mirror
-  id: MirrorModern
-  suffix: rectangle
-  components:
-  - type: Sprite
-    state: rectangle-mirror
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
deleted file mode 100644
index 8c98831e1f..0000000000
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ /dev/null
@@ -1,179 +0,0 @@
-- type: entity
-  parent: ComputerSurveillanceWirelessCameraMonitor
-  id: ComputerTelevision
-  name: wooden television
-  description: Finally, some decent reception around here...
-  components:
-  - type: Sprite
-    noRot: true
-    drawdepth: SmallObjects
-    layers:
-    - map: ["computerLayerBody"]
-      state: television
-    - map: ["computerLayerScreen"]
-      state: detective_television
-  - type: Computer
-    board: ComputerTelevisionCircuitboard
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 200
-        mask:
-          - TabletopMachineMask
-        layer:
-          - TabletopMachineLayer
-
-- type: entity
-  parent: BaseComputer
-  id: WallmountTelescreenFrame
-  name: telescreen frame
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelescreen
-    node: TelescreenFrame
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Machines/computers.rsi
-    layers:
-      - map: ["computerLayerBody"]
-        state: telescreen_frame
-      - map: ["computerLayerScreen"]
-        state: telescreen
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.20,-0.10,0.25,0.35"
-        density: 250
-        mask:
-          - FullTileMask
-        layer:
-          - WallLayer
-  - type: WallMount
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors: #excess damage, don't spawn entities.
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Transform
-    anchored: true
-
-- type: entity
-  parent: WallmountTelescreenFrame
-  id: WallmountTelescreen
-  suffix: camera monitor
-  name: telescreen
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelescreen
-    node: Telescreen
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
-  - type: DeviceNetwork
-    deviceNetId: Wired
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WiredNetworkConnection
-  - type: DeviceNetworkRequiresPower
-  - type: SurveillanceCameraMonitor
-  - type: ActivatableUI
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: ActivatableUIRequiresVision
-  - type: UserInterface
-    interfaces:
-        enum.SurveillanceCameraMonitorUiKey.Key:
-          type: SurveillanceCameraMonitorBoundUserInterface
-
-# Wall Televisions
-
-- type: entity
-  parent: WallmountTelescreenFrame
-  id: WallmountTelevisionFrame
-  name: television frame
-  description: Finally, some decent reception around here...
-  components:
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.75,-0.10,0.75,0.35"
-        density: 75
-        mask:
-          - FullTileMask
-        layer:
-          - WallLayer
-  - type: Construction
-    graph: WallmountTelevision
-    node: TelevisionFrame
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Wallmounts/flatscreentv.rsi
-    layers:
-      - map: ["computerLayerBody"]
-        state: television_wall
-      - map: ["computerLayerScreen"]
-        state: television_wallscreen
-
-- type: entity
-  parent: WallmountTelevisionFrame
-  id: WallmountTelevision
-  suffix: entertainment
-  name: television
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelevision
-    node: Television
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceNetworkRequiresPower
-  - type: Speech
-  - type: SurveillanceCameraSpeaker
-  - type: SurveillanceCameraMonitor
-  - type: ActivatableUI
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: ActivatableUIRequiresVision
-  - type: UserInterface
-    interfaces:
-        enum.SurveillanceCameraMonitorUiKey.Key:
-          type: SurveillanceCameraMonitorBoundUserInterface
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 0309309184..334fbb3003 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -77,7 +77,7 @@
           Unprimed:
             state: gibtonite_inactive
             visible: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     examinable: false
     beepInterval: 0.4
     beepSound:
@@ -86,6 +86,8 @@
     min: 8
     max: 10
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: DemolitionCharge
     totalIntensity: 450
@@ -109,6 +111,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
 
 # Ore veins
 - type: entity
@@ -2003,7 +2006,7 @@
     - map: [ "enum.EdgeLayer.West" ]
       state: rock_chromite_west
     - state: rock_coal
-    map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+      map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
 - type: entity
   id: WallRockChromiteGold
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 1209c67093..3c0bcb2a42 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -1668,3 +1668,74 @@
   - type: IconSmooth
     key: cobblebricks
     base: cobblebrick
+
+# Cardboard
+
+- type: entity
+  id: Cardwall
+  parent: BaseStructure
+  name: cardboard wall
+  description: Budget cuts are hitting hard.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/pierce.ogg"
+  - type: Tag
+    tags:
+    - Wall
+  - type: Sprite
+    drawdepth: SmallObjects #so bullets pass 'through'
+    sprite: Structures/Walls/card.rsi
+  - type: Icon
+    sprite: Structures/Walls/card.rsi
+    state: full
+  - type: Construction
+    graph: Cardwall
+    node: cardwall
+    deconstructionTarget: start
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Card
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - FlimsyLayer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 80 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: cards
+    base: card
+  - type: Occluder 
+  - type: BlockWeather
+  - type: SunShadowCast
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
index 6db8426bf6..2835c60a3f 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -77,6 +77,9 @@
   name: plastitanium window
   parent: PlastitaniumWindowSquareBase
   suffix: indestructible
+  components:
+  - type: ExaminableDamage
+    messages: null
 
 - type: entity
   id: PlastitaniumWindow
@@ -166,6 +169,9 @@
   name: plastitanium window
   parent: PlastitaniumWindowDiagonalBase
   suffix: diagonal, indestructible
+  components:
+  - type: ExaminableDamage
+    messages: null
 
 - type: entity
   id: PlastitaniumWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index 414de828e8..8b48c7f60d 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -260,6 +260,7 @@
   - type: Tag
     tags:
     - Diagonal
+    - Window
   - type: IconSmooth
     mode: Diagonal
     key: walls
diff --git a/Resources/Prototypes/Entities/Structures/lever.yml b/Resources/Prototypes/Entities/Structures/lever.yml
new file mode 100644
index 0000000000..7efb4cea57
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/lever.yml
@@ -0,0 +1,53 @@
+- type: entity
+  id: TwoWayLever
+  name: two way lever
+  description: A two way lever.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: StationAiWhitelist
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Sprite
+      drawdepth: FloorObjects
+      sprite: Structures/conveyor.rsi
+      layers:
+        - state: switch-off
+          map: ["enabled", "enum.TwoWayLeverState.Middle"]
+    - type: TwoWayLever
+    - type: UseDelay
+      delay: 0.2 # prevent light-toggling auto-clickers.
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.TwoWayLeverVisuals.State:
+          enabled:
+            Right: { state: switch-fwd }
+            Middle: { state: switch-off }
+            Left: { state: switch-rev }
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - type: Construction
+      graph: LeverGraph
+      node: LeverNode
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSource
+      ports:
+        - Left
+        - Right
+        - Middle
+    - type: Tag
+      tags:
+      - Structure
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index ab705c035b..088ddfda61 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -35,9 +35,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: StaticPrice
     price: 100
 
diff --git a/Resources/Prototypes/Entities/Structures/spider_web.yml b/Resources/Prototypes/Entities/Structures/spider_web.yml
new file mode 100644
index 0000000000..962b5adbbd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/spider_web.yml
@@ -0,0 +1,137 @@
+- type: entity
+  id: SpiderWebBase
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: PlacementReplacement
+    key: web
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/slash.ogg"
+  - type: Sprite
+    sprite: Structures/floor_web.rsi
+    drawdepth: WallMountedItems
+  - type: Appearance
+  - type: Clickable
+  - type: Transform
+    anchored: true
+  - type: Physics
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Temperature
+    heatDamage:
+      types:
+        Heat: 5
+    coldDamage: {}
+    coldDamageThreshold: 0
+  - type: Flammable
+    fireSpread: true
+    damage:
+      types:
+        Heat: 5
+  - type: Reactive
+    groups:
+      Flammable: [Touch]
+      Extinguish: [Touch]
+  - type: SpiderWebObject
+  - type: IconSmooth
+    key: web
+    additionalKeys:
+    - walls
+    base: web_
+
+- type: entity
+  id: SpiderWeb
+  parent: SpiderWebBase
+  name: spider web
+  description: It's stringy and sticky.
+  components:
+  - type: Sprite
+    color: "#ffffffdd"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        hard: false
+        density: 7
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        layer:
+        - MidImpassable
+  - type: Destructible
+    thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWebSilk:
+            min: 0
+            max: 1
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.5
+    sprintSpeedModifier: 0.5
+    ignoreWhitelist:
+      components:
+      - IgnoreSpiderWeb
+
+- type: entity
+  id: SpiderWebClown
+  parent: SpiderWebBase
+  name: clown spider web
+  description: It's stringy and slippy.
+  components:
+  - type: Sprite
+    color: "#ffa3fc"
+  - type: Slippery
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        hard: false
+        layer:
+        - SlipLayer
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 1000
+        mask:
+        - ItemMask
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: Food
+    delay: 2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 2
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
index 5b8e794309..aaf77989cd 100644
--- a/Resources/Prototypes/Entities/categories.yml
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -27,3 +27,8 @@
   id: DoNotMap
   name: entity-category-name-donotmap
   suffix: entity-category-suffix-donotmap
+
+- type: entityCategory
+  id: StatusEffects
+  name: entity-category-name-status-effects
+  hideSpawnMenu: true
\ No newline at end of file
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 6dd81058ca..8eef7e1cb5 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1479,3 +1479,12 @@
   flavorType: Base
   description: flavor-base-trashy
 
+- type: flavor
+  id: artifactglue
+  flavorType: Complex
+  description: flavor-complex-artifact-glue
+
+- type: flavor
+  id: motivating
+  flavorType: Base
+  description: flavor-base-motivating
diff --git a/Resources/Prototypes/GameRules/pests.yml b/Resources/Prototypes/GameRules/pests.yml
index c0a746a138..9ddee3d709 100644
--- a/Resources/Prototypes/GameRules/pests.yml
+++ b/Resources/Prototypes/GameRules/pests.yml
@@ -82,6 +82,8 @@
       prob: 0.03
     - id: MobMothroach
       prob: 0.008
+    - id: MobMoproach
+      prob: 0.004
 
 - type: entity
   id: SnailMigrationLowPop
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 3901a7d5d2..54a2e616ad 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -258,6 +258,31 @@
       mindRoles:
       - MindRoleTraitorReinforcement
 
+- type: entity
+  id: Changeling
+  parent: BaseGameRule
+  components:
+  - type: GameRule
+    minPlayers: 25
+  - type: AntagSelection
+    definitions:
+    - prefRoles: [ Changeling ]
+      max: 3
+      playerRatio: 15
+      briefing:
+        text: changeling-role-greeting
+        color: Red
+        sound: /Audio/Ambience/Antag/changeling_start.ogg
+      components:
+      - type: ChangelingDevour
+      - type: ChangelingIdentity
+      - type: ChangelingTransform
+      - type: ActionGrant
+        actions:
+        - ActionRetractableItemArmBlade # Temporary addition, will inevitably be a purchasable in the bio-store
+      mindRoles:
+      - MindRoleChangeling
+
 - type: entity
   id: Revolutionary
   parent: BaseGameRule
@@ -322,7 +347,7 @@
     - WizardSurviveObjective
     - WizardDemonstrateObjective
   - type: LoadMapRule
-    gridPath: /Maps/Shuttles/wizard.yml
+    mapPath: /Maps/Nonstations/wizardsden.yml
   - type: RuleGrids
   - type: AntagSelection
   - type: AntagLoadProfileRule
diff --git a/Resources/Prototypes/GameRules/subgamemodes.yml b/Resources/Prototypes/GameRules/subgamemodes.yml
index 45c97aff14..2213623c28 100644
--- a/Resources/Prototypes/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/GameRules/subgamemodes.yml
@@ -13,7 +13,7 @@
       maxPicks: 1
     - groups: ThiefObjectiveGroups
       maxPicks: 10
-    maxDifficulty: 7
+    maxDifficulty: 2.5
   - type: AntagSelection
     agentName: thief-round-end-agent-name
     selectionTime: IntraPlayerSpawn
@@ -25,8 +25,11 @@
       allowNonHumans: true
       multiAntagSetting: NotExclusive
       startingGear: ThiefGear
-      # components: # Sunrise-Edit
-      # - type: Pacified # Sunrise-Edit
+      components:
+      - type: Pacified
+      - type: Thieving
+        stripTimeReduction: 2
+        stealthy: true
       mindRoles:
       - MindRoleThief
       briefing:
diff --git a/Resources/Prototypes/Guidebook/engineering.yml b/Resources/Prototypes/Guidebook/engineering.yml
index e0803044dc..96e049a399 100644
--- a/Resources/Prototypes/Guidebook/engineering.yml
+++ b/Resources/Prototypes/Guidebook/engineering.yml
@@ -120,6 +120,7 @@
   - SignalValve
   - PneumaticValve
   - PassiveGate
+  - PressureRegulator
 
 - type: guideEntry
   id: ManualValve
@@ -141,6 +142,11 @@
   name: guide-entry-passivegate
   text: "/ServerInfo/Guidebook/Engineering/PassiveGate.xml"
 
+- type: guideEntry
+  id: PressureRegulator
+  name: guide-entry-ressureregulator
+  text: "/ServerInfo/Guidebook/Engineering/PressureRegulator.xml"
+
 - type: guideEntry
   id: MixingAndFiltering
   name: guide-entry-mixingandfiltering
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 0c7b1c781e..74b433e04f 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -3,13 +3,13 @@
   name: guide-entry-medical
   text: "/ServerInfo/Guidebook/Medical/Medical.xml"
   children:
-  - Medical Doctor
+  - MedicalDoctor
   - Chemist
   - Cloning
   - Cryogenics
 
 - type: guideEntry
-  id: Medical Doctor
+  id: MedicalDoctor
   name: guide-entry-medicaldoctor
   text: "/ServerInfo/Guidebook/Medical/MedicalDoctor.xml"
 
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 4d338d4c6c..a99c21fde0 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -838,6 +838,7 @@
     - FoodOnion
   mutationPrototypes:
     - onionred
+    - bloonion
   lifespan: 25
   maturation: 8
   production: 6
@@ -2002,3 +2003,38 @@
       Min: 1
       Max: 2
       PotencyDivisor: 40
+
+- type: seed
+  id: bloonion
+  name: seeds-bloonion-name
+  noun: seeds-noun-seeds
+  displayName: seeds-bloonion-display-name
+  plantRsi: Objects/Specific/Hydroponics/bloonion.rsi
+  packetPrototype: BloonionSeeds
+  productPrototypes:
+  - FoodBloonion
+  lifespan: 25
+  maturation: 15
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 4
+  waterConsumption: 0.60
+  nutrientConsumption: 0.50
+  chemicals:
+    Potassium:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Phosphorus:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Sugar:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Allicin:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
diff --git a/Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml
new file mode 100644
index 0000000000..5460d730eb
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/parrot_inventory_template.yml
@@ -0,0 +1,10 @@
+- type: inventoryTemplate
+  id: parrot
+  slots:
+  - name: ears
+    slotTexture: ears
+    slotFlags: EARS
+    stripTime: 3
+    uiWindowPos: 0,2
+    strippingWindowPos: 0,0
+    displayName: Ears
diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
index e6c2984221..b800995038 100644
--- a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
@@ -9,8 +9,7 @@
     displayName: Mask
     whitelist:
       tags:
-        - PetWearable
-
+      - PetWearable
   - name: suitstorage
     slotTexture: suit_storage
     slotFlags: SUITSTORAGE
@@ -20,6 +19,45 @@
     displayName: Suit Storage
     whitelist:
       components:
-        - GasTank
-
+      - GasTank
 
+- type: inventoryTemplate
+  id: petAdvanced
+  slots:
+  - name: mask
+    slotTexture: mask
+    slotFlags: MASK
+    uiWindowPos: 0,2
+    strippingWindowPos: 1,1
+    displayName: Mask
+    whitelist:
+      tags:
+      - PetWearable
+  - name: suitstorage
+    slotTexture: suit_storage
+    slotFlags: SUITSTORAGE
+    stripTime: 3
+    uiWindowPos: 0,1
+    strippingWindowPos: 2,5
+    displayName: Suit Storage
+    whitelist:
+      components:
+      - GasTank
+  - name: head
+    slotTexture: head
+    slotFlags: HEAD
+    uiWindowPos: 1,3
+    strippingWindowPos: 1,0
+    displayName: Head
+    whitelist:
+      tags:
+      - PetWearable
+  - name: eyes
+    slotTexture: glasses
+    slotFlags: EYES
+    uiWindowPos: 1,2
+    strippingWindowPos: 1,2
+    displayName: Head
+    whitelist:
+      tags:
+      - PetWearable
diff --git a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
new file mode 100644
index 0000000000..28b95eb3d3
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
@@ -0,0 +1,71 @@
+- type: inventoryTemplate
+  id: scurret
+  slots:
+  - name: ears
+    slotTexture: ears
+    slotFlags: EARS
+    stripTime: 3
+    uiWindowPos: 0,2
+    strippingWindowPos: 1,2
+    displayName: Ears
+  - name: gloves
+    slotTexture: gloves
+    slotFlags: GLOVES
+    uiWindowPos: 0,1
+    strippingWindowPos: 2,2
+    displayName: Gloves
+  - name: head
+    slotTexture: head
+    slotFlags: HEAD
+    uiWindowPos: 1,3
+    strippingWindowPos: 0,0
+    displayName: Head
+  - name: mask
+    slotTexture: mask
+    slotFlags: MASK
+    uiWindowPos: 1,2
+    strippingWindowPos: 1,1
+    displayName: Mask
+  - name: neck
+    slotTexture: neck
+    slotFlags: NECK
+    uiWindowPos: 1,1
+    strippingWindowPos: 0,1
+    displayName: Neck
+  - name: jumpsuit
+    slotTexture: uniform
+    slotFlags: INNERCLOTHING
+    stripTime: 6
+    uiWindowPos: 1,0
+    strippingWindowPos: 0,2
+    displayName: Jumpsuit
+  - name: id
+    slotTexture: id
+    fullTextureName: template_small
+    slotFlags: IDCARD
+    slotGroup: SecondHotbar
+    stripTime: 6
+    uiWindowPos: 2,1
+    strippingWindowPos: 2,4
+    displayName: ID
+  - name: suitstorage
+    slotTexture: suit_storage
+    slotFlags:   SUITSTORAGE
+    slotGroup: MainHotbar
+    stripTime: 3
+    uiWindowPos: 2,0
+    strippingWindowPos: 2,5
+    dependsOn: jumpsuit
+    dependsOnComponents:
+    - type: AllowSuitStorage
+    displayName: Suit Storage
+  - name: outerClothing
+    slotTexture: suit
+    slotFlags: OUTERCLOTHING
+    stripTime: 6
+    uiWindowPos: 0,3
+    strippingWindowPos: 1,3
+    displayName: Suit
+    whitelist:
+      tags:
+      - ScurretWearable
diff --git a/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml
index a775b6373b..0f4650141d 100644
--- a/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml
@@ -64,7 +64,7 @@
     displayName: Eyes
     whitelist:
       tags:
-      - CorgiWearable
+      - PetWearable
   - name: head
     slotTexture: head
     slotFlags: HEAD
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index 27e41e6461..eb252a0c43 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -77,3 +77,34 @@
   id: ChaplainHoodie
   equipment:
     outerClothing: ClothingOuterHoodieChaplain
+
+# Bible/Holy Book
+- type: loadout
+  id: Bible
+  storage:
+    back:
+    - Bible
+
+- type: loadout
+  id: BibleDruid
+  storage:
+    back:
+    - BibleDruid
+
+- type: loadout
+  id: BibleNanoTrasen
+  storage:
+    back:
+    - BibleNanoTrasen
+
+- type: loadout
+  id: BibleSatanic
+  storage:
+    back:
+    - BibleSatanic
+
+- type: loadout
+  id: BibleTanakh
+  storage:
+    back:
+    - BibleTanakh
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
index 142720f4e8..bb931d55bd 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -76,31 +76,37 @@
   id: HeadofSecurityJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoS
+  groupBy: "jumpsuit"
 
 - type: loadout
   id: HeadofSecurityJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoS
+  groupBy: "jumpskirt"
 
 - type: loadout
   id: HeadofSecurityTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoSAlt
+  groupBy: "jumpsuit"
 
 - type: loadout
   id: HeadofSecurityTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoSAlt
+  groupBy: "jumpskirt"
 
 - type: loadout
   id: HeadofSecurityFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHosFormal
+  groupBy: "jumpsuit"
 
 - type: loadout
   id: HeadofSecurityFormalSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHosFormal
+  groupBy: "jumpskirt"
 
 #Sunrise-Start
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index e1d45e4784..ccaf3abe42 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -26,7 +26,7 @@
   id: Headphones
   storage:
     back:
-    - ClothingNeckHeadphones
+    - ClothingMultipleHeadphones
 
 # Toys
 - type: loadout
@@ -56,30 +56,35 @@
   storage:
     back:
     - Lighter
+  groupBy: "smokeables"
 
 - type: loadout
   id: CigPackGreen
   storage:
     back:
     - CigPackGreen
+  groupBy: "smokeables"
 
 - type: loadout
   id: CigPackRed
   storage:
     back:
     - CigPackRed
+  groupBy: "smokeables"
 
 - type: loadout
   id: CigPackBlue
   storage:
     back:
     - CigPackBlue
+  groupBy: "smokeables"
 
 - type: loadout
   id: CigPackBlack
   storage:
     back:
     - CigPackBlack
+  groupBy: "smokeables"
 
 - type: loadout
   id: CigarCase
@@ -89,6 +94,7 @@
   storage:
     back:
     - CigarCase
+  groupBy: "smokeables"
 
 - type: loadout
   id: CigarGold
@@ -98,6 +104,7 @@
   storage:
     back:
     - CigarGold
+  groupBy: "smokeables"
 
 # Pins
 - type: loadout
@@ -105,108 +112,194 @@
   storage:
     back:
     - ClothingNeckLGBTPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckAllyPin
   storage:
     back:
     - ClothingNeckAllyPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckAromanticPin
   storage:
     back:
     - ClothingNeckAromanticPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckAsexualPin
   storage:
     back:
     - ClothingNeckAsexualPin
-
-- type: loadout
-  id: ClothingNeckAroacePin
-  storage:
-    back:
-    - ClothingNeckAroacePin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckBisexualPin
   storage:
     back:
     - ClothingNeckBisexualPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckGayPin
   storage:
     back:
     - ClothingNeckGayPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckIntersexPin
   storage:
     back:
     - ClothingNeckIntersexPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckLesbianPin
   storage:
     back:
     - ClothingNeckLesbianPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckNonBinaryPin
   storage:
     back:
     - ClothingNeckNonBinaryPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckPansexualPin
   storage:
     back:
     - ClothingNeckPansexualPin
-
-- type: loadout
-  id: ClothingNeckPluralPin
-  storage:
-    back:
-    - ClothingNeckPluralPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckOmnisexualPin
   storage:
     back:
     - ClothingNeckOmnisexualPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckGenderqueerPin
   storage:
     back:
     - ClothingNeckGenderqueerPin
-
-- type: loadout
-  id: ClothingNeckGenderfluidPin
-  storage:
-    back:
-    - ClothingNeckGenderfluidPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckTransPin
   storage:
     back:
     - ClothingNeckTransPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckAutismPin
   storage:
     back:
     - ClothingNeckAutismPin
+  groupBy: "pin"
 
 - type: loadout
   id: ClothingNeckGoldAutismPin
   storage:
     back:
     - ClothingNeckGoldAutismPin
+  groupBy: "pin"
+
+- type: loadout
+  id: ClothingNeckAroacePin
+  storage:
+    back:
+    - ClothingNeckAroacePin
+  groupBy: "pin"
+
+- type: loadout
+  id: ClothingNeckPluralPin
+  storage:
+    back:
+    - ClothingNeckPluralPin
+  groupBy: "pin"
+
+- type: loadout
+  id: ClothingNeckGenderfluidPin
+  storage:
+    back:
+    - ClothingNeckGenderfluidPin
+  groupBy: "pin"
+
+# Canes
+# The white cane is intentionally not included here. Thats for the blind.
+- type: loadout
+  id: OffsetCane
+  storage:
+    back:
+    - OffsetCane
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneWood
+  storage:
+    back:
+    - OffsetCaneWood
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneClown
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobClown
+      time: 3600 # 1hr
+  storage:
+    back:
+    - OffsetCaneClown
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneMime
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobMime
+      time: 3600 # 1hr
+  storage:
+    back:
+    - OffsetCaneMime
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneNT
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Command
+      time: 18000 # 5hr
+  storage:
+    back:
+    - OffsetCaneNT
+  groupBy: "canes"
+
+- type: loadout
+  id: Cane
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobLibrarian
+      time: 3600 # 1hr same as Jamjar.
+  storage:
+    back:
+    - Cane
+  groupBy: "canes"
 
 # Towels
 - type: loadout
@@ -219,6 +312,7 @@
   storage:
     back:
     - TowelColorWhite
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorSilver
@@ -230,6 +324,7 @@
   storage:
     back:
     - TowelColorSilver
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorGold
@@ -241,6 +336,7 @@
   storage:
     back:
     - TowelColorGold
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorLightBrown
@@ -253,6 +349,7 @@
   storage:
     back:
     - TowelColorLightBrown
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorGreen
@@ -265,6 +362,7 @@
   storage:
     back:
     - TowelColorGreen
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorDarkBlue
@@ -277,6 +375,7 @@
   storage:
     back:
     - TowelColorDarkBlue
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorOrange
@@ -289,6 +388,7 @@
   storage:
     back:
     - TowelColorOrange
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorLightBlue
@@ -301,6 +401,7 @@
   storage:
     back:
     - TowelColorLightBlue
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorPurple
@@ -313,6 +414,7 @@
   storage:
     back:
     - TowelColorPurple
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorRed
@@ -325,6 +427,7 @@
   storage:
     back:
     - TowelColorRed
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorGray
@@ -337,6 +440,7 @@
   storage:
     back:
     - TowelColorGray
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorBlack
@@ -349,6 +453,7 @@
   storage:
     back:
     - TowelColorBlack
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorDarkGreen
@@ -361,6 +466,7 @@
   storage:
     back:
     - TowelColorDarkGreen
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorMaroon
@@ -373,6 +479,7 @@
   storage:
     back:
     - TowelColorMaroon
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorYellow
@@ -385,6 +492,7 @@
   storage:
     back:
     - TowelColorYellow
+  groupBy: "towels"
 
 - type: loadout
   id: TowelColorMime
@@ -397,3 +505,4 @@
   storage:
     back:
     - TowelColorMime
+  groupBy: "towels"
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 0ac7cf82ec..74516dbb14 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -48,6 +48,12 @@
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
   - ClothingNeckGoldAutismPin
+  - OffsetCane
+  - OffsetCaneWood
+  - OffsetCaneClown
+  - OffsetCaneMime
+  - OffsetCaneNT
+  - Cane
   - TowelColorBlack
   - TowelColorDarkBlue
   - TowelColorDarkGreen
@@ -390,6 +396,17 @@
   loadouts:
   - ChaplainNeck
 
+- type: loadoutGroup
+  id: ChaplainBible
+  name: loadout-group-chaplain-bible
+  minLimit: 1
+  loadouts:
+  - Bible
+  - BibleDruid
+  - BibleNanoTrasen
+  - BibleSatanic
+  - BibleTanakh
+
 - type: loadoutGroup
   id: JanitorHead
   name: loadout-group-janitor-head
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 04dfd409a7..487e10cb17 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -164,6 +164,7 @@
   - ChaplainJumpsuit
   - CommonBackpack
   - ChaplainOuterClothing
+  - ChaplainBible
   - Glasses
   - Survival
   - Trinkets
diff --git a/Resources/Prototypes/Magic/mindswap_spell.yml b/Resources/Prototypes/Magic/mindswap_spell.yml
index 8039f12074..0a28a9683b 100644
--- a/Resources/Prototypes/Magic/mindswap_spell.yml
+++ b/Resources/Prototypes/Magic/mindswap_spell.yml
@@ -14,7 +14,7 @@
   - type: EntityTargetAction
     whitelist:
       components:
-      - Body # this also allows borgs because that supercode uses Body for no reason
+      - MobState
       - PAI # intended to mindswap pAIs and AIs
       - StationAiCore
     event: !type:MindSwapSpellEvent
diff --git a/Resources/Prototypes/Magic/teleport_spells.yml b/Resources/Prototypes/Magic/teleport_spells.yml
index ab79a2f5d0..fc166e8c4b 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/Magic/touch_spells.yml b/Resources/Prototypes/Magic/touch_spells.yml
index ba62a76421..f3b44eabb1 100644
--- a/Resources/Prototypes/Magic/touch_spells.yml
+++ b/Resources/Prototypes/Magic/touch_spells.yml
@@ -12,7 +12,7 @@
   - type: EntityTargetAction
     whitelist:
       components:
-      - Body
+      - MobState
     canTargetSelf: false
 
 - type: entity
diff --git a/Resources/Prototypes/Maps/exo.yml b/Resources/Prototypes/Maps/exo.yml
index 4d521d0d1d..5026d68c44 100644
--- a/Resources/Prototypes/Maps/exo.yml
+++ b/Resources/Prototypes/Maps/exo.yml
@@ -2,8 +2,8 @@
   id: Exo
   mapName: 'Exo'
   mapPath: /Maps/exo.yml
-  minPlayers: 25
-  maxPlayers: 70
+  minPlayers: 40
+  maxPlayers: 80
   stations:
     Exo:
       stationProto: StandardNanotrasenStation
@@ -23,9 +23,9 @@
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
-            Botanist: [ 2, 3 ]
+            Botanist: [ 2, 2 ]
             Chef: [ 2, 2 ]
-            Janitor: [ 1, 2 ]
+            Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
@@ -54,7 +54,7 @@
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
-            CargoTechnician: [ 3, 3 ]
+            CargoTechnician: [ 4, 4 ]
             #civilian
             Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]
diff --git a/Resources/Prototypes/NPCs/mob.yml b/Resources/Prototypes/NPCs/mob.yml
index dd3378618a..77969ab92d 100644
--- a/Resources/Prototypes/NPCs/mob.yml
+++ b/Resources/Prototypes/NPCs/mob.yml
@@ -31,6 +31,19 @@
     - tasks:
         - !type:HTNCompoundTask
           task: IdleCompound
+          
+- type: htnCompound
+  id: MoproachCompound
+  branches:
+  - tasks:
+    - !type:HTNCompoundTask
+      task: FoodCompound
+  - tasks:
+    - !type:HTNCompoundTask
+      task: BufferNearbyPuddlesCompound
+  - tasks:
+    - !type:HTNCompoundTask
+      task: IdleCompound
 
 - type: htnCompound
   id: GlockroachCompound
diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index 23ad7a59a1..3274bdf977 100644
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -31,7 +31,7 @@
   query:
     - !type:ComponentQuery
       components:
-      - type: Food
+      - type: Edible
   considerations:
     - !type:TargetIsAliveCon
       curve: !type:InverseBoolCurve
@@ -50,7 +50,7 @@
   query:
   - !type:ComponentQuery
     components:
-    - type: Drink
+    - type: Edible
   considerations:
   - !type:TargetIsAliveCon
     curve: !type:InverseBoolCurve
diff --git a/Resources/Prototypes/Nutrition/edible.yml b/Resources/Prototypes/Nutrition/edible.yml
new file mode 100644
index 0000000000..3dd11521ef
--- /dev/null
+++ b/Resources/Prototypes/Nutrition/edible.yml
@@ -0,0 +1,50 @@
+# If you add a new prototype, you may want to consider adding it to IngestionSystem.API for other systems to use.
+# But only if other systems/components might want it.
+
+# Food
+
+- type: edible
+  id: Food
+  useSound: !type:SoundCollectionSpecifier
+    params:
+      variation: 0.2
+      volume: -1
+    collection: eating # I think this *should* grab the sound specifier...
+  message: edible-nom
+  otherMessage: edible-nom-other
+  verb: edible-verb-food
+  noun: edible-noun-food
+  verbName: ingestion-verb-food
+  verbIcon: /Textures/Interface/VerbIcons/cutlery.svg.192dpi.png
+
+# Drink
+
+- type: edible
+  id: Drink
+  useSound: !type:SoundPathSpecifier
+    params:
+      variation: 0.25
+      volume: -2
+    path: /Audio/Items/drink.ogg
+  message: edible-slurp
+  otherMessage: edible-slurp-other
+  verb: edible-verb-drink
+  noun: edible-noun-drink
+  verbName: ingestion-verb-drink
+  verbIcon: /Textures/Interface/VerbIcons/drink.svg.192dpi.png
+
+# Pills!
+
+- type: edible
+  id: Pill
+  useSound: !type:SoundPathSpecifier
+    params:
+      variation: 0.2
+      volume: -1
+    path: /Audio/Items/pill.ogg
+  message: edible-swallow
+  otherMessage: edible-gulp-other
+  verb: edible-verb-pill
+  noun: edible-noun-pill
+  verbName: ingestion-verb-food
+  verbIcon: /Textures/Interface/VerbIcons/cutlery.svg.192dpi.png
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index cdb98dc8bd..14bc31f23b 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -89,7 +89,6 @@
     AmePartFlatpackStealObjective: 1
     ExpeditionsCircuitboardStealObjective: 1            #sup
     CargoShuttleCircuitboardStealObjective: 1
-    SalvageShuttleCircuitboardStealObjective: 1
     ClothingEyesHudBeerStealObjective: 1                #srv
     BibleStealObjective: 1
     ClothingNeckGoldmedalStealObjective: 1              #other
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index b99696331c..98e838d954 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -170,7 +170,7 @@
   id: FlippoEngravedLighter
   name: steal-target-groups-flippo-engraved-lighter
   sprite:
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     state: zippo_engraved_icon_base
 
 - type: stealTargetGroup
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index f887029fcc..9f2caf5220 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -43,7 +43,7 @@
   id: BaseThiefStealAnimalObjective
   components:
   - type: StealCondition
-    verifyMapExistence: false
+    verifyMapExistence: true
     checkAlive: true
     objectiveNoOwnerText: objective-condition-steal-title-alive-no-owner
     descriptionText: objective-condition-thief-animal-description
@@ -136,8 +136,6 @@
   - type: Objective
     difficulty: 0.7
 
-
-
 - type: entity
   parent: BaseThiefStealCollectionObjective
   id: LAMPStealCollectionObjective
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 4f61c1555f..6fa814e439 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -91,6 +91,12 @@
   - type: TargetObjective
     title: objective-condition-maroon-person-title
   - type: PickRandomPerson
+    filters:
+    # Can't have multiple objectives to kill the same person.
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
   - type: KillPersonCondition
     requireMaroon: true
 
@@ -106,7 +112,17 @@
     unique: true
   - type: TargetObjective
     title: objective-condition-kill-maroon-title
-  - type: PickRandomHead
+  - type: PickRandomPerson
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
+    # Can't have multiple objectives to kill the same person.
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
   - type: KillPersonCondition
     # don't count missing evac as killing as heads are higher profile, so you really need to do the dirty work
     # if ce flies a shittle to centcom you better find a way onto it
@@ -138,7 +154,18 @@
     difficulty: 1.75
   - type: TargetObjective
     title: objective-condition-other-traitor-alive-title
-  - type: RandomTraitorAlive
+  - type: PickRandomPerson
+    filters:
+    - !type:HasRoleMindFilter
+      whitelist:
+        components:
+        - TraitorRole
+    # Can't have multiple objectives to help/save the same person
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - RandomTraitorAlive
+        - RandomTraitorProgress
 
 - type: entity
   parent: [BaseTraitorSocialObjective, BaseHelpProgressObjective]
@@ -149,7 +176,25 @@
     difficulty: 2.5
   - type: TargetObjective
     title: objective-condition-other-traitor-progress-title
-  - type: RandomTraitorProgress
+  - type: PickRandomPerson
+    filters:
+    - !type:HasRoleMindFilter
+      whitelist:
+        components:
+        - TraitorRole
+    # Can't help anyone who is tasked with helping:
+    # 1. thats boring
+    # 2. no cyclic progress dependencies!!!
+    - !type:ObjectiveMindFilter
+      blacklist:
+        components:
+        - HelpProgressCondition
+    # Can't have multiple objectives to help/save the same person
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - RandomTraitorAlive
+        - RandomTraitorProgress
 
 # steal
 
diff --git a/Resources/Prototypes/Paintables/airlock_groups.yml b/Resources/Prototypes/Paintables/airlock_groups.yml
new file mode 100644
index 0000000000..58b54b2dce
--- /dev/null
+++ b/Resources/Prototypes/Paintables/airlock_groups.yml
@@ -0,0 +1,40 @@
+- type: paintableGroup
+  id: AirlockStandard
+  time: 3
+  cost: 3
+  defaultStyle: basic
+  styles:
+    atmospherics: AirlockAtmospherics
+    basic: Airlock
+    cargo: AirlockCargo
+    chemistry: AirlockChemistry
+    command: AirlockCommand
+    engineering: AirlockEngineering
+    freezer: AirlockFreezer
+    hydroponics: AirlockHydroponics
+    maintenance: AirlockMaint
+    medical: AirlockMedical
+    salvage: AirlockSalvage
+    science: AirlockScience
+    security: AirlockSecurity
+    virology: AirlockVirology
+
+- type: paintableGroup
+  id: AirlockGlass
+  time: 3
+  cost: 3
+  defaultStyle: basic
+  styles:
+    atmospherics: AirlockAtmosphericsGlass
+    basic: AirlockGlass
+    cargo: AirlockCargoGlass
+    chemistry: AirlockChemistryGlass
+    command: AirlockCommandGlass
+    engineering: AirlockEngineeringGlass
+    hydroponics: AirlockHydroponicsGlass
+    maintenance: AirlockMaintGlass
+    medical: AirlockMedicalGlass
+    salvage: AirlockSalvageGlass
+    science: AirlockScienceGlass
+    security: AirlockSecurityGlass
+    virology: AirlockVirologyGlass
diff --git a/Resources/Prototypes/Paintables/canister_groups.yml b/Resources/Prototypes/Paintables/canister_groups.yml
new file mode 100644
index 0000000000..5485f07662
--- /dev/null
+++ b/Resources/Prototypes/Paintables/canister_groups.yml
@@ -0,0 +1,16 @@
+- type: paintableGroup
+  cost: 2
+  id: Canisters
+  defaultStyle: storage
+  styles:
+    air: AirCanister
+    ammonia: AmmoniaCanister
+    carbon-dioxide: CarbonDioxideCanister
+    frezon: FrezonCanister
+    nitrogen: NitrogenCanister
+    nitrous-oxide: NitrousOxideCanister
+    oxygen: OxygenCanister
+    plasma: PlasmaCanister
+    storage: StorageCanister
+    tritium: TritiumCanister
+    water-vapor: WaterVaporCanister
diff --git a/Resources/Prototypes/Paintables/categories.yml b/Resources/Prototypes/Paintables/categories.yml
new file mode 100644
index 0000000000..75998c31ba
--- /dev/null
+++ b/Resources/Prototypes/Paintables/categories.yml
@@ -0,0 +1,25 @@
+- type: paintableGroupCategory
+  id: Airlocks
+  groups:
+  - AirlockStandard
+  - AirlockGlass
+
+- type: paintableGroupCategory
+  id: Canisters
+  groups:
+  - Canisters
+
+- type: paintableGroupCategory
+  id: Crates
+  groups:
+  - CrateSteel
+  - CratePlastic
+  - CrateSecure
+
+- type: paintableGroupCategory
+  id: Lockers
+  groups:
+  - Locker
+  - Closet
+  - WallLocker
+  - WallCloset
diff --git a/Resources/Prototypes/Paintables/crate_groups.yml b/Resources/Prototypes/Paintables/crate_groups.yml
new file mode 100644
index 0000000000..117b1df12f
--- /dev/null
+++ b/Resources/Prototypes/Paintables/crate_groups.yml
@@ -0,0 +1,38 @@
+- type: paintableGroup
+  id: CrateSteel
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: CrateGenericSteel
+    electrical: CrateElectrical
+    engineering: CrateEngineering
+    radiation: CrateRadiation
+    science: CrateScience
+    surgery: CrateSurgery
+
+- type: paintableGroup
+  id: CratePlastic
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: CratePlastic
+    hydroponics: CrateHydroponics
+    medical: CrateMedical
+    oxygen: CrateInternals
+
+- type: paintableGroup
+  id: CrateSecure
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: CrateSecure
+    chemistry: CrateChemistrySecure
+    command: CrateCommandSecure
+    engineering: CrateEngineeringSecure
+    hydroponics: CrateHydroSecure
+    medical: CrateMedicalSecure
+    plasma: CratePlasma
+    private: CratePrivateSecure
+    science: CrateScienceSecure
+    secgear: CrateSecgear
+    weapon: CrateWeaponSecure
diff --git a/Resources/Prototypes/Paintables/locker_groups.yml b/Resources/Prototypes/Paintables/locker_groups.yml
new file mode 100644
index 0000000000..b9bdf1c89f
--- /dev/null
+++ b/Resources/Prototypes/Paintables/locker_groups.yml
@@ -0,0 +1,80 @@
+- type: paintableGroup
+  id: Locker
+  cost: 2
+  defaultStyle: basic
+  styles:
+    atmospherics: LockerAtmospherics
+    basic: ClosetSteelBase
+    botanist: LockerBotanist
+    brigmedic: LockerBrigmedic
+    captain: LockerCaptain
+    ce: LockerChiefEngineer
+    chemical: LockerChemistry
+    clown: LockerClown
+    cmo: LockerChiefMedicalOfficer
+    doctor: LockerMedical
+    electrical: LockerElectricalSupplies
+    engineer: LockerEngineer
+    evac: LockerEvacRepair
+    hop: LockerHeadOfPersonnel
+    hos: LockerHeadOfSecurity
+    mime: LockerMime
+    medicine: LockerMedicine
+    paramedic: LockerParamedic
+    quartermaster: LockerQuarterMaster
+    rd: LockerResearchDirector
+    representative: LockerRepresentative
+    salvage: LockerSalvageSpecialist
+    scientist: LockerScientist
+    security: LockerSecurity
+    welding: LockerWeldingSupplies
+
+- type: paintableGroup
+  id: Closet
+  cost: 2
+  defaultStyle: basic
+  styles:
+    basic: ClosetSteelBase
+    biohazard: ClosetL3
+    biohazard-janitor: ClosetL3Janitor
+    biohazard-science: ClosetL3Science
+    biohazard-security: ClosetL3Security
+    biohazard-virology: ClosetL3Virology
+    bomb: ClosetBomb
+    bomb-janitor: ClosetJanitorBomb
+    chef: ClosetChef
+    fire: ClosetFire
+    janitor: ClosetJanitor
+    legal: ClosetLegal
+    nitrogen: ClosetEmergencyN2
+    oxygen: ClosetEmergency
+    radiation: ClosetRadiationSuit
+    tool: ClosetTool
+
+- type: paintableGroup
+  id: WallCloset
+  cost: 2
+  defaultStyle: basic
+  styles:
+    atmospherics: ClosetWallAtmospherics
+    basic: ClosetWall
+    black: ClosetWallBlack
+    blue: ClosetWallBlue
+    fire: ClosetWallFire
+    green: ClosetWallGreen
+    grey: ClosetWallGrey
+    mixed: ClosetWallMixed
+    nitrogen: ClosetWallEmergencyN2
+    orange: ClosetWallOrange
+    oxygen: ClosetWallEmergency
+    pink: ClosetWallPink
+    white: ClosetWallWhite
+    yellow: ClosetWallYellow
+
+- type: paintableGroup
+  id: WallLocker
+  cost: 2
+  defaultStyle: medical
+  styles:
+    evac: LockerWallEvacRepair
+    medical: LockerWallMedical
diff --git a/Resources/Prototypes/Palettes/critters.yml b/Resources/Prototypes/Palettes/critters.yml
index 2f027b4b9c..af571840e0 100644
--- a/Resources/Prototypes/Palettes/critters.yml
+++ b/Resources/Prototypes/Palettes/critters.yml
@@ -41,3 +41,18 @@
     HornA: "#d4c8bf"
     hornB: "#eec7ab"
     hornC: "#ad9584"
+
+- type: palette
+  id: ScurretColors
+  name: ScurretColors
+  colors:
+    Normal: "#ffffff" # Sluggy
+    Innocent: "#f6f439" # Monky
+    Angry: "#dc5864" # Hunty
+    Perceptive: "#222222" # Watchy
+    Eldritch: "#dc5864"
+    Fat: "#fefcab"
+    Violent: "#ab3430"
+    Speedy: "#679cfe"
+    Mutated: "#7824a0"
+    Damned: "#98e652"
diff --git a/Resources/Prototypes/Parallaxes/amber.yml b/Resources/Prototypes/Parallaxes/amber.yml
index 9d939b4f25..7cd60a83a4 100644
--- a/Resources/Prototypes/Parallaxes/amber.yml
+++ b/Resources/Prototypes/Parallaxes/amber.yml
@@ -5,7 +5,7 @@
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/space_map2.png"
       slowness: 0.995
-      scale: "1, 1"
+      scale: "4, 4"
     - texture:
         !type:GeneratedParallaxTextureSource
         id: "hq_wizard_stars"
@@ -48,5 +48,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/aspid.yml b/Resources/Prototypes/Parallaxes/aspid.yml
index d687d0fcd9..640a737222 100644
--- a/Resources/Prototypes/Parallaxes/aspid.yml
+++ b/Resources/Prototypes/Parallaxes/aspid.yml
@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/bagel.yml b/Resources/Prototypes/Parallaxes/bagel.yml
index abf51b9bdf..2939a3919c 100644
--- a/Resources/Prototypes/Parallaxes/bagel.yml
+++ b/Resources/Prototypes/Parallaxes/bagel.yml
@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/core.yml b/Resources/Prototypes/Parallaxes/core.yml
index 773104c33f..a56f230a1c 100644
--- a/Resources/Prototypes/Parallaxes/core.yml
+++ b/Resources/Prototypes/Parallaxes/core.yml
@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/default.yml b/Resources/Prototypes/Parallaxes/default.yml
index 4a84b4618b..02fe72c05d 100644
--- a/Resources/Prototypes/Parallaxes/default.yml
+++ b/Resources/Prototypes/Parallaxes/default.yml
@@ -34,7 +34,7 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
 
 # Because hyperspace and the menu need their own.
@@ -71,6 +71,6 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.5
+      slowness: 0.5
   layersLQUseHQ: false
 
diff --git a/Resources/Prototypes/Parallaxes/exo.yml b/Resources/Prototypes/Parallaxes/exo.yml
index 4c8f755ef6..26b3b6d075 100644
--- a/Resources/Prototypes/Parallaxes/exo.yml
+++ b/Resources/Prototypes/Parallaxes/exo.yml
@@ -5,7 +5,7 @@
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/space_map3.png"
       slowness: 0.998046875
-      scale: "1, 1"
+      scale: "4, 4"
     - texture:
         !type:GeneratedParallaxTextureSource
         id: "hq_wizard_stars"
@@ -20,7 +20,7 @@
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/XenoParallaxNeb.png"
       slowness: 0.967046875
-      scale: "1, 1"
+      scale: "4, 4"
     - texture:
         !type:GeneratedParallaxTextureSource
         id: "hq_wizard_stars_faster"
@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/kettle.yml b/Resources/Prototypes/Parallaxes/kettle.yml
index 8f2972e178..c99306ae80 100644
--- a/Resources/Prototypes/Parallaxes/kettle.yml
+++ b/Resources/Prototypes/Parallaxes/kettle.yml
@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/origin.yml b/Resources/Prototypes/Parallaxes/origin.yml
index 174f21a3ca..550057ed47 100644
--- a/Resources/Prototypes/Parallaxes/origin.yml
+++ b/Resources/Prototypes/Parallaxes/origin.yml
@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/plasma.yml b/Resources/Prototypes/Parallaxes/plasma.yml
index 6110248539..5964ea0edc 100644
--- a/Resources/Prototypes/Parallaxes/plasma.yml
+++ b/Resources/Prototypes/Parallaxes/plasma.yml
@@ -49,5 +49,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml
index e506043c85..e47cedfc2a 100644
--- a/Resources/Prototypes/Parallaxes/train.yml
+++ b/Resources/Prototypes/Parallaxes/train.yml
@@ -63,6 +63,6 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
       scrolling: "0, -0.475"
   layersLQUseHQ: false
diff --git a/Resources/Prototypes/Parallaxes/wizard.yml b/Resources/Prototypes/Parallaxes/wizard.yml
new file mode 100644
index 0000000000..0fd482a485
--- /dev/null
+++ b/Resources/Prototypes/Parallaxes/wizard.yml
@@ -0,0 +1,14 @@
+- type: parallax
+  id: Wizard
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/purple_nebula.png"
+      slowness: 0.98
+      scale: 1,1
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/KettleParallaxNeb.png"
+      slowness: 0.95
+      scale: "1.5, 1.5"
+      scrolling: "0.1, -0.05"
diff --git a/Resources/Prototypes/Polymorphs/admin.yml b/Resources/Prototypes/Polymorphs/admin.yml
index cb274ec7d4..3739175c8a 100644
--- a/Resources/Prototypes/Polymorphs/admin.yml
+++ b/Resources/Prototypes/Polymorphs/admin.yml
@@ -6,7 +6,7 @@
     transferName: true
     transferHumanoidAppearance: true
     inventory: Transfer
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminMonkeySmite
@@ -14,7 +14,7 @@
     entity: MobMonkey
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminBreadSmite
@@ -22,7 +22,7 @@
     entity: FoodBreadPlain
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminInstrumentSmite
@@ -30,7 +30,7 @@
     entity: SuperSynthesizerInstrument
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminMouseSmite
@@ -38,7 +38,7 @@
     entity: MobMouse
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminDisposalsSmite
@@ -46,4 +46,4 @@
     entity: DisposalUnit
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml
index dae8387b04..44fe5005da 100644
--- a/Resources/Prototypes/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/Polymorphs/polymorph.yml
@@ -178,7 +178,6 @@
     entity: MobLizard
     forced: true
     transferName: true
-    transferHumanoidAppearance: true
     inventory: None
     revertOnDeath: true
     revertOnCrit: true
@@ -190,7 +189,6 @@
     entity: MobLuminousPerson
     forced: true
     transferName: true
-    transferHumanoidAppearance: true
     inventory: None
     revertOnDeath: true
     revertOnCrit: true
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 61c7a9ab0c..efdb825e4c 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -27,12 +27,11 @@
       - !type:AdjustReagent
         reagent: Ethanol
         amount: 0.05
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         conditions:
         - !type:ReagentThreshold
           min: 10
-        key: SeeingRainbows
-        component: SeeingRainbows
         type: Add
         time: 5
         refresh: false
@@ -2033,9 +2032,9 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
-        - !type:GenericStatusEffect
-          key: Drowsiness
-          time: 1.0
+        - !type:ModifyStatusEffect
+          effectProto: StatusEffectDrowsiness
+          time: 1
           type: Remove
   fizziness: 0.25
 
@@ -2064,9 +2063,9 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
-        - !type:GenericStatusEffect
-          key: Drowsiness
-          time: 1.0
+        - !type:ModifyStatusEffect
+          effectProto: StatusEffectDrowsiness
+          time: 1
           type: Remove
   fizziness: 0.15
 
@@ -2095,9 +2094,9 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
-        - !type:GenericStatusEffect
-          key: Drowsiness
-          time: 1.0
+        - !type:ModifyStatusEffect
+          effectProto: StatusEffectDrowsiness
+          time: 1
           type: Remove
   fizziness: 0.15
 
@@ -2126,9 +2125,9 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
-        - !type:GenericStatusEffect
-          key: Drowsiness
-          time: 1.0
+        - !type:ModifyStatusEffect
+          effectProto: StatusEffectDrowsiness
+          time: 1
           type: Remove
   fizziness: 0.25
 
@@ -2157,9 +2156,9 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
-        - !type:GenericStatusEffect
-          key: Drowsiness
-          time: 1.0
+        - !type:ModifyStatusEffect
+          effectProto: StatusEffectDrowsiness
+          time: 1
           type: Remove
   fizziness: 0.15
 
@@ -2188,9 +2187,9 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
-        - !type:GenericStatusEffect
-          key: Drowsiness
-          time: 1.0
+        - !type:ModifyStatusEffect
+          effectProto: StatusEffectDrowsiness
+          time: 1
           type: Remove
   fizziness: 0.25
 
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index a037f83b28..412926d046 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -16,9 +16,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 2.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 2
         type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
@@ -129,9 +129,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 2.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 2
         type: Remove
 
 - type: reagent
@@ -189,9 +189,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 2.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 2
         type: Remove
 
 - type: reagent
@@ -398,9 +398,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 3.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 3
         type: Remove
     Poison:
       effects:
@@ -443,9 +443,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 2.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 2
         type: Remove
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index a0ce3363e1..9ed2a9dbea 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -22,9 +22,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 1.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 1
         type: Remove
 
 - type: reagent
@@ -92,9 +92,9 @@
         - !type:OrganType
           type: Dwarf
           shouldHave: false
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        time: 2.0
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 2
         type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
@@ -277,7 +277,7 @@
     state: icon_empty
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
-  metamorphicChangeColor: false  
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 4542c97565..45c55ce4dd 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -81,6 +81,23 @@
         - !type:ReagentThreshold
           min: 5
 
+- type: reagent
+  parent: Artifexium
+  id: ArtifactGlue
+  name: reagent-name-artifact-glue
+  desc: reagent-desc-artifact-glue
+  flavor: artifactglue
+  physicalDesc: reagent-physical-desc-non-newtonian
+  color: "#827394"
+  reactiveEffects:
+    Acidic:
+      methods: [ Touch ]
+      effects:
+      - !type:ArtifactDurabilityRestore
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+
 - type: reagent
   id: Benzene
   name: reagent-name-benzene
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index b9a0af01de..90bcb23f86 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -83,7 +83,7 @@
   meltingPoint: 18.2
   tileReactions:
   - !type:SpillTileReaction
-  friction: 0.0
+  friction: 0.05
 
 - type: reagent
   id: SpaceGlue
@@ -107,11 +107,10 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         time: 5
+        type: Add
         refresh: false
     Drink:
       effects:
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 2677fc0ed0..4a97cb8b16 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -360,7 +360,7 @@
           shouldHave: false
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: NitrousOxide
@@ -368,8 +368,7 @@
         - !type:OrganType
           type: Slime
           shouldHave: false
-        key: ForcedSleep
-        component: ForcedSleeping
+        effectProto: StatusEffectForcedSleeping
         time: 3
         type: Add
       - !type:HealthChange
@@ -403,9 +402,8 @@
         damage:
           types:
             Cellular: 1
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 15
         refresh: false
@@ -440,13 +438,12 @@
         damage:
           types:
             Cellular: 0.5
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Frezon
           min: 1
-        key: SeeingRainbows
-        component: SeeingRainbows
+        effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 500
         refresh: false
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 1d00b4400b..00fac05491 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -84,9 +84,8 @@
         key: Jitter
         time: 3.0
         type: Remove
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        component: Drowsiness
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
         time: 1.5
         type: Add
         refresh: false
@@ -147,12 +146,12 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:HealthChange
+      - !type:EvenHealthChange
         damage:
           types: #Sunrise-Edit
             Mangleness: 0.1 #Sunrise-Edit
           groups:
-            Brute: -2
+            Brute: -1.5
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
@@ -796,8 +795,8 @@
         key: KnockedDown
         time: 3.0
         type: Remove
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         time: 15.0
         type: Remove
 
@@ -905,6 +904,7 @@
   color: "#520e30"
   metabolisms:
     Medicine:
+      metabolismRate: 0.25
       effects:
       - !type:HealthChange
         conditions:
@@ -913,19 +913,17 @@
           max: 30
         damage:
           groups:
-            Toxin: -3
-            Brute: 0.5
-                #Sunrise-Start
+            Toxin: -1.5
+            Brute: 0.25
           types:
-            Mangleness: 0.1
-      #Sunrise-End
+            Mangleness: 0.1 #Sunrise-Edit
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 30
         damage:
           groups:
-            Toxin: -1
+            Toxin: -0.5
             Brute: 3
       - !type:AdjustReagent
         conditions:
@@ -986,8 +984,8 @@
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
-      - !type:GenericStatusEffect
-        key: Drowsiness
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
       - !type:ResetNarcolepsy
@@ -1011,8 +1009,8 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:GenericStatusEffect
-        key: Drowsiness
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
       - !type:ResetNarcolepsy
@@ -1035,19 +1033,20 @@
   color: "#e0a5b9"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Caustic: -3
+            Caustic: -0.6 # 6 per u
             Mangleness: 0.45 # Sunrise-Edit
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 16
+          min: 21
         damage:
           types:
-            Heat: 2
+            Heat: 0.2
       - !type:Jitter
         conditions:
         - !type:ReagentThreshold
@@ -1091,19 +1090,20 @@
   color: "#283332"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Slash: -3
+            Slash: -0.6 # 6 Per u
             Mangleness: 0.3 #Sunrise-Edit
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 21
         damage:
           types:
-            Cold: 3
+            Cold: 1.5 #15 per u
 
 - type: reagent
   id: Puncturase
@@ -1115,20 +1115,21 @@
   color: "#b9bf93"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Piercing: -4
-            Blunt: 0.1
+            Piercing: -0.6 # 6 per u
+            Blunt: 0.05 # 0.5 per u
             Mangleness: 0.4 #Sunrise-Edit
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 11
+          min: 21
         damage:
           types:
-            Blunt: 5
+            Blunt: 1 # 10 per u plus base effect
 
 - type: reagent
   id: Bruizine
@@ -1140,19 +1141,20 @@
   color: "#ff3636"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Blunt: -3.5
+            Blunt: -0.6 # 6 per u
             Mangleness: 0.35 #Sunrise-Edit
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 10.5
+          min: 19
         damage:
           types:
-            Poison: 4
+            Poison: 1.5 # 15 per u
 
 - type: reagent
   id: Holywater
@@ -1284,12 +1286,13 @@
   color: "#8147ff"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       # heals shocks and removes shock chems
       - !type:HealthChange
         damage:
           types:
-            Shock: -4
+            Shock: -0.5 # 5 per u
             Mangleness: 0.6 #Sunrise-Edit
       - !type:AdjustReagent
         reagent: Licoxide
@@ -1304,14 +1307,14 @@
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 15.5
         damage:
           types:
-            Cold: 2
+            Cold: 0.2 # 2 per u but lethal with cooling OD effect below
       - !type:AdjustTemperature
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 15.5
         amount: -30000
       - !type:Jitter
         conditions:
@@ -1430,12 +1433,11 @@
         damage:
           types:
             Poison: 2
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         conditions:
         - !type:ReagentThreshold
           min: 30
-        key: SeeingRainbows
-        component: SeeingRainbows
         type: Add
         time: 8
         refresh: false
@@ -1496,9 +1498,8 @@
         emote: Yawn
         showInChat: true
         probability: 0.1
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        component: Drowsiness
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
         time: 4
         type: Add
         refresh: false
@@ -1506,8 +1507,8 @@
         key: Jitter
         time: 4.0
         type: Remove
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         time: 10.0
         type: Remove
       - !type:AdjustReagent
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 4a8ab8091b..16e5be480e 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -41,12 +41,12 @@
         key: KnockedDown
         time: 3
         type: Remove
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Haloperidol
           max: 0.01
-        key: Drowsiness
+        effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
     Medicine:
@@ -95,12 +95,12 @@
         key: KnockedDown
         time: 1
         type: Remove
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Haloperidol
           max: 0.01
-        key: Drowsiness
+        effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
       - !type:PopupMessage
@@ -165,16 +165,16 @@
         component: StaminaModifier
         time: 3
         type: Add
-      - !type:GenericStatusEffect
-        key: ForcedSleep
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectForcedSleeping
         time: 3
         type: Remove
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Haloperidol
           max: 0.01
-        key: Drowsiness
+        effectProto: StatusEffectDrowsiness
         time: 10
         type: Remove
     Medicine:
@@ -215,11 +215,10 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         time: 16
+        type: Add
         refresh: false
 
 - type: reagent
@@ -253,11 +252,10 @@
         damage:
           types:
             Poison: 2
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         time: 10
+        type: Add
         refresh: false
       - !type:ChemVomit # Vomiting is a symptom of brain damage
         probability: 0.05
@@ -275,9 +273,8 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 5
         refresh: false
@@ -293,9 +290,8 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 5
         refresh: false
@@ -313,14 +309,13 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Nocturine
           min: 8
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
+        effectProto: StatusEffectForcedSleeping
+        time: 3
         type: Add
 
 - type: reagent
@@ -513,9 +508,8 @@
         conditions:
         - !type:ReagentThreshold
           max: 20
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 5
         refresh: false
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index fb0ea6f1bd..5e55c616a1 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -63,9 +63,8 @@
       - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
-      - !type:GenericStatusEffect
-        key: Drowsiness
-        component: Drowsiness
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
         time: 4
         type: Add
         refresh: false
@@ -340,9 +339,8 @@
   metabolisms:
     Poison:
       effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 10
         refresh: false
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml
index e597d7cdc4..269dd615f7 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml
@@ -25,3 +25,31 @@
         doAfter: 1
   - node: helmet
     entity: ClothingHeadHelmetBone
+
+- type: constructionGraph
+  id: cardArmour
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardarmour
+      steps:
+      - material: Cardboard
+        amount: 10
+        doAfter: 4
+  - node: cardarmour
+    entity: CardArmour
+
+- type: constructionGraph
+  id: cardHelmet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardhelmet
+      steps:
+      - material: Cardboard
+        amount: 5
+        doAfter: 2
+  - node: cardhelmet
+    entity: CardHelmet
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
index c587e47efb..08ac6e45d7 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
@@ -68,6 +68,11 @@
             - material: Steel
               amount: 2
               doAfter: 1
+        - to: stoolCard
+          steps:
+            - material: Cardboard
+              amount: 3
+              doAfter: 1
         - to: chairWoodBench
           steps:
             - material: WoodPlank
@@ -231,6 +236,20 @@
             - tool: Screwing
               doAfter: 1
 
+    - node: stoolCard
+      entity: CardStool
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialCardboard1
+              amount: 3
+            - !type:PlaySound
+              sound: /Audio/Items/Toys/ToyFall2.ogg
+          steps:
+            - tool: Slicing
+              doAfter: 1
+
     - node: chairWoodBench
       entity: WoodenBench
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index 4cee536bf9..c0721cf154 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -64,6 +64,12 @@
               amount: 1
               doAfter: 1
 
+        - to: TableCard
+          steps:
+            - material: Cardboard
+              amount: 3
+              doAfter: 1
+
         - to: TableReinforcedGlass
           steps:
             - material: ReinforcedGlass
@@ -162,6 +168,18 @@
             - tool: Anchoring
               doAfter: 1
 
+    - node: TableCard
+      entity: TableCard
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialCardboard1
+              amount: 3
+          steps:
+            - tool: Slicing
+              doAfter: 2
+
     - node: TableReinforcedGlass
       entity: TableReinforcedGlass
       edges:
@@ -404,3 +422,15 @@
           steps:
             - tool: Prying
               doAfter: 1
+
+    - node: TableXeno
+      entity: TableXeno
+      edges:
+      - to: TableFrame
+        completed:
+        - !type:SpawnPrototype
+          prototype: SheetSteel1
+          amount: 1
+        steps:
+        - tool: Anchoring
+          doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml
new file mode 100644
index 0000000000..493982b617
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml
@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: Cardwall
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardwall
+      steps:
+        - material: Cardboard
+          amount: 3
+          doAfter: 3
+  - node: cardwall
+    entity: Cardwall
+    edges:
+    - to: start
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Items/Toys/ToyFall2.ogg
+      - !type:SpawnPrototype
+            prototype: MaterialCardboard1
+            amount: 3
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Slicing
+        doAfter: 1.2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
index e15f4a644a..2c8260269f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
@@ -55,6 +55,13 @@
             - material: Paper
               amount: 20
               doAfter: 15
+        - to: cardDoor
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Cardboard
+              amount: 5
+              doAfter: 6
     - node: metalDoor
       entity: MetalDoor
       edges:
@@ -121,6 +128,20 @@
           steps:
             - tool: Anchoring
               doAfter: 15
+    - node: cardDoor
+      entity: CardDoor
+      edges:
+        - to: start
+          completed:
+          - !type:PlaySound
+            sound: /Audio/Items/Toys/ToyFall2.ogg
+          - !type:SpawnPrototype
+                prototype: MaterialCardboard1
+                amount: 5
+          - !type:DeleteEntity {}
+          steps:
+            - tool: Slicing
+              doAfter: 2
     - node: bananiumDoor
       entity: BananiumDoor
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
index 5d83ba31c7..f59aa689a8 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
@@ -510,6 +510,10 @@
           steps:
             - tool: Welding
               doAfter: 5
+        - to: wall
+          steps:
+            - tool: Brushing
+              doAfter: 12
 
     - node: reinforcedWallRust
       entity: WallReinforcedRust
@@ -518,3 +522,7 @@
           steps:
             - tool: Welding
               doAfter: 5
+        - to: reinforcedWall
+          steps:
+            - tool: Brushing
+              doAfter: 12
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
index 7c08eba094..bceed82123 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -46,13 +46,8 @@
         doAfter: 1
     - to: memory_cell
       steps:
-      - tag: MicroManipulatorStockPart
-        icon:
-          sprite: Objects/Misc/stock_parts.rsi
-          state: micro_mani
-        name: construction-graph-tag-manipulator
       - material: Manipulator
-        amount: 1
+        amount: 2
       - material: Cable
         amount: 2
         doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
index 1a23029ecc..394a999826 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
@@ -16,6 +16,9 @@
           steps:
             - component: ApcElectronics
               name: construction-graph-component-apc-electronics
+              icon:
+                sprite: "Objects/Misc/module.rsi"
+                state: "charger_APC"
               doAfter: 2
         - to: start
           completed:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
index aed9167178..678495edbc 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
@@ -10,30 +10,108 @@
         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: passivegateAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: passivegateAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
     - to: valve
       steps:
       - material: Steel
         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
@@ -74,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:
@@ -90,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:
@@ -106,6 +248,38 @@
       - tool: Welding
         doAfter: 1
 
+  - 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:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
   - node: valve
     entity: GasValve
     edges:
@@ -122,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:
@@ -138,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 bda6d036e9..95e1d3872e 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/Graphs/weapons/card_shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
new file mode 100644
index 0000000000..3cc3219c15
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
@@ -0,0 +1,17 @@
+- type: constructionGraph
+  id: CardShield
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardShield
+      steps:
+      - material: Cable
+        amount: 2
+        doAfter: 2
+      - material: Cardboard
+        amount: 6
+        doAfter: 2
+
+  - node: cardShield
+    entity: CardShield
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
new file mode 100644
index 0000000000..d63aa855e4
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
@@ -0,0 +1,14 @@
+- type: constructionGraph
+  id: CardSword
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardSword
+      steps:
+      - material: Cardboard
+        amount: 6
+        doAfter: 3
+
+  - node: cardSword
+    entity: CardSword
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
index e04e359b50..bac533a06f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
@@ -90,3 +90,22 @@
 
   - node: ImprovisedArrowCarp
     entity: ArrowImprovisedCarp
+
+- type: constructionGraph
+  id: CardArrow
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: CardArrow
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 0.5
+      - material: Cardboard
+        amount: 1
+        doAfter: 0.5
+
+  - node: CardArrow
+    entity: ArrowCard
+
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index 0a23bc8648..abd2911ecb 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -30,6 +30,22 @@
   category: construction-category-clothing
   objectType: Item
 
+- type: construction
+  id: cardHelmet
+  graph: cardHelmet
+  startNode: start
+  targetNode: cardhelmet
+  category: construction-category-clothing
+  objectType: Item
+
+- type: construction
+  id: cardArmour
+  graph: cardArmour
+  startNode: start
+  targetNode: cardarmour
+  category: construction-category-clothing
+  objectType: Item
+
 - type: construction
   id: BananaClownMask
   graph: BananaClownMask
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index f9b810731e..80ddd7d2dc 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -155,6 +155,18 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: StoolCard
+  graph: Seat
+  startNode: start
+  targetNode: stoolCard
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   id: ChairWoodBench
   graph: Seat
@@ -230,6 +242,18 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: TableCard
+  graph: Table
+  startNode: start
+  targetNode: TableCard
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   id: TableReinforcedGlass
   graph: Table
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 1335c6400c..ed533bcc52 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -207,6 +207,19 @@
   conditions:
   - !type:TileNotBlocked
 
+- type: construction
+  id: Cardwall
+  graph: Cardwall
+  startNode: start
+  targetNode: cardwall
+  category: construction-category-structures
+  conditions:
+  - !type:TileNotBlocked
+    failIfSpace: false
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+
 - type: construction
   id: Grille
   graph: Grille
@@ -1192,6 +1205,16 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
 
+- type: construction
+  id: CardDoor
+  graph: DoorGraph
+  startNode: start
+  targetNode: cardDoor
+  category: construction-category-structures
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+
 - type: construction
   id: PlasticFlapsClear
   name: construction-recipe-plastic-flaps-clear
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 85a0f5d3b1..eac72ef657 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,93 @@
   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
+  graph: GasBinary
+  startNode: start
+  targetNode: pressureregulator
+  category: construction-category-utilities
+  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
@@ -578,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
@@ -589,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/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 290dc30099..d1ecbc552d 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -102,6 +102,14 @@
   category: construction-category-weapons
   objectType: Item
 
+- type: construction
+  id: CardShield
+  graph: CardShield
+  startNode: start
+  targetNode: cardShield
+  category: construction-category-weapons
+  objectType: Item
+
 - type: construction
   id: MakeshiftShield
   graph: MakeshiftShield
@@ -142,6 +150,14 @@
   category: construction-category-weapons
   objectType: Item
 
+- type: construction
+  id: CardArrow
+  graph: CardArrow
+  startNode: start
+  targetNode: CardArrow
+  category: construction-category-weapons
+  objectType: Item
+
 - type: construction
   id: ImprovisedBow
   graph: ImprovisedBow
@@ -165,3 +181,11 @@
   targetNode: icon
   category: construction-category-weapons
   objectType: Item
+
+- type: construction
+  id: CardSword
+  graph: CardSword
+  startNode: start
+  targetNode: cardSword
+  category: construction-category-weapons
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 13462b86da..7e3cca3fa4 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1700,6 +1700,18 @@
     FoodSnackRaisins: 1
     OrganAnimalHeart: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBerryDelight
+  name: berry delight recipe
+  result: FoodCakeBerryDelight
+  time: 5
+  group: Cake
+  solids:
+    FoodCakePlain: 1
+    FoodBerries: 5
+  reagents:
+    Milk: 10
+
 - type: microwaveMealRecipe
   id: RecipeBreadDog
   name: bread dog recipe
@@ -2422,3 +2434,28 @@
     FoodMeat: 1
     FoodTomato: 1
     FoodSoybeans: 2 # replace these with green beans once those become a thing
+
+- type: microwaveMealRecipe
+  id: RecipeMoproach # TODO: Move this to be an actual surgery instead, once surgery gets implemented.
+  name: moproach recipe
+  result: MobMoproach
+  time: 30
+  group: Other
+  reagents:
+    SpaceCleaner: 15
+  solids:
+    MobMothroach: 1
+    OrganAnimalHeart: 1
+    MoproachShoes: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCottonCake
+  name: cotton cake recipe
+  result: FoodCakeCotton
+  time: 5
+  group: Cake
+  reagents:
+    Fiber: 10
+  solids:
+    FoodCakePlain: 1
+    
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
index e756f9518e..44959d4fb6 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
@@ -36,3 +36,50 @@
         doAfter: 5
   - node: suit
     entity: ClothingOuterSuitIan
+
+- type: constructionGraph
+  id: MoproachShoes
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: shoes
+      steps:
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+      - tag: MopBasic
+        name: construction-graph-tag-mop-basic
+        icon:
+          sprite: Objects/Specific/Janitorial/mop.rsi
+          state: mop
+        doAfter: 5
+  - node: shoes
+    entity: MoproachShoes
diff --git a/Resources/Prototypes/Recipes/Crafting/toys.yml b/Resources/Prototypes/Recipes/Crafting/toys.yml
index a3bc1bdf72..374f96fa47 100644
--- a/Resources/Prototypes/Recipes/Crafting/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/toys.yml
@@ -13,3 +13,11 @@
   targetNode: suit
   category: construction-category-misc
   objectType: Item
+
+- type: construction
+  id: MoproachShoes
+  graph: MoproachShoes
+  startNode: start
+  targetNode: shoes
+  category: construction-category-misc
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml
index 3ecd39cc98..1f504e3ae4 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml
@@ -12,6 +12,7 @@
   - NetworkConfigurator
   - Signaller
   - SprayPainter
+  - SprayPainterAmmo
   - FlashlightLantern
   - HandheldGPSBasic
   - TRayScanner
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 7391df8d76..304f714c37 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -46,6 +46,8 @@
   - DiseaseSwab
   - BodyBag
   - WhiteCane
+  - OffsetCane
+  - OffsetCaneWood
 
 - type: latheRecipePack
   id: RollerBedsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 94ed0cc27b..814e1eec94 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -38,6 +38,7 @@
   recipes:
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
+  - BorgModuleAdvancedClowning
   - BorgModuleAdvancedChemical
   - BorgModuleAdvancedMining
 
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
index 3c29165cfd..79ceebb3b7 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
@@ -30,6 +30,7 @@
   - SignallerAdvanced
   - DeviceQuantumSpinInverter
   - DeviceDesynchronizer
+  - ClothingBackpackHarmpack
 
 - type: latheRecipePack
   id: ScienceClothing
@@ -37,6 +38,7 @@
   - ClothingShoesBootsMagSci
   - ClothingShoesBootsMoon
   - ClothingShoesBootsSpeed
+  - ClothingShoesBootsJump
   - ClothingBackpackHolding
   - ClothingBackpackSatchelHolding
   - ClothingBackpackDuffelHolding
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
index 5927a77a1a..4bcd573909 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -75,6 +75,7 @@
   - PowerCageMedium
   - PowerCageSmall
   - TelescopicShield
+  - ClothingBackpackHarmpack
 
 - type: latheRecipePack
   id: SecurityBoards
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
index 48975043b6..21fe991754 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
@@ -25,6 +25,7 @@
   - MopItem
   - Holoprojector
   - WetFloorSign
+  - WireBrush
 
 - type: latheRecipePack
   id: ServiceBoardsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
index 024a744210..f65ca415a5 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
@@ -49,4 +49,6 @@
   - FloorTileItemOldConcrete
   - FloorTileItemOldConcreteMono
   - FloorTileItemOldConcreteSmooth
+  - FloorTileItemWhiteMarble
+  - FloorTileItemDarkMarble
   - FloorTileItemTechmaintDark
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
new file mode 100644
index 0000000000..31efc63265
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
@@ -0,0 +1,16 @@
+## Static
+
+- type: latheRecipePack
+  id: EmptyXenoborgs
+  recipes:
+  - XenoborgEngiRecipe
+  - XenoborgHeavyRecipe
+  - XenoborgScoutRecipe
+  - XenoborgStealthRecipe
+
+- type: latheRecipePack
+  id: XenoborgUpgradeModules
+  recipes:
+  - XenoborgModuleHeavyLaserRecipe
+  - XenoborgModuleEnergySwordRecipe
+  - XenoborgModuleSuperCloakDeviceRecipe
diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index f36ff59cec..48aa12bd3c 100644
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -102,6 +102,15 @@
   id: Wood
   name: lathe-category-wood
 
+- type: latheCategory
+  id: Marble
+  name: lathe-category-marble
+
+# Science
+- type: latheCategory
+  id: Mech
+  name: lathe-category-mechs
+
 - type: latheCategory
   id: Modules
   name: lathe-category-modules
diff --git a/Resources/Prototypes/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
index 9ba7dfa188..e230a09a4a 100644
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -104,3 +104,11 @@
   materials:
     Steel: 250
     Glass: 1000
+
+- type: latheRecipe
+  id: WireBrush
+  result: WireBrush
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 298890ec40..d96d74df82 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -218,6 +218,22 @@
     Steel: 100
     Plastic: 100
 
+- type: latheRecipe
+  id: OffsetCane
+  result: OffsetCane
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
+
+- type: latheRecipe
+  id: OffsetCaneWood
+  result: OffsetCaneWood
+  completetime: 2
+  materials:
+    Steel: 100
+    Wood: 100
+
 - type: latheRecipe
   id: LauncherSyringe
   result: LauncherSyringe
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 9d4ecf7697..40d155b1fd 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -167,6 +167,16 @@
     Plastic: 1000
     Silver: 500
 
+- type: latheRecipe
+  id: ClothingShoesBootsJump
+  result: ClothingShoesBootsJump
+  completetime: 2
+  materials:
+    Steel: 1400
+    Plastic: 600
+    Silver: 200
+    Plasma: 200
+
 - type: latheRecipe
   id: ModularReceiver
   result: ModularReceiver
@@ -265,4 +275,5 @@
   result: Ashtray
   completetime: 1
   materials:
-    Steel: 30
\ No newline at end of file
+    Steel: 30
+    
diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
index d7d112bba0..9210529a1d 100644
--- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
@@ -68,3 +68,13 @@
 # Science Modules
 
 # Service Modules
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedClowning
+  result: BorgModuleAdvancedClowning
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Bananium: 375
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 606e628669..71f815e5aa 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -84,6 +84,18 @@
     Plasma: 500
     Glass: 500
 
+- type: latheRecipe
+  id: ClothingBackpackHarmpack
+  result: ClothingBackpackHarmpack
+  categories:
+  - Clothing
+  completetime: 15
+  materials:
+    Steel: 2000
+    Plastic: 1000
+    Plasma: 500
+    Gold: 500
+
 # Shields
 - type: latheRecipe
   parent: BaseShieldRecipe
diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
index f8ade8bd42..b0e6d63f68 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
@@ -229,7 +239,7 @@
   result: FloorTileItemSteelMaint
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseMaintTileRecipe
   id: FloorTileItemTechmaintDark
   result: FloorTileItemTechmaintDark
 
@@ -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/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index 8a8c88d1e6..f54da83d25 100644
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -154,11 +154,19 @@
 - type: latheRecipe
   parent: BaseToolRecipe
   id: SprayPainter
-  result: SprayPainter
+  result: SprayPainterEmpty
   materials:
     Steel: 300
     Plastic: 100
 
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: SprayPainterAmmo
+  result: SprayPainterAmmo
+  materials:
+    Steel: 150
+    Plastic: 50
+
 - type: latheRecipe
   parent: BaseToolRecipe
   id: UtilityBelt
diff --git a/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
new file mode 100644
index 0000000000..9b150a502b
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
@@ -0,0 +1,67 @@
+# Base prototypes
+
+- type: latheRecipe
+  abstract: true
+  id: BaseXenoborgRecipe
+  categories:
+  - Robotics
+  completetime: 10
+
+- type: latheRecipe
+  abstract: true
+  id: BaseXenoborgModulesRecipe
+  categories:
+  - Modules
+  completetime: 2
+  materials:
+    Glass: 3000
+
+# xenoborgs
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgEngiRecipe
+  result: XenoborgEngiPrinted
+  materials:
+    Steel: 3000
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgHeavyRecipe
+  result: XenoborgHeavyPrinted
+  materials:
+    Steel: 2000
+    Plasteel: 1000
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgScoutRecipe
+  result: XenoborgScoutPrinted
+  materials:
+    Steel: 2000
+    Plastic: 1000
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgStealthRecipe
+  result: XenoborgStealthPrinted
+  materials:
+    Steel: 2000
+    Glass: 1000
+
+# modules
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleHeavyLaserRecipe
+  result: XenoborgModuleHeavyLaser
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleEnergySwordRecipe
+  result: XenoborgModuleEnergySword
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleSuperCloakDeviceRecipe
+  result: XenoborgModuleSuperCloakDevice
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index f4900ac4aa..959488376c 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: 50
-      intensityPerUnit: 0.25 # Sunrise-Edit
+      intensityPerUnit: 0.25
+      maxTotalIntensity: 100
       intensitySlope: 4
-      maxTotalIntensity: 50
+      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
@@ -515,3 +522,13 @@
       amount: 1
   products:
     Tazinide: 1
+
+- type: reaction
+  id: ArtifactGlue
+  reactants:
+    SpaceGlue:
+      amount: 1
+    Artifexium:
+      amount: 1
+  products:
+    ArtifactGlue: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index d52671dc82..3fb228afe0 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -445,39 +445,6 @@
   products:
     Bruizine: 2
 
-- type: reaction
-  id: BicarLacerinol # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Lacerinol:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarPuncturase # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Puncturase:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarBruizine # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Bruizine:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
 - type: reaction
   id: BruizineLacerinol # mixing any two brute medications will make Razorium
   impact: Medium
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 961e01b4b8..e1fa6fbd7f 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -208,6 +208,18 @@
   technologyPrerequisites:
   - SalvageWeapons
 
+- type: technology
+  id: DualWieldingTechnology
+  name: research-technology-dual-wielding-technology
+  icon:
+    sprite: Clothing/Back/Specific/harmpack.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - ClothingBackpackHarmpack
+
 # Tier 3
 
 - type: technology
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 65134f6c72..00db77f00c 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -185,6 +185,7 @@
   cost: 4000
   recipeUnlocks:
   - PushHorn
+  - BorgModuleAdvancedClowning
 
 # Tier 3
 
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 7cb587130d..5ba5f9880f 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -15,6 +15,7 @@
   - MineralScannerEmpty
   - OreProcessorIndustrialMachineCircuitboard
   - ClothingMaskWeldingGas
+  - ClothingShoesBootsJump
 
 - type: technology
   id: SpaceScanning
diff --git a/Resources/Prototypes/Roles/Antags/thief.yml b/Resources/Prototypes/Roles/Antags/thief.yml
index 66c4548084..5813086715 100644
--- a/Resources/Prototypes/Roles/Antags/thief.yml
+++ b/Resources/Prototypes/Roles/Antags/thief.yml
@@ -20,4 +20,3 @@
     back:
     - ThiefBeacon
     - SatchelThief
-    - ClothingHandsChameleonThief
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
index 68fc11b679..9c28c56002 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
@@ -22,7 +22,7 @@
     jumpsuit: ClothingUniformJumpsuitCentcomOfficial
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHatCentcom
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesCommand
     gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterArmorCentcommCarapace
     id: CentcomPDA
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 0b603db73e..fc0905ac54 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -22,7 +22,6 @@
     ears: ClothingHeadsetService
   storage:
     back:
-    - Bible
     - RubberStampChaplain
     - FlippoLighterSunriseBlack  # Sunrise-edit
 
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 912268f653..9322c3544d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -25,6 +25,9 @@
           Piercing: 4
         groups:
           Burn: 3
+      catchingFailDamage:
+        types:
+          Blunt: 1
     - type: SleepEmitSound
       snore: /Audio/Voice/Misc/silly_snore.ogg
       interval: 10
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index 3c74716b79..bea3754532 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -31,6 +31,6 @@
   equipment:
     head: ClothingHeadHatTophat
     mask: ClothingMaskBreath
-    neck: ClothingNeckHeadphones
+    neck: ClothingMultipleHeadphones
     outerClothing: ClothingOuterWinterMusician
     gloves: ClothingHandsGlovesColorBlack
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 668c4ae3db..6e83a2a03c 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -45,7 +45,7 @@
   id: CaptainGear
   equipment:
     shoes: ClothingShoesBootsLaceup
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesCommand
     gloves: ClothingHandsGlovesCaptain
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 296196dd69..004a85177b 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -73,6 +73,7 @@
     gloves: ClothingHandsGlovesHop
     ears: ClothingHeadsetAltCommand
     belt: BoxFolderClipboard
+    eyes: ClothingEyesHudCommand
   storage:
     back:
     - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 5734fc9d91..503c42327d 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -105,6 +105,18 @@
     jumpsuit: ClothingUniformJumpsuitJacketMonkey
     id: PunPunIDCard
 
+- type: startingGear
+  id: MobPollyGear
+  equipment:
+    ears: ClothingHeadsetEngineering
+
+# Emotional Support Scurret
+
+- type: startingGear
+  id: EmotionalSupportScurretGear
+  equipment:
+    id: ScurretPDA
+
 # DeathMatch Gear
 
 - type: startingGear
@@ -121,7 +133,7 @@
 - type: startingGear
   id: MobAghostGear
   equipment:
-    back: ClothingBackpackSatchelHolding
+    back: ClothingBackpackSatchelAdmin
     id: AdminPDA
   storage:
     back:
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
index d64b63799b..63b6ab3285 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
@@ -7,7 +7,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitCaptain
     shoes: ClothingShoesBootsLaceup
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesCommand
     gloves: ClothingHandsGlovesCaptain
     head: ClothingHeadHatCaptain
     neck: ClothingNeckCloakCap
@@ -23,7 +23,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitCapFormal
     shoes: ClothingShoesBootsLaceup
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesCommand
     gloves: ClothingHandsGlovesCaptain
     head: ClothingHeadHatCapcap
     neck: ClothingNeckMantleCap
@@ -194,7 +194,7 @@
     neck: ClothingNeckCloakQm
     id: VisitorPDA
     back: ClothingBackpackCargo
-    ears: ClothingHeadsetRD
+    ears: ClothingHeadsetQM
     outerClothing: ClothingOuterWinterQM
     pocket1: WeaponDisabler
     pocket2: AppraisalTool
diff --git a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
index 79223ed67d..95d49c1b83 100644
--- a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
+++ b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
@@ -307,3 +307,16 @@
     exclusiveAntag: true
     subtype: role-subtype-zombie
   - type: ZombieRole
+
+# Changeling
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleChangeling
+  name: Changeling Role
+  components:
+  - type: MindRole
+    antagPrototype: Changeling
+    exclusiveAntag: true
+    roleType: SoloAntagonist
+    subtype: role-subtype-changeling
+  - type: ChangelingRole
diff --git a/Resources/Prototypes/Shaders/Stencils.yml b/Resources/Prototypes/Shaders/Stencils.yml
index e1a8bdf6bc..81122a30c4 100644
--- a/Resources/Prototypes/Shaders/Stencils.yml
+++ b/Resources/Prototypes/Shaders/Stencils.yml
@@ -7,6 +7,7 @@
     op: Replace
     func: Always
 
+# Draws to the stencil buffer if the alpha is not set to 0.
 - type: shader
   id: StencilMask
   kind: source
@@ -16,6 +17,7 @@
     op: Replace
     func: Always
 
+# Draws if the texture in the stencil buffer is not equal to white.
 - type: shader
   id: StencilDraw
   kind: canvas
@@ -23,3 +25,12 @@
     ref: 1
     op: Keep
     func: NotEqual
+
+# Draws if the texture in the stencil buffer is equal to white.
+- type: shader
+  id: StencilEqualDraw
+  kind: canvas
+  stencil:
+    ref: 1
+    op: Keep
+    func: Equal
diff --git a/Resources/Prototypes/SoundCollections/anomaly.yml b/Resources/Prototypes/SoundCollections/anomaly.yml
new file mode 100644
index 0000000000..291b5d4a27
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/anomaly.yml
@@ -0,0 +1,59 @@
+- type: soundCollection
+  id: AnomalyFleshSupercritical
+  files:
+  - /Audio/Items/Anomaly/flesh_crit.ogg
+
+- type: soundCollection
+  id: AnomalyShadowSupercritical
+  files:
+  - /Audio/Items/Anomaly/shadow_crit.ogg
+
+- type: soundCollection
+  id: AnomalyTechSupercritical
+  files:
+  - /Audio/Items/Anomaly/tech_crit.ogg
+
+- type: soundCollection
+  id: AnomalyPresentSupercritical
+  files:
+  - /Audio/Items/Anomaly/present_crit.ogg
+
+- type: soundCollection
+  id: AnomalyPyroSupercritical
+  files:
+  - /Audio/Items/Anomaly/pyro_crit.ogg
+
+- type: soundCollection
+  id: AnomalyGravitySupercritical
+  files:
+  - /Audio/Items/Anomaly/grav_crit.ogg
+
+- type: soundCollection
+  id: AnomalyElectricitySupercritical
+  files:
+  - /Audio/Items/Anomaly/electricity_crit.ogg
+
+- type: soundCollection
+  id: AnomalyBluespaceSupercritical
+  files:
+  - /Audio/Items/Anomaly/bluespace_crit.ogg
+
+- type: soundCollection
+  id: AnomalyIceSupercritical
+  files:
+  - /Audio/Items/Anomaly/ice_crit.ogg
+
+- type: soundCollection
+  id: AnomalyFluidSupercritical
+  files:
+  - /Audio/Items/Anomaly/fluid_crit.ogg
+
+- type: soundCollection
+  id: AnomalyFloraSupercritical
+  files:
+  - /Audio/Items/Anomaly/flora_crit.ogg
+
+- type: soundCollection
+  id: AnomalyRockSupercritical
+  files:
+  - /Audio/Items/Anomaly/rock_crit.ogg
diff --git a/Resources/Prototypes/SoundCollections/atmospherics.yml b/Resources/Prototypes/SoundCollections/atmospherics.yml
index 20f359690e..5778ac2647 100644
--- a/Resources/Prototypes/SoundCollections/atmospherics.yml
+++ b/Resources/Prototypes/SoundCollections/atmospherics.yml
@@ -4,3 +4,13 @@
   - /Audio/Effects/squeak1.ogg
   - /Audio/Effects/squeak2.ogg
   - /Audio/Effects/squeak3.ogg
+
+- type: soundCollection
+  id: SpaceWind
+  files:
+  - /Audio/Effects/space_wind.ogg
+
+- type: soundCollection
+  id: AtmosHotspot
+  files:
+  - /Audio/Effects/fire.ogg
diff --git a/Resources/Prototypes/SoundCollections/changeling.yml b/Resources/Prototypes/SoundCollections/changeling.yml
new file mode 100644
index 0000000000..4edb07dc16
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/changeling.yml
@@ -0,0 +1,14 @@
+- type: soundCollection
+  id: ChangelingDevourConsume
+  files:
+  - /Audio/Effects/Changeling/devour_consume.ogg
+
+- type: soundCollection
+  id: ChangelingDevourWindup
+  files:
+  - /Audio/Effects/Changeling/devour_windup.ogg
+
+- type: soundCollection
+  id: ChangelingTransformAttempt
+  files:
+  - /Audio/Effects/Changeling/changeling_transform.ogg
diff --git a/Resources/Prototypes/SoundCollections/drink_close_sounds.yml b/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
index 9da4d28168..2fc1c01dd6 100644
--- a/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
+++ b/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
@@ -2,3 +2,8 @@
   id: bottleCloseSounds
   files:
   - /Audio/Items/bottle_close1.ogg
+
+- type: soundCollection
+  id: flaskCloseSounds
+  files:
+  - /Audio/Items/flask_close1.ogg
diff --git a/Resources/Prototypes/SoundCollections/drink_open_sounds.yml b/Resources/Prototypes/SoundCollections/drink_open_sounds.yml
index fea78d0464..21c2f61003 100644
--- a/Resources/Prototypes/SoundCollections/drink_open_sounds.yml
+++ b/Resources/Prototypes/SoundCollections/drink_open_sounds.yml
@@ -19,3 +19,8 @@
   id: pop
   files:
   - /Audio/Items/pop.ogg
+
+- type: soundCollection
+  id: flaskOpenSounds
+  files:
+  - /Audio/Items/flask_open1.ogg
diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml
index 0762c68cff..6d50120110 100644
--- a/Resources/Prototypes/SoundCollections/emotes.yml
+++ b/Resources/Prototypes/SoundCollections/emotes.yml
@@ -103,6 +103,11 @@
   files:
   - /Audio/Items/Toys/hew.ogg
 
+- type: soundCollection
+  id: XenoborgScream
+  files:
+  - /Audio/Voice/Xenoborg/xenoborg_scream.ogg
+
 - type: soundCollection
   id: XenoborgLaugh
   files:
diff --git a/Resources/Prototypes/SoundCollections/machines.yml b/Resources/Prototypes/SoundCollections/machines.yml
index 3c567ab7b3..45768bfa88 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/SoundCollections/scurret.yml b/Resources/Prototypes/SoundCollections/scurret.yml
new file mode 100644
index 0000000000..cb0411638b
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/scurret.yml
@@ -0,0 +1,34 @@
+- type: soundCollection
+  id: WawaLaugh
+  files:
+  - /Audio/Animals/wawa_mock.ogg
+
+- type: soundCollection
+  id: WawaSneeze
+  files:
+  - /Audio/Animals/wawa_achoo.ogg
+
+- type: soundCollection
+  id: WawaSigh
+  files:
+  - /Audio/Animals/wawa_depression.ogg
+
+- type: soundCollection
+  id: WawaScream
+  files:
+  - /Audio/Animals/wawa_protest.ogg
+
+- type: soundCollection
+  id: WawaCry
+  files:
+  - /Audio/Animals/wawa_despair.ogg
+
+- type: soundCollection
+  id: WawaYawn
+  files:
+  - /Audio/Animals/wawa_yawn.ogg
+
+- type: soundCollection
+  id: WawaDeath
+  files:
+  - /Audio/Animals/wawa_the_end.ogg
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index f16c36406f..7002b1ab61 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -336,7 +336,7 @@
 
 - type: stack
   id: FloorCarpetBlack
-  name: stack-block-carpet-tile
+  name: stack-black-carpet-tile
   spawn: FloorCarpetItemBlack
   maxCount: 30
 
@@ -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 a249410866..eff79ee1cb 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -2144,3 +2144,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/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml
index f478f4e5a4..f0ef0f1346 100644
--- a/Resources/Prototypes/Tiles/planet.yml
+++ b/Resources/Prototypes/Tiles/planet.yml
@@ -1,6 +1,6 @@
 - type: tile
   id: FloorPlanetDirt
-  name: tiles-dirt-floor
+  name: tiles-dirt-planet-floor
   sprite: /Textures/Tiles/Planet/dirt.rsi/dirt.png
   variants: 4
   placementVariants:
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index b435379dbf..a5c1f54d6b 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -45,9 +45,9 @@
       cloneable: true
 
 - type: trait
-  id: Monochromancy
-  name: trait-monochromancy-name
-  description: trait-monochromancy-desc
+  id: Monochromacy
+  name: trait-monochromacy-name
+  description: trait-monochromacy-desc
   category: Disabilities
   components:
   - type: BlackAndWhiteOverlay
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 43164afdb5..6f46eb8dd6 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -475,6 +475,8 @@
   params:
     variation: 0.05
   sounds:
+    Scream:
+      collection: XenoborgScream
     Laugh:
       collection: XenoborgLaugh
     Beep:
@@ -609,3 +611,51 @@
     path: /Audio/Animals/goat_bah.ogg
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Scurret
+  params:
+    variation: 0.125
+  sounds:
+    Thump:
+      path: /Audio/Effects/soft_thump.ogg
+      params:
+        variation: 0.125
+    Clap:
+      collection: Claps
+    ClapSingle:
+      collection: ClapSingle
+    Snap:
+      collection: Snaps
+      params:
+        volume: -6
+    Salute:
+      collection: Salutes
+    Laugh:
+      collection: WawaLaugh
+    Sneeze:
+      collection: WawaSneeze
+    Cough:
+      collection: MaleCoughs
+    Whistle:
+      collection: Whistles
+    Sigh:
+      collection: WawaSigh
+    Scream:
+      collection: WawaScream
+    Yawn:
+      collection: WawaYawn
+    Crying:
+      collection: WawaCry
+    Snore:
+      collection: Snores
+    Weh:
+      collection: Weh
+    Hew:
+      collection: Hew
+    Honk:
+      collection: BikeHorn
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: WawaDeath
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 90db2f00b7..c89dc2c338 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -405,6 +405,12 @@
   icon: Interface/Emotes/deathgasp.png
   chatMessages: ["chat-emote-msg-deathgasp-monkey"]
 
+- type: emote
+  id: ScurretDeathgasp
+  name: chat-emote-name-deathgasp
+  icon: Interface/Emotes/deathgasp.png
+  chatMessages: ["chat-emote-msg-deathgasp-scurret"]
+
 - type: emote
   id: Buzz
   name: chat-emote-name-buzz
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index 1c31dcc280..5f48013e87 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -177,3 +177,12 @@
     path: /Audio/Animals/goat_bah.ogg
   exclaimSound:
     path: /Audio/Animals/goat_bah.ogg
+
+- type: speechSounds
+  id: Wawa
+  saySound:
+    path: /Audio/Animals/wawa_statement.ogg
+  askSound:
+    path: /Audio/Animals/wawa_question.ogg
+  exclaimSound:
+    path: /Audio/Animals/wawa_exclaim.ogg
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index f8202847fd..39f304018b 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -172,3 +172,12 @@
   - chat-speech-verb-electricity-1
   - chat-speech-verb-electricity-2
   - chat-speech-verb-electricity-3
+
+- type: speechVerb
+  id: Wawa
+  name: chat-speech-verb-name-wawa
+  speechVerbStrings:
+  - chat-speech-verb-wawa-1
+  - chat-speech-verb-wawa-2
+  - chat-speech-verb-wawa-3
+  - chat-speech-verb-wawa-4
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 734135de79..d1e9429ab3 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -206,7 +206,7 @@
   - !type:PowerWireAction
   - !type:AiInteractWireAction
   - !type:AccessWireAction
-  
+
 - type: wireLayout
   id: WeaponEnergyTurret
   dummyWires: 4
@@ -216,7 +216,7 @@
     pulseTimeout: 15
   - !type:AiInteractWireAction
   - !type:AccessWireAction
-  
+
 - type: wireLayout
   id: TurretControls
   dummyWires: 2
@@ -225,5 +225,11 @@
   - !type:PowerWireAction
     pulseTimeout: 15
   - !type:AiInteractWireAction
-  - !type:AccessWireAction 
-  
\ No newline at end of file
+  - !type:AccessWireAction
+
+- type: wireLayout
+  id: APC
+  dummyWires: 3
+  wires:
+  - !type:AccessWireAction
+  - !type:AiInteractWireAction
diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml
index ee67ef3078..6bba990ff3 100644
--- a/Resources/Prototypes/name_identifier_groups.yml
+++ b/Resources/Prototypes/name_identifier_groups.yml
@@ -1,37 +1,43 @@
 # Non-fungible apes, anyone?
 - type: nameIdentifierGroup
   id: Monkey
-  prefix: ОБ # Sunrise-Localization
+  format: name-identifier-format-monkey
 
 - type: nameIdentifierGroup
   id: Kobold
-  prefix: КБ # Sunrise-Localization
+  format: name-identifier-format-kobold
 
 - type: nameIdentifierGroup
   id: Holoparasite
-  prefix: ГОЛО # Sunrise-Localization
+  format: name-identifier-format-holoparasite
 
 - type: nameIdentifierGroup
   id: MMI
-  prefix: ЧМИ # Sunrise-Localization
+  format: name-identifier-format-mmi
   minValue: 100
   maxValue: 999
 
 - type: nameIdentifierGroup
   id: PositronicBrain
-  prefix: ПМ # Sunrise-Localization
+  format: name-identifier-format-positronic-brain
   minValue: 10
   maxValue: 99
 
 - type: nameIdentifierGroup
   id: Silicon
-  prefix: Кр # Sunrise-Localization
+  format: name-identifier-format-silicon
+  minValue: 1000
+  maxValue: 9999
+
+- type: nameIdentifierGroup
+  id: Xenoborg
+  format: name-identifier-format-xenoborg
   minValue: 1000
   maxValue: 9999
 
 - type: nameIdentifierGroup
   id: StationAi
-  prefix: AI
+  format: name-identifier-format-station-ai
   minValue: 100
   maxValue: 999
 
@@ -51,6 +57,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 905344b94c..72b20185d5 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -1,12 +1,11 @@
 # Status effect prototypes.
 # Holds no actual logic, just some basic data about the effect.
 
-- type: statusEffect
-  id: Stun
-  alert: Stun
+# Note: We have a new status effect system that needs all of these status effects to be fully ported to.
+# Adding new status effects under the old system is NOT RECOMMENDED.
 
 - type: statusEffect
-  id: KnockedDown
+  id: Stun
   alert: Stun
 
 - type: statusEffect
@@ -22,9 +21,6 @@
 - type: statusEffect
   id: AllCaps
 
-- type: statusEffect
-  id: SeeingRainbows
-
 - type: statusEffect
   id: Electrocution
 
@@ -45,9 +41,6 @@
   id: Corporeal
   alert: Corporeal
 
-- type: statusEffect
-  id: ForcedSleep #I.e., they will not wake on damage or similar
-
 - type: statusEffect
   id: TemporaryBlindness
 
@@ -66,9 +59,6 @@
 - type: statusEffect
   id: RadiationProtection
 
-- type: statusEffect
-  id: Drowsiness #blurs your vision and makes you randomly fall asleep
-
 - type: statusEffect
   id: Adrenaline
   alert: Adrenaline
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 802f0a8978..e7358245a3 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -225,7 +225,6 @@
 - type: Tag
   id: CanPilot
 
-
 - type: Tag
   id: CaptainSabre
 
@@ -646,6 +645,9 @@
 - type: Tag
   id: Goat
 
+- type: Tag
+  id: GoldenPlunger
+
 - type: Tag
   id: Goliath
 
@@ -832,6 +834,9 @@
 - type: Tag
   id: Knife
 
+- type: Tag
+  id: KnockdownImmune
+
 - type: Tag
   id: LavaBrig
 
@@ -894,9 +899,6 @@
 - type: Tag
   id: MagazineShotgun
 
-- type: Tag
-  id: MagazineMagnumSubMachineGun
-
 - type: Tag
   id: MagazinePistolSubMachineGun
 
@@ -1100,6 +1102,12 @@
 - type: Tag
   id: PlushieCarp
 
+- type: Tag
+  id: PlushieCarpHolo
+
+- type: Tag
+  id: PlushieCarpMagi
+
 - type: Tag
   id: PlushieGhost
 
@@ -1158,6 +1166,9 @@
 - type: Tag
   id: ReinforcedGlassShard
 
+- type: Tag
+  id: RemoteSignaller
+
 - type: Tag
   id: ReptilianFood
 
@@ -1194,6 +1205,9 @@
 - type: Tag
   id: RollingPin
 
+- type: Tag
+  id: Ruminant
+
 - type: Tag
   id: SaltShaker
 
@@ -1209,6 +1223,9 @@
 - type: Tag
   id: Screwdriver
 
+- type: Tag # Flags items that scurrets can wear in their back and outerwear slots.
+  id: ScurretWearable
+
 - type: Tag
   id: SecBeltEquip
 
@@ -1263,6 +1280,9 @@
 - type: Tag
   id: Slice # sliced fruit, vegetables, pizza etc.
 
+- type: Tag
+  id: SlowImmune
+
 - type: Tag
   id: SmallAIChip
 
@@ -1326,6 +1346,9 @@
 - type: Tag
   id: StringInstrument
 
+- type: Tag
+  id: StunImmune
+
 - type: Tag
   id: SubdermalImplant
 
@@ -1479,6 +1502,9 @@
 - type: Tag
   id: Wine
 
+- type: Tag
+  id: WireBrush
+
 - type: Tag
   id: Wirecutter
 
@@ -1520,5 +1546,4 @@
 
 - type: Tag
   id: XenoborgModuleStealth
-
 # ALPHABETICAL
diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml
index a6c712c684..6959452608 100644
--- a/Resources/Prototypes/tool_qualities.yml
+++ b/Resources/Prototypes/tool_qualities.yml
@@ -68,6 +68,13 @@
   spawn: RollingPin
   icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }
 
+- type: tool
+  id: Brushing
+  name: tool-quality-brushing-name
+  toolName: tool-quality-brushing-tool-name
+  spawn: WireBrush
+  icon: { sprite: Objects/Specific/Janitorial/wirebrush.rsi, state: icon }
+
 # do not give this to normal tools, its for nuke deconstruction
 - type: tool
   id: FineScrewing
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
index 2572c906b0..31e8caf60d 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
@@ -8,8 +8,8 @@
 
   ## Various Antagonists
   Antagonists can take many forms, like:
-  - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and decieve.
-  - [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special gloves.
+  - [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 tools.
   - [textlink="Revolutionaries" 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/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
index 59c7cb9bc3..52a7986963 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -1,7 +1,7 @@
 <Document>
   # Minor Antagonists
 
-  Most if not all Minor Antagonists are ghost-controlled roles that gives dead people new ways to cause chaos around the station. They are spawned by random events.
+  Minor Antagonists are ghost-controlled roles that give dead people a second chance to interact (and cause chaos!) around the station. They are spawned by random events.
 
   # Paradox Clone
 
@@ -9,7 +9,9 @@
     <GuideEntityEmbed Entity="ParadoxCloneDummy"/>
   </Box>
 
-  A perfect copy of a random crewmember that was thrown into our universe by a space-time anomaly. To fix the paradox and survive they have to find and kill their original counterpart. They have no special abilities, but are have identical appearance, DNA, fingerprints, clothing, equipment and IDs, making it hard to figure out who is the orginal and who is the clone, unless you know your fellow crewmembers well.
+  A perfect copy of a random crewmember that was thrown into our universe by a space-time anomaly. To fix the paradox and survive they have to find and kill their original counterpart.
+
+They have no special abilities, but are identical in appearance, DNA, fingerprints, clothing, equipment and IDs, making it hard to figure out who is the original and who is the clone... unless you know your fellow crewmembers well!
 
   # Revenant
 
@@ -40,7 +42,7 @@
   - You can conjure a cloud of [color=#77b58e]ammonia[/color] using [color=purple][italic]Rat King's Domain[/italic][/color]. This purple gas is mildly poisonous to humans but heals rats.
   - [color=#9daa98][italic]Rummage[/italic][/color] through a disposal unit by using the context menu. Use this to find [bold]scraps of food[/bold] to grow your army.
   - Besides your abilities, [bold]you are stronger than most other animals.[/bold] You and your servants are capable of speech and you're both small enough to fit under airlocks and tables.
-  - [bold]Your underlings are still very fragile![/bold] Beware of spacings, explosions and the buisness end of a melee weapon.
+  - [bold]Your underlings are still very fragile![/bold] Beware of spacings, explosions and the business end of a melee weapon.
 
   # Space Dragon
 
@@ -70,5 +72,5 @@
 
   Slimes and spiders have no remarkable features, but will [color=cyan]infest the station[/color] from time to time regardless. Both will give chase and attack anything they see.
   - Slimes may [bold]deal extra cellular or poison damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person.
-  - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
+  - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move through, but are easily destroyed with a blade. They can also pry open doors, windoors, and airlocks.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
index 11149bab66..83288140c1 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml	
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml	
@@ -16,16 +16,16 @@
   ## Operatives
   Your team will be made up of several different roles, which are:
   - [bold]Operatives[/bold], standard soldiers who can take up the grunt work.
-  - The [bold]Agent[/bold] who works with reagents to make medicines or chemical weapons.
+  - The [bold]Corpsman[/bold] who works with reagents to make medicines or chemical weapons.
   - The [bold]Commander[/bold] who draws up the plan and leads the team.
 
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndie"/>
-    <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieMedic" Caption="agent's hardsuit"/>
+    <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieMedic" Caption="corpsman's hardsuit"/>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieCommander" Caption="commander's hardsuit"/>
   </Box>
 
-  If you have been selected as the Agent or Commander but don't feel ready, one of your teammates can take responsibility.
+  If you have been selected as the Corpsman or Commander but don't feel ready, one of your teammates can take over your responsibilities.
 
   ## The Disk
 
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
index ec871851c6..6dd6278334 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
@@ -14,15 +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 sucessfully swipe what you want using determination, sleight of hand, a few tools and your [color=cyan]thieving gloves.[/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 pair of gloves you have give you a major advantage: [bold]the ability to take things off of people without them even noticing.[/bold] With a little practice, you can steal their wallet and keep up a conversation at the same time.
+  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.
 
-  They're also made of the highest quality [bold]holographic chameleon fibers[/bold] you could steal, but while they can take the appearance of insulated gloves you'll still need to find a real pair to keep your hands from burning.
 
-  <Box>
-    <GuideEntityEmbed Entity="ClothingHandsChameleonThief" Caption="your thieving gloves"/>
-  </Box>
 
   ## 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]
@@ -42,14 +40,14 @@
     <GuideEntityEmbed Entity="SatchelThief"/>
   </Box>
   <Box>
-    <GuideEntityEmbed Entity="StorageImplanter" Caption="Anatomy"/>
+    <GuideEntityEmbed Entity="Implanter" Caption="Anatomy"/>
     <GuideEntityEmbed Entity="C4" Caption="Breacher"/>
     <GuideEntityEmbed Entity="ChameleonProjector" Caption="Chameleon"/>
-    <GuideEntityEmbed Entity="EncryptionKeyStationMaster" Caption="Communicator"/>
+    <GuideEntityEmbed Entity="BaseUplinkRadio" Caption="Communicator"/>
   </Box>
   <Box>
     <GuideEntityEmbed Entity="NitrousOxideTank" Caption="Sleeper"/>
-    <GuideEntityEmbed Entity="Emag" Caption="Smuggler"/>
+    <GuideEntityEmbed Entity="Fulton" Caption="Smuggler"/>
     <GuideEntityEmbed Entity="Telecrystal" Caption="Syndie"/>
   </Box>
 
@@ -65,10 +63,10 @@
   Things that you may desire include but are not limited to:
 
   <Box>
-   <GuideEntityEmbed Entity="ToyFigurineGreytider" Caption="Figurines"/>
-   <GuideEntityEmbed Entity="PassengerIDCard" Caption="ID cards"/>
-   <GuideEntityEmbed Entity="ChemDispenser" Caption="Structures"/>
-   <GuideEntityEmbed Entity="MobCorgiIan" Caption="Animals/Pets"/>
+    <GuideEntityEmbed Entity="ToyFigurineGreytider" Caption="Figurines"/>
+    <GuideEntityEmbed Entity="PassengerIDCard" Caption="ID cards"/>
+    <GuideEntityEmbed Entity="ChemDispenser" Caption="Structures"/>
+    <GuideEntityEmbed Entity="MobCorgiIan" Caption="Animals/Pets"/>
   </Box>
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 5943f52bbf..5dc1310be3 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.
 
@@ -68,12 +68,12 @@
 
   Alternatively, your objectives may require you to [italic][color=cyan]die a glorious death.[/color][/italic] [bold]Make sure you don't come back from the dead,[/bold] or else you may wake up in cuffs.
 
-  ## Appropiation
+  ## Appropriation
   More often than not, you'll have to [italic][color=cyan]steal a possession of a department head.[/color][/italic]
 
   The target may be in their office, or on their person. It may become necessary to kill whoever is carrying it, if you cannot pickpocket them.
 
-  You may be tasked with:
+  Some of the things you may be tasked with include:
   - Stealing the [color=yellow]Captain[/color]'s [bold]ID Card[/bold], [bold]antique laser pistol[/bold], [bold]jetpack[/bold], or [bold]nuclear authentication disk[/bold].
   <Box>
     <GuideEntityEmbed Entity="CaptainIDCard" Caption=""/>
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml b/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
index c16511ba95..2d0056c21f 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
@@ -1,52 +1,52 @@
 <Document>
-  # Зомби
-  
+  # Zombies
+
   <Box>
-    [color=#999999][italic]"Они идут за тобой, Барбара!"[/italic][/color]
+    [color=#999999][italic]"They're coming to get you, Barbara!"[/italic][/color]
   </Box>
   <Box>
     <GuideEntityEmbed Entity="SignBiohazard" Caption=""/>
   </Box>
 
-  Зомби — это антагонисты, способные заражать всех существ, которых они кусают, вирусом [color=#7e916e]Ромерол[/color], смертельным и заразным, который легко распространяется, если его не сдержать.
+  Zombies are conversion antagonists that infect all beings that they bite with [color=#7e916e]Romerol[/color], a deadly, contagious virus that can easily spread if not contained.
 
   <Box>
-    <GuideReagentEmbed Reagent="Romerol"></GuideReagentEmbed>
+    <GuideReagentEmbed Reagent="Romerol"/>
   </Box>
 
-  ## Первоначально Зараженные
-  Вы — пациент ноль. В ваших жилах течет [color=#7e916e]Ромерол[/color], и вы испытываете огромное желание поделиться им с каждым встречным живым существом.
+  ## Initial Infected
+  You are patient zero. You have [color=#7e916e]Romerol[/color] coursing through your veins and you have a grand desire to share it with every single flesh being you see.
 
-  Как только вы узнаете о своей инфекции, [italic]все ставки снимаются[/italic]. У вас есть лишь ограниченное время до превращения, и вы хотите [bold]максимизировать свои шансы на захват станции.[/bold]
-  Используйте это время для подготовки оружия, снаряжения и ловушек. [italic]Космическое право больше для вас ничего не значит.[/italic]
+  Upon learning of your infection, [italic]all bets are off[/italic]. You have only so much time before you turn, and you want to [bold]maximize your chances of taking over the station.[/bold]
+  Use this time to prepare weapons, gear, and traps. [italic]Space Law means nothing to you now.[/italic]
 
-  ## Передача
-  Зомби умеют лишь шаркать, кусать и бросаться на баррикады. Их укус [bold]не всегда передает [color=#7e916e]Ромерол[/color][/bold] через плотные слои одежды, но точно причиняет боль.
+  ## Transmission
+  Zombies only know how to shamble, bite and throw themselves against barricades. Their bite [bold]may not always transmit [color=#7e916e]Romerol[/color][/bold] through heavy layers of clothing, but it'll definitely hurt.
 
-  Нежить также может укусить критически раненое или мертвое тело, чтобы [bold]мгновенно превратить[/bold] его в зомби.
+  The undead can also chomp on a crit or dead body to [bold]instantly convert[/bold] it to a zombie.
 
-  ## Атрибуты Зомби
-  Зомби можно узнать по тёмно-зелёной коже, красным глазам, медленному передвижению, запаху гниения и отсутствию двигательных функций. При превращении они роняют наушники и перчатки, а наручники не защитят от их жестокого укуса.
+  ## Zombie Attributes
+  A zombie can be identified by dark green skin, red eyes, slow movement, rotting smell, and lack of motor functions. They'll drop their headset and gloves upon turning, and cuffs don't work against their vicious bite.
 
-  Зомби известны своей [bold]стойкостью к порезам, ударам, ядам и холоду.[/bold] Они могут выжить в вакууме и не нуждаются в пище, воде, воздухе или сне. Однако нежить [italic]получает повышенный урон от ожогов и ударов током.[/italic]
+  Zombies are known for their [bold]resilience to slashes, bruises, poison and cold.[/bold] They can survive in a vacuum and do not require food, water, air, or sleep. The undead do, however, [italic]take increased burn and shock damage.[/italic]
 
-  ## Выживание
-  Когда инфекция распространяется и [color=#cb0000]Служба безопасности[/color] падает, задача [bold]выживших[/bold] — попытаться добраться до Центрального Командования.
+  ## Survival
+  When the infection sweeps and [color=#cb0000]Security[/color] falls, it's up to the [bold]survivors[/bold] to try and make it to Central Command.
 
-  [bold]Постройка баррикад[/bold] вокруг отделов или [bold]запирание дверей[/bold] может выиграть достаточно времени для создания оружия, спасения жизней или разработки плана.
+  [bold]Constructing barricades[/bold] around departments or [bold]bolting doors[/bold] can buy enough time to make weapons, save lives or make a plan.
 
-  Помните, что в трудные моменты [italic]приходится делать то, что необходимо[/italic], пока это не идёт в ущерб другим выжившим. Собирайте все необходимое у тех, кто не выжил.
+  Remember that when it really hits the fan, [italic]you've gotta do what you gotta do[/italic], as long as it's not at the expense of fellow survivors. Scavenge what you need from those who haven't made it.
 
-  ## Лечение
-  [bold]Те, кто уже стал нежитью, могут быть излечены только [color=red]смертью.[/color][/bold]
+  ## Cure
+  [bold]Those who are already undead can only be cured by [color=red]death.[/color][/bold]
 
-  Если вы заражены, но ещё не превратились в зомби, использование [color=#86caf7]Амбузола[/color] вылечит вас, но не предотвратит повторное заражение. [color=#1274b5]Амбузол Плюс[/color] вылечит и предотвратит повторное заражение, но только пока вы живы.
+  If you're infected but not zombified yet, using [color=#86caf7]Ambuzol[/color] will cure you but won't prevent re-infection. [color=#1274b5]Ambuzol Plus[/color] will cure and prevent re-infection only while alive.
 
   <Box>
-    <GuideReagentEmbed Reagent="Ambuzol"></GuideReagentEmbed>
+    <GuideReagentEmbed Reagent="Ambuzol"/>
   </Box>
   <Box>
-    <GuideReagentEmbed Reagent="AmbuzolPlus"></GuideReagentEmbed>
+    <GuideReagentEmbed Reagent="AmbuzolPlus"/>
   </Box>
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
index 9ccd78677a..e9fdebc805 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
@@ -1,29 +1,45 @@
 <Document>
-  # Запросы отдела снабжения
-  [textlink="Отдел снабжения" link="Cargo"] всегда может заработать, продавая товары, когда им вздумается. Однако есть способы заработать ещё больше денег, если более избирательно подходить к тому, что и когда вы продаёте. Один из таких способов - [color=#a4885c]запросы[/color].
+  # Cargo Bounties
+  While [textlink="Cargo" link="Cargo"] can make [color=cyan]spesos[color] selling just about anything, more spesos can be made by fulfilling [color=cyan]bounties[/color] found through the Cargo Bounty Computer.
+
+  ## Starting Bounties
 
   <Box>
     <GuideEntityEmbed Entity="ComputerCargoBounty"/>
+    <GuideEntityEmbed Entity="PaperCargoBountyManifest"/>
   </Box>
-  На каждой станции есть определённое количество доступных запросов. Их можно проверить на [color=#a4885c]консоли запросов[/color], которая показывает следующую информацию о них:
-  - Какие предметы нужны для выполнения запроса
-  - Сколько денег вы получите за выполнение запроса
-  - Сколько времени осталось до истечения срока запроса
 
-  При условии, что вы сможете достать все предметы для этого, затратив минимум времени и средств, вы сможете завершить запрос и получить значительно большую сумму, чем если бы вы продавали предметы обычным способом.
+  To start a bounty, open the bounty screen by interacting with the [color=cyan]Cargo Bounty Computer[/color]. The Cargo Bounty Computer maintains a list of all the current bounties and lets you either print out a label or skip it.
+
+  - Printing the label gives you a [color=cyan]Bounty Manifest[/color] listing the goods that need to be acquired. You can print out infinite Bounty Manifests, so ensure you are not repeating the same work as another Cargo Technician.
+
+  - Skipping a bounty replaces that bounty with a new one, as there can only be six active bounties at any time. Skipping has a 15-minute cooldown and voids that bounty, which may anger other Cargo Technicians working on it.
+
+  ## Fulfilling Bounties
 
-  ## Выполнение запросов
   <Box>
     <GuideEntityEmbed Entity="PaperCargoBountyManifest"/>
     <GuideEntityEmbed Entity="CrateGenericSteel"/>
-    <GuideEntityEmbed Entity="CargoPallet"/>
+    <GuideEntityEmbed Entity="AppraisalTool"/>
   </Box>
-  Как только вы соберёте предметы, необходимые для запроса, завершить его будет проще простого.:
-  - Поместите все предметы в ящик и [bold]закройте его![/bold].
-  - Возьмите этикетку манифеста, нажав кнопку [color=#a4885c]распечатать этикетку[/color] на консоли запросов.
-  - Поместите этикетку на ящик, в котором находятся предметы.
-  - Переместите ящик на грузовой шаттл.
-  - Продайте его.
 
-  Вот и всё! После того как вы выполните эти действия, запрос должен исчезнуть с компьютера, а на его месте появится новый.
+  With the [color=cyan]Bounty Manifest[/color], it is now up to you to collect the required goods, but most departments will give you what you need if you ask for it with a Bounty Manifest.
+
+  Once you have collected the goods, return to the cargo bay and put the goods inside an empty [color=cyan]Crate[/color]. After everything is in the crate, close it, and then apply the Bounty Manifest to it.
+
+  To verify the completion of a bounty, use the [color=cyan]Appraisal Tool[/color] on it. It should show a confirmation that the bounty has been completed.
+
+  ## Selling Bounties
+
+  <Box>
+    <GuideEntityEmbed Entity="PaperCargoBountyManifest"/>
+    <GuideEntityEmbed Entity="CrateGenericSteel"/>
+    <GuideEntityEmbed Entity="CargoPalletSell"/>
+  </Box>
+
+  Once you have verified that you have completed the bounty, follow the same steps as selling anything else.
+
+  Just transport it to the [color=cyan]Trading Station[/color], sell it, and you are done!
+
+  When you return, there should be a new bounty to take its place.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
index 9e9c3833f9..9cab9aced2 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
@@ -7,7 +7,7 @@
 
   ## Preparations
 
-  Before leaving the station, ensure you are prepared with all the required equipment. Otherwise, you will die before seeing any profits!
+  Before leaving the station, ensure you are prepared with all the required equipment. Otherwise, you will likely die before seeing any profits!
 
   <Box>
     <GuideEntityEmbed Entity="SuitStorageSalv"/>
@@ -15,7 +15,7 @@
     <GuideEntityEmbed Entity="VendingMachineSalvage"/>
   </Box>
 
-  Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with something rather than nothing.
+  Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with your starting gear rather than nothing.
 
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSpatio"/>
@@ -44,7 +44,7 @@
 
   While you can technically mine and gather ore with just a PKA and a Backpack, Salvagers start with more specialized gear for the task.
 
-  - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. Also, it works as a melee weapon!
+  - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. It also works as a handy melee weapon!
   - [color=cyan]Ore Bag[/color]: When equipped in your belt slot, this magnetizes nearby ore and automatically picks it up for you.
 
   <Box>
@@ -109,7 +109,7 @@
     <GuideEntityEmbed Entity="Recycler"/>
   </Box>
 
-  [color=cyan]Space Debris[/color] is a versatile option, providing vital basic materials (such as steel, glass, etc) in short supply at the start of the shift. Items and scrap are scattered across the debris, and must be collected. Consider dragging along one of the lockers or crates aboard the debris for easier storage.
+  [color=cyan]Space Debris[/color] is a versatile option, providing vital basic materials (such as steel, glass, etc.) in short supply at the start of the shift. Items and scrap are scattered across the debris, and must be collected. Consider dragging along one of the lockers or crates aboard the debris for easier storage.
 
   Debris is sprinkled with numerous threats. Bloodthirsty [color=red]Space Carp[/color] and [color=red]Sharkminnows[/color] infest them, eager to rush any Salvagers that come nearby. [color=red]Landmines[/color] are also rarely found aboard debris, capable of incapacitating the unwary explorer.
 
@@ -160,7 +160,7 @@
 
   The [color=purple]Science Department[/color] is a crucial partner for Salvage. Science depends on Salvage for both basic materials (steel, plastic, glass) and advanced materials (silver, gold, plasma, and uranium), and Salvage relies on Science for the upgraded equipment that makes their work easier.
 
-  Whenever possible, communicate with Science and try to prioritize their requests. While Science will need large quantities of basic materials, they rely entirely on you for their supply of [color=yellow]Gold, Silver and Uranium,[/color] all of which are required for your advanced gear. If you want Science to help you, you have to help them - and vice-versa.
+  Whenever possible, communicate with Science and try to prioritize their requests. While Science will need large quantities of basic materials, they rely entirely on you for their supply of [color=yellow]Gold, Silver and Uranium,[/color] all of which are required for your advanced gear. If you want Science to help you, you have to help them - and vice versa.
 
   <Box>
     <GuideEntityEmbed Entity="MiningDrill"/>
diff --git a/Resources/ServerInfo/Guidebook/Command.xml b/Resources/ServerInfo/Guidebook/Command.xml
index 564658a1c5..96fe99639e 100644
--- a/Resources/ServerInfo/Guidebook/Command.xml
+++ b/Resources/ServerInfo/Guidebook/Command.xml
@@ -1,55 +1,55 @@
 <Document>
-# Командование
-Главы каждого отдела объединяются, чтобы сформировать отдел [color=#1b67a5]Командования[/color], силу, с которой приходится считаться, и управлять станцией. Обычно они имеют доступ к специальному оборудованию и собственным кабинетам. Часто их хотят видеть мёртвыми.
+# Command
+The heads of each department come together to form the [color=#1b67a5]Command[/color] department, a force to be reckoned with and the handlers of the station. They usually have access to special equipment and their own rooms. They are often wanted dead.
 
-## Персонал
-[color=#1b67a5]Командование[/color] состоит из глав каждого отдела: [color=#9fed58]Главы персонала[/color], [color=#cb0000]Начальника службы безопасности[/color], [color=#5b97bc]Главного медицинского офицера[/color], [color=#f39f27]Главного инженера[/color], [color=#c96dbf]Директора исследований[/color], [color=#b18644]Квартирмейстера[/color] и, превыше всего, [color=#1b67a5]Капитана[/color].
+## Personnel
+[color=#1b67a5]Command[/color] is made up of the heads of each department, being the [color=#9fed58]Head of Personnel[/color], the [color=#cb0000]Head of Security[/color], the [color=#5b97bc]Chief Medical Officer[/color], the [color=#f39f27]Chief Engineer[/color], the [color=#c96dbf]Research Director[/color], the [color=#b18644]Quartermaster[/color] and above all else, the [color=#1b67a5]Captain[/color].
   <Box>
-    <GuideEntityEmbed Entity="ToyFigurineCaptain" Caption="Капитан"/>
+    <GuideEntityEmbed Entity="ToyFigurineCaptain" Caption="Captain"/>
   </Box>
   <Box>
-    <GuideEntityEmbed Entity="ToyFigurineHeadOfPersonnel" Caption="Глава персонала"/>
-    <GuideEntityEmbed Entity="ToyFigurineHeadOfSecurity" Caption="Начальник службы безопасности"/>
-    <GuideEntityEmbed Entity="ToyFigurineChiefMedicalOfficer" Caption="Главный медицинский офицер"/>
+    <GuideEntityEmbed Entity="ToyFigurineHeadOfPersonnel" Caption="HoP"/>
+    <GuideEntityEmbed Entity="ToyFigurineHeadOfSecurity" Caption="HoS"/>
+    <GuideEntityEmbed Entity="ToyFigurineChiefMedicalOfficer" Caption="CMO"/>
   </Box>
   <Box>
-    <GuideEntityEmbed Entity="ToyFigurineChiefEngineer" Caption="Главный инженер"/>
-    <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="Директор исследований"/>
-    <GuideEntityEmbed Entity="ToyFigurineQuartermaster" Caption="Квартирмейстер"/>
+    <GuideEntityEmbed Entity="ToyFigurineChiefEngineer" Caption="CE"/>
+    <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="RD"/>
+    <GuideEntityEmbed Entity="ToyFigurineQuartermaster" Caption="QM"/>
   </Box>
 
-## Взятие на себя обязанностей
-Поздравляем с повышением! Помимо всей дополнительной бумажной работы, ваши новые [color=#a4885c]обязанности[/color] включают управление отделом, внесение изменений и определение приоритетов, обеспечение безопасности персонала и оборудования, а также возможность расслабиться, пока ваши подчиненные выполняют всю работу.
+## Taking Charge
+Congratulations on your promotion! Besides all the extra paperwork, your new [color=#a4885c]responsibilities[/color] include running your department, making changes and choosing priorities, keeping personnel and equipment safe as well as slacking off while your cronies do all the work.
 
-Не забывайте, что у вас всё ещё есть работа! Ваши крутые инструменты не дают вам выходного, вам всё равно нужно заполнять пробелы в персонале, помогать сотрудникам и обучать новичков.
+Don't forget, you still have a job! Your fancy tools don't earn you a day off, you still have to fill in for any staffing shortages, helping out struggling workers and teaching the newbies.
 
-Вы можете просто сидеть сложа руки, пока люди начнут ненавидеть вас, но разумнее будет активно работать вместе с ними.
-Не забывайте перемещать своих сотрудников, чтобы они занимались тем, что им нравится или что они делают лучше всего.
+You might get away with just sitting around and letting people resent you, but it's wiser to get active and work alongside them.
+Remember to move your workers around to have them do what they like doing or what they do best.
 
-## Ваш шкафчик
+## Your Locker
 
-Чтобы справиться с новыми, душераздирающими задачами, каждому главе предоставляются специальные предметы для управления подчинёнными. Большинство ваших новых блестящих инструментов можно найти в вашем [color=#a4885c]шкафчике[/color].
+To deal with your new soul-crushing tasks, every head is given special items to lead your subordinates. Most of your new shiny tools can be found in your [color=#a4885c]locker[/color].
   <Box>
     <GuideEntityEmbed Entity="LockerCaptain"/>
   </Box>
 
-Ваш [color=#a4885c]пульт управления[/color] очень прост, но его часто недооценивают. Маленькая, но мощная сила, ваш пульт может открывать и закрывать [color=#a4885c]воздушные шлюзы[/color], поворачивать [color=#a4885c]болты[/color] для их блокировки или переключать [color=#a4885c]доступ в аварийных ситуациях[/color]. И всё это на расстоянии.
+Your [color=#a4885c]remote[/color] is very simple but profoundly underestimated. A small but mighty force, your remote can open and close [color=#a4885c]airlocks[/color], spin the [color=#a4885c]bolts[/color] to lock them, or toggle [color=#a4885c]emergency access[/color]. It can do this from a distance.
   <Box>
     <GuideEntityEmbed Entity="DoorRemoteCommand"/>
   </Box>
-Пульт управления влияет на передвижение людей. Главы могут закрывать доступ в опасные зоны или впускать людей, чтобы они быстро что-то забрали.
+The remote influences where people move around. Heads can lock personnel out of dangerous areas or let people in to grab something really quickly.
 
-У вас также есть доступ к вашему собственному каналу [color=#1b67a5]Командования[/color], как и у каждого отдела. Однако, ваш канал особенно важен, так как люди, которые могут вас слышать, имеют в своих руках [color=#a4885c]целые отделы[/color].
-Используйте его для общения с другими главами и представляйте интересы своих сотрудников.
+You also have access to your very own [color=#1b67a5]Command[/color] channel, like every other department. However, yours is particularly special as the people who can hear you have [color=#a4885c]entire departments[/color] at their fingertips.
+Use this to communicate with other heads and be a representative of what your workers want or need.
 
-[color=#1b67a5]Капитан[/color] и [color=#9fed58]Глава персонала[/color] имеют доступ к ценному [color=#a4885c]ключу шифрования главного канала[/color], который позволяет им настроиться на каждый радиоканал на станции. Это чрезвычайно важно, так как вы сможете самостоятельно координировать работу отделов.
-[color=#a4885c]Не упустите это жизненно важное преимущество![/color]
+The [color=#1b67a5]Captain[/color] and the [color=#9fed58]Head of Personnel[/color] get access to the lucrative [color=#a4885c]master encryption key[/color], letting them tune into every radio channel on the station. This is extremely valuable, as you can coordinate between departments yourself.
+[color=#a4885c]Don't waste this vital advantage![/color]
   <Box>
     <GuideEntityEmbed Entity="ClothingHeadsetCommand"/>
     <GuideEntityEmbed Entity="EncryptionKeyStationMaster"/>
   </Box>
 
-Чтобы сделать болото бумажной работы (которое наверняка вас переполнит) ещё более трудным, вам великодушно предоставили [color=#a4885c]штамп[/color] в вашем шкафчике. Используйте его для подписания документов. После того, как вы поставите штамп, изменить их будет уже нельзя. Внимательно проверяйте перед подписью.
+To make the swamp of paperwork (that will definitely overwhelm you) even harder to deal with, you have generously been given a [color=#a4885c]stamp[/color] in your locker. Use this to sign paperwork. After you stamp it, it can't be edited. Look it over first.
   <Box>
     <GuideEntityEmbed Entity="RubberStampCaptain"/>
   </Box>
diff --git a/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml b/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml
index 3a3857ae4c..6070e3b985 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/GasManipulation.xml
@@ -49,6 +49,7 @@
     <GuideEntityEmbed Entity="SignalControlledValve" Caption=""/>
     <GuideEntityEmbed Entity="PressureControlledValve" Caption=""/>
     <GuideEntityEmbed Entity="GasPassiveGate" Caption=""/>
+    <GuideEntityEmbed Entity="GasPressureRegulator" Caption=""/>
   </Box>
   <Box>
     ## Valves
diff --git a/Resources/ServerInfo/Guidebook/Engineering/PressureRegulator.xml b/Resources/ServerInfo/Guidebook/Engineering/PressureRegulator.xml
new file mode 100644
index 0000000000..2b23ea5039
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Engineering/PressureRegulator.xml
@@ -0,0 +1,23 @@
+<Document>
+  # Inlet Pressure Regulator
+  The Inlet Pressure Regulator is a passive device that allows gas to escape from a [textlink="pipenet" link="PipeNetworks"] when the pressure exceeds a certain threshold.
+
+  <Box>
+    <GuideEntityEmbed Entity="GasPressureRegulator"/>
+  </Box>
+
+  ## Operation
+  The valve will automatically [color=green]open[/color] when the pressure in the pipe exceeds the set threshold, allowing gas to escape to the connected output pipe.
+
+  The valve will [color=red]close[/color] again when the pressure drops below the set threshold.
+
+  The flow rate of the valve is limited to [color=orange][protodata="GasPressureRegulator" comp="GasPressureRegulator" member="MaxTransferRate"/] L/s[/color].
+
+  ## Example Uses
+  The valve is commonly used to prevent overpressure situations in gas systems, such as [textlink="TEG" link="TEG"] cooling loops and [textlink="pipes" link="Pipes"], which would cause a failure in the system (clogged [textlink="pumps" link="Pumps"]).
+
+  The valve can also be used to vent off ready-to-use, hot gas from a burn chamber.
+  For example, it may be undesirable to allow a burn chamber to drop below a specific pressure for a long time, as this may cause the gas to cool down too much and thin out, which would cause a flameout.
+
+  An inlet pressure regulator can be used to vent off excess gas, while keeping the pressure in the burn chamber above a certain threshold, which may help in sustaining a fire in the chamber.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Valves.xml b/Resources/ServerInfo/Guidebook/Engineering/Valves.xml
index db8c18807c..46f5b0f629 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Valves.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Valves.xml
@@ -6,6 +6,7 @@
     <GuideEntityEmbed Entity="SignalControlledValve"/>
     <GuideEntityEmbed Entity="PressureControlledValve"/>
     <GuideEntityEmbed Entity="GasPassiveGate"/>
+    <GuideEntityEmbed Entity="GasPressureRegulator"/>
   </Box>
   All valves do not require [textlink="power" link="Power"] to operate.
 
diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml
index ade8325897..200fe67f64 100644
--- a/Resources/ServerInfo/Guidebook/Glossary.xml
+++ b/Resources/ServerInfo/Guidebook/Glossary.xml
@@ -1,197 +1,191 @@
 <Document>
-# Глоссарий
+# Glossary
 
-На этой странице собрано большинство жаргонных терминов, которые вы можете встретить на станции и в сообществе!
+This page contains most slang terms you might encounter on the station and throughout the community !
 
-# Внутриигровой Сленг
+# In-Character Slang
 
-Это термины, с которыми вы можете столкнуться в игре.
+These are terms you might encounter in-game.
 
 ## AOS
-Арестовать при виде. Используеться в английском сленге.
+Arrest on sight.
 
-## Фулл
-Все Доступы, или удостоверение, которое имеет все доступы на станции. Капитан - единственный человек, который имеет такой доступ в обычных обстоятельствах.
+## AA
+All Access, or an ID which has every access on the station. The captain is the only person who will have this kind of access under normal circumstances.
 
-## Атмос
-Сокращение от Атмосферика.
+## Atmos
+Short for Atmospherics.
 
-## Атмосник
-Термин для Атмосферных Техников, или вообще для всех, кто проводит много времени или особенно искусен в Атмосферике.
+## Atmosian
+A term for Atmospheric Technicians, or generally anyone who spends most of their time or is particularly skilled with Atmospherics.
 
-## Болтированно
-Шлюз, который никогда не изменит состояние. Он останется навсегда открытым или навсегда закрытым, пока его не разблокируют. Закрытые и заблокированные шлюзы имеют ярко-красные огни.
+## Bolted
+An airlock that will never change states. It will stay permanently open or permanently closed until it is unbolted. Closed and bolted airlocks have solid red lights.
 
-## Борг
-Сокращение от киборгов, управляемых игроками роботов.
+## Borg
+Short for cyborgs, player-controlled robots.
 
-## Ступор Мозга
-Относится к пользователю, который отключился от игры. Отключившиеся пользователи могут снова подключиться к серверу и снова взять под контроль своего персонажа.
+## Braindead
+Refers to a user who has disconnected from the game. Disconnected users may still reconnect to the server and assume control of their character again.
 
-## Бриг
-Главная зона службы безопасности. Здесь заключенные содержатся для выполнения своего наказания. За гладкое функционирование брига отвечает Смотритель.
+## Brig
+The main area of the security department. This is where prisoners are brought and held for their punishment. The Warden is in charge of the brig's smooth operation.
 
-## Поды
-Термин для эвакуационных капсул, цель которых просто сохранить жизнь персонала.
+## Cap
+Short for Captain.
 
-## Кэп
-Сокращение от Капитана.
+## Cargonia
+Reference to cargo declaring independence. Against the rules.
 
-## Каргония
-Отдел карго который провозгласил себя независимым. Против правил.
+## CE
+Short for Chief Engineer, the head of the Engineering Department.
 
-## СИ
-Сокращение от Главного Инженера, главы Инженерного Отдела.
+## CentComm/Central Command
+An administrative agency which oversees the Nanotrasen space station you inhabit.
 
-## Центкомм/Центральное командование
-Административное агентство, которое контролирует нанотрасенскую космическую станцию, на которой вы работаете.
+## CMO
+Short for Chief Medical Officer, the head of the Medical Department.
 
-## ГВ
-Сокращение от Главного Врача, главы Медицинского Отдела.
+## Crit/Critical
+Refers to the health state at which you fall unconscious and unable to move. While in critical, your health slowly decays until you die, unless you happen to get outside assistance.
 
-## Крит/Критический
-Относится к состоянию здоровья, при котором вы падаете без сознания и не можете двигаться. В критическом состоянии ваше здоровье постепенно ухудшается, пока вы не умрете, если вам не помогут извне.
+## Emag
+  Refers to the Syndicate cryptographic sequencer. "Emagged" usually refers to airlocks or lockers that are bolted open, but also any other device hacked into by an Emag.
 
-## Эмаг
-Относится к Синдикатному криптографическому секвенсору. "Эмагнутый" обычно относится к шлюзам или шкафчикам, которые заблокированы открытыми, но также к любому другому устройству, взломанному с помощью Эмага.
+## Emergency Access/EA
+  An airlock that can be opened by anyone, even without access or an ID at all. Airlocks that are set to emergency access have blinking yellow lights.
 
-## Аварийный доступ
-Шлюз, который может быть открыт кем угодно, даже без доступа или удостоверения. Шлюзы, установленные на аварийный доступ, имеют мигающие желтые огни.
+## ERT
+An Emergency Response Team. These may be dispatched by Central Command for a number of purposes.
 
-## ОБР
-Группа Экстренного Реагирования. Эти группы могут быть отправлены Центральным Командованием для выполнения различных задач.
+## Flukie
+A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops".
 
-## Флюки
-Смешение "Fluke"(счастливая случайность) и "Nukie"(Ядерные оперативники), обычно уничижительное обозначение команды Ядерных Оперативников, не справившихся со своей задачей. Может также называться "Fluke Ops".
+## God(s)
+An IC term representing a Server Administrator. CentComm is also sometimes used in this manner.
 
-## Бог(и)
-Термин в игре, обозначающий Администратора Сервера. Центральное командование также иногда используется в этом смысле.
+## Greytide/Greyshirt/Tider/Assistant
+Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes.
 
-## Грейтайд/Тайдер/Ассистент
-Обычно используется для обозначения Пассажира из-за цвета его стандартной униформы, хотя это может использоваться для отрицательного обозначения других членов экипажа (не только пассажиров), которые ведут себя буйно или совершают различные мелкие преступления.
+## HoP
+Short for Head of Personnel, head of the Service Department. Can also refer to the HoP's office, where IDs are given or changed.
 
-## ГП
-Сокращение от Главы Персонала, главы Отдела Обслуживания. Может также относиться к офису Главы Персонала, где выдаются или изменяются удостоверения.
+## HoS
+Short for Head of Security, head of the Security Department.
 
-## ГСБ
-Сокращение от Главы Безопасности, главы Отдела Безопасности.
+## Insuls
+Short for Insulated Gloves. These are the yellow gloves most often worn by Engineers. They are offer complete protection from getting electrocuted from shocked things. Vastily more effective than their budget variety.
 
-## Изоли
-Сокращение от Изолирующих Перчаток. Это желтые перчатки, которые чаще всего носят Инженеры. Они обеспечивают полную защиту от поражения электрическим током от зашокированных объектов. Значительно более эффективны, чем их бюджетный вариант.
-
-## Джани
-Сокращение от Уборщика.
+## Jani
+Short for Janitor.
 
 ## KOS
-Убить при виде. Кто-то совершил настолько серьезное преступление, что его не считают достойным ареста. Используеться в английском сленге.
+Kill on sight. Someone has commited such a serious crime that they are deemed not even worth arresting.
 
-## Маты
-Материалы. Обычно сталь, пластик, пласталь, стекло, серебро и золото.
+## Mats
+Materials. Usually steel, plastic, plasteel, glass, silver and gold.
 
 ## Nanotrasen/NT
-Nanotrasen - компания, которая владеет космической станцией, на которой вы живете.
+Nanotrasen is the company which owns the space station you inhabit.
 
 ## Newkie
-Смешение "New" и "Nukie", обозначающее неопытного игрока в роли Ядерного Оперативника. Используеться в английском сленге.
+A portmanteau of "New" and "Nukie" used to refer to an inexperienced player in the role of a Nuclear Operative.
 
-## Нюки/Ядерщики
-Сленг/сокращение для Ядерного Оперативника. Может также использоваться как "Nuke Op".
+## Nukie
+A slang/shorthand term of a Nuclear Operative. May sometimes also appear as "Nuke Op".
 
-## Перма
-Сокращение от Перманентного Брига. Это для самых серьезных преступлений и означает, что заключенный никогда не будет освобожден. Большинство станций имеют отдельную, выделенную зону безопасности для перманентного брига.
+## Perma
+Short for Permanent Brig. This is for the most serious crime and means that a prisoner will never be released. Most stations have a dedicated, separate area of security for the permanent brig.
 
-## КМ
-Сокращение от Квартирмейстера, главы Отдела Карго.
+## QM
+Short for Quartermaster, the head of the Cargo department.
 
-## НР
-Сокращение от Научного Руководителя, главы Научного Отдела.
+## RD
+Short for Research Director, the head of the Science Department.
 
-## Робаст
-Слово, используемое для описания кого-то, кто особенно искусен в бою или выжил в жестокой драке.
+## Robust
+A word used to describe someone who is particularly adept in combat, or endured through a tough fight.
 
-## Утиль
-Сокращение от утилизатора.
+## Salv
+Short for Salvage tech.
 
-## РНД
-Сокращение от Руководящего Научного Департамента.
+## Sci
+Short for Science.
 
-## СБ
-Сокращение от Службы безопасности.
+## Sec
+Short for Security.
 
 ## Secoff
-Сокращение от Офицера Безопасности. Используеться в английском сленге.
+Short for Security Officer.
 
-## Смена
-Внутриигровой способ обозначения раундов.
+## Shift
+In-Character way to refer to rounds.
 
-## Синга
-Сокращение от Сингулярного Двигателя. Сингуло может создавать бесконечную мощность для станции, но является очень опасным.
+## Singulo
+A shortening of the Singularity Engine. A Singulo can create infinite power for the station but is very dangerous.
 
 ## Singuloose
-Сингулярность, которая слишком сильно выросла и прорвалась из своего контейнера. Она прорвется через станцию, вызывая огромные повреждения. Используеться в английском сленге.
+A Singularity that has grown too much and breached its containment. It will rip through the station causing massive damage.
 
-## Разгерма/Разгерметизация
-Событие, которое вызывает потерю давления воздуха в зоне, т.е. пробоина в корпусе.
+## Spacing
+An event which causes an area to lose air pressure, i.e. a hull breach.
 
 ## Spess
-Намеренная ошибка в написании "Space", иногда используется как смешение "space" и "mess". Может также появляться в словах, таких как "Spessmen". Используеться в английском сленге.
+An intentional mis-spelling of "Space", sometimes used as a portmanteau of "space" and "mess". May also appear in words such as "Spessmen".
 
-## ССД
-Сокращение от Внезапного Синдрома Сна или Космического Синдрома Сна. Это внутриигровой способ обозначить игрока, который отключился и больше не отвечает.
+## SSD
+Short for Sudden Sleep Disorder or Space Sleep Disorder. This is an in-character way to refer to a player who has disconnected and is no longer responding.
 
-## Синди/Синдик/Синдикат/Опер/Оперативник
-Общее обозначение для любого сотрудника Синдиката. Это касается (подозреваемых) агентов Синдиката до Ядерных Оперативников.
+## Syndie/Syndi/Syndicate
+A catch-all reference to anyone employed by the Syndicate. This ranges from (suspected) Syndicate Agents to Nuclear Operatives.
 
-## ТК
-Телекристалл, который является валютой, используемой агентами Синдиката для покупки запрещенного контрабанда, такого как оружие и другое нелегальное оборудование.
+## TC
+A telecrystal, which is a currency used by Syndicate Agents to purchase restricted contraband such as weapons and other illegal equipment.
 
 ## Wardenloose
-Шутливый термин, обозначающий Сингулоосе. Wardenloose - это когда Смотритель замечен вне брига. Используеться в английском сленге.
+A joke term referencing a Singuloose. A wardenloose is when the Warden is seen outside of the brig.
 
-## Ксеноархеология
-Изучение артефактов, обычно выполняемое научными сотрудниками.
+## Xenoarchaeology
+Study of artifacts, usually performed by science.
 
-# Внеигровой Сленг
+# Out-Of-Character Slang
 
-Эти термины следует использовать только в чате OOC или вне игры.
+These are terms you should only be using in OOC chat or outside the game.
 
-## Сикей
-Имя аккаунта сс13/сс14, перекочивало с дедами из сс13.
+## Admeme
+An event hosted or caused by an admin.
 
-## Адмем(ы)
-Событие(я), организованное или вызванное администратором.
+## AHelp/Admin Help
+A relay used to report rulebreaking behavior or other issues to administrators.
 
-## Ахелп/Админ хелп
-Связь, используемая для сообщения о нарушении правил или других проблемах администраторам.
-
-## Антаг/Антагонист
-Сокращение от Антагонистов, специально отобранных лиц, предназначенных для введения хаоса в раунд.
+## Antag
+Short for Antagonists, which are specifically picked individuals designed to drive the round into chaos.
 
 ## Bwoink
-Звук, издаваемый при получении админ-хелпа. Молитесь, чтобы это не был бан. Используеться в английском сленге.
+The noise made when an admin-help is received. Pray this isn't a ban.
 
 ## Ick Ock
-Фраза, обычно выкрикиваемая в OOC, когда кто-то раскрывает IC информацию о текущем раунде, или "внутриигровое, внегровое". Используеться в английском сленге.
+A phrase usually shouted in OOC when somebody reveals IC current round information, or "in-character, out-of-character".
 
-## LOOC/OOC/ЛООК
-Местный внегровой и (глобальный) внегровой соответственно. Это текстовые каналы, которые позволяют игрокам общаться с другими игроками вне ролевой игры. LOOC включен во время раундов, а OOC обычно только после окончания раунда.
+## LOOC/OOC
+Local out-of-character and (global) out-of-character respectively. They are text channels that allow players to talk to other players outside of roleplay. LOOC is enabled during rounds, while OOC is typically only on after the round ends.
 
-## LRP/ЛРП
-Низкая ролевая игра. Серверы с маркировкой LRP обычно имеют расслабленные правила ролевой игры.
+## LRP
+Low Roleplay. Servers marked LRP typically have relaxed roleplaying rules.
 
-## MRP/МРП
-Средняя ролевая игра. Серверы с маркировкой MRP обычно имеют приличную основу правил ролевой игры и обычно требуют, чтобы игроки действовали так, как бы их персонаж поступил в данной ситуации. Меньше допускается поведение, такое как открытое неповиновение безопасности или вашему начальнику.
+## MRP
+Medium Roleplay. Servers marked MRP usually have a decent basis of roleplaying rules and generally require players to act as their character would realistically in a given situation. Less leeway is afforded to behavior such as openly defying Security or your boss.
 
-## HRP/ХРП
-Высокая ролевая игра. Серверы с маркировкой HRP обычно имеют обширные правила относительно того, что считается допустимым при игре за персонажа. Обычно от вас требуется действовать так, как бы поступил ваш персонаж, иметь историю персонажа и следовать протоколам на станции. Некоторые HRP серверы могут создавать свою собственную историю или настройки для дальнейшего облегчения типа сервера, который они хотят хостить.
+## HRP
+High Roleplay. Servers marked HRP generally have extensive rules on what is and is not constituted while playing a character. You are generally required to act as your character would, have a character backstory, and follow protocol on the station. Some HRP servers may create their own lore or settings to further facilitate the type of server they wish to host.
 
-## Само-Антагонизм
-Термин для игрока, который занимается деятельностью, подобной антагонисту, без фактического антагонистического статуса. Это включает в себя широкий спектр поведения, но обычно используется для описания раздражающего поведения или действий, которые значительно вредят другим игрокам без цели. Самостоятельное антагонистическое поведение является наказываемым нарушением. Иногда используется в IC. НЕ ДЕЛАЙТЕ ЭТОГО.
+## Self-Antag
+A term for a player who engages in antagonist-like activity without actually being an antagonist. This encompasses a wide variety of behavior, but is typically used to describe annoying behavior or actions which are greatly detrimental to other players for no purpose. Self-antagonism is a bannable offense. Sometimes used in IC. DO NOT DO THIS.
 
-## Апстрим/Upstream
-Базовая версия игры. Любые изменения в Upstream "потекут" вниз ко всем другим ответвлениям игры. Все официальные серверы Wizard's Den работают на базе Upstream.
+## Upstream
+The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream.
 
-## Validhunter/ВалидХант(ер)
-Игрок, который охотится за "валидными" целями, то есть людьми, которых можно убить, даже если этот человек не является службой безопасности.
+## Validhunter
+A player who hunts down "valids", as in people that are valid to kill, even though this person isn't security.
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml b/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
index f117c81c48..780747761d 100644
--- a/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
@@ -1,54 +1,54 @@
 <Document>
-# Капитаны и клоуны
-Это руководство по редактированию внешности вашего персонажа. Сначала обязательно прочитайте "Создание персонажа".
-При создании персонажа вы можете быть напуганы огромным количеством возможностей.
+# The Captains and the Clowns
+This is a guide for editing your character's appearance. Make sure you read Character Creation first.
+Upon creating your character, you may be intimidated by your vast range of options.
   
-Вполне нормально сделать своего первого персонажа [color=#a4885c]случайным[/color] и начать с ним играть, так поступают даже опытные игроки.
-Создание первого персонажа также не обязательно должно быть точным. Вы можете [color=#a4885c]сымпровизировать[/color] и посмотреть, что получится.
+It's okay to make your first character [color=#a4885c]randomized[/color] and roll with it, even experienced players do it.
+Making your first character doesn't have to be precise, either. You can [color=#a4885c]wing it[/color] and see what happens.
   
-Если вы предпочитаете [color=#a4885c]методичный[/color] подход, то персонажа легко создать пошагово.
+If you'd like to be [color=#a4885c]methodical[/color], though, creating a character is easy to do one step at a time.
 
-## Выбор расы
-У большинства рас есть небольшие различия, о которых вы можете прочитать в разделе [color=#a4885c]Расы[/color].
-Однако вы можете обнаружить, что вам проще создать своего первого персонажа в виде человека, ниана, дворфа или унатха.
+## Choosing a Species
+Most species have minor differences, which you can read about under the [color=#a4885c]Species[/color] entry.
+However, you may find that it's easier to make your first character as a human, moth, dwarf or reptilian.
 
-Однако это не должно отбить у вас желание творчески подойти к созданию своего персонажа.
+This shouldn't discourage you from getting creative with your character, though.
 
-В этом руководстве предполагается, что вы создаете человека, но процесс похож для всех видов.
+This guide will assume you are creating a human, but the process is similar across all species.
 
-## Незначительные характеристики
-Они включают:
-- Возраст (18-29 для молодых, 30-59 для средних, 60+ для старых)
-- Пол (ваш спрайт, который можно увидеть, переключив "Показать одежду")
-- Местоимения (то, как игра будет обращаться к вам)
-- Цвет кожи (может быть ползунком или RGB в зависимости от вида)
-- Цвет глаз (RGB)
-- Цвет волос (RGB)
+## Minor Characteristics
+These include:
+- Age (18-29 for young, 30-59 for middle-aged, 60+ for old)
+- Sex (your sprite, as seen by toggling "Show clothing")
+- Pronouns (what the game will refer to you as)
+- Skin color (may be a slider or RGB depending on species)
+- Eye color (RGB)
+- Hair color (RGB)
 
-Это незначительные изменения, которые мало влияют на игровой процесс. Это то, что игроки будут читать, когда будут [color=#a4885c]осматривать вас[/color]. ("человек молодого возраста")
+These are minor changes and have little effect on gameplay. This is what players will read when they [color=#a4885c]examine you[/color]. ("young man")
 
-## Волосы и лицевая растительность
-И снова вас может испугать огромное количество вариантов. Это нормально.
+## Hair and Facial Hair
+Again, you may be intimidated by the vast range of options. That's okay.
 
-[color=#a4885c]Не торопитесь с этим.[/color] Вы можете просмотреть или щелкнуть по каждому из вариантов и найти тот, который вам нравится.
-Иногда проще установить желаемый цвет волос, прежде чем просматривать варианты.
+[color=#a4885c]Take your time with it.[/color] You can skim or click through each of the options and find which one you like.
+Sometimes it's easier to set your desired hair color before looking at the options.
 
-Если вы не можете определиться с выбором, некоторые популярные варианты стрижек включают в себя "Небрежная", "Современная", "Деловая", "ЦРУ" или просто "Лысый".
-Как вариант, [color=#a4885c]сгенерируйте[/color] отдельного персонажа и посмотрите, с какими стрижками он ходит. Удивите себя.
+If you really can't decide, some popular haircut options include Floorlength Bedhead, Modern, Business, CIA or simply bald.
+Alternatively, [color=#a4885c]randomize[/color] a separate character and see what kind of haircuts they're rocking with. Suprise yourself.
 
-Однако не чувствуйте себя обязаннымы использовать какую-либо из них.
+Don't feel obligated to use any of these, though.
   
-## Черты внешности
-Черты внешности варьируются от [color=#a4885c]шрамов и мордочек[/color] до [color=#a4885c]татуировок и хвостов[/color].
-Думайте о них как об [color=#a4885c]аксессуарах[/color], которые являются частью вашего тела и придают вашему персонажу дополнительную изюминку и уникальность. Они не могут быть изменены в течение раунда.
+## Markings
+Markings range from [color=#a4885c]scars and snouts[/color] to [color=#a4885c]tattoos and tails[/color].
+Think of them like [color=#a4885c]accessories[/color] that are a part of your body, for giving your character some extra flair and uniqueness. They cannot be changed during the round.
 
-Некоторые виды имеют больше возможностей для черт, чем другие. Люди более ограничены в плане внешности, чем нианы или унатхи.
+Some species have more marking options than others. Humans are more limited in terms of markings than moths or reptilians.
 
-Вы можете иметь определённое количество черт в каждой '[color=#a4885c]категории[/color]', как видно вверху. Например, у унатхов может быть одна метка на груди, но две метки на макушке головы.
-Они носят [color=#a4885c]косметический[/color] характер и не влияют на игровой процесс.
+You can have a set number of markings in each '[color=#a4885c]category[/color]', as seen at the top. For example, reptilians can have one chest marking but two markings on the top of their heads.
+These are [color=#a4885c]cosmetic[/color] and have no effect on gameplay.
 
-## Как выделиться
-Запоминающимися персонажей обычно делает их индивидуальность, поступки и [color=#a4885c]робастность[/color], но это не значит, что вы должны быть каким-то зазнайкой.
+## How to stand out
+Memorable characters are usually remembered for their personality, their deeds and their [color=#a4885c]robustness[/color], but that doesn't mean you have to be some sort of hotshot.
 
-Не стремитесь иметь большого, яркого и запоминающегося персонажа. Создайте свою собственную историю, которая запомнится вам надолго.
+Don't sweat having a big, flashy and memorable character. Make your own story that you'll be remembered for.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/Robotics.xml b/Resources/ServerInfo/Guidebook/Science/Robotics.xml
index 1686cc1e57..599befc252 100644
--- a/Resources/ServerInfo/Guidebook/Science/Robotics.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Robotics.xml
@@ -1,64 +1,64 @@
 <Document>
-  # Робототехника
-  Сотрудники научного отдела имеют возможность создавать роботов различных типов под нужды станции. Для начала необходимо изучить технологию под названием [color=#a4885c]Робототехника[/color].
+  # Robotics
+  The science team has the ability to create several unique types of robots to suit the station's needs. In order to begin, you'll want to research the [color=#a4885c]Robotics[/color] technology.
 
-  ## Фабрикатор экзокостюмов
+  ## Exosuit Fabricator
 <Box>
-<GuideEntityEmbed Entity="ExosuitFabricator" Caption="фабрикатор экзокостюмов"/>
+<GuideEntityEmbed Entity="ExosuitFabricator" Caption="Exosuit Fabricator"/>
 </Box>
-  [color=#a4885c]Фабрикатор экзокостюмов[/color] это устройство, на котором вы можете распечатать большинство частей для своих творений, такие как:
-  - [textlink="Кибернетические" link="Cyborgs"] конечности
-  - Части и снаряжение мехов
-  - Датчики движения
+  The [color=#a4885c]Exosuit Fabricator[/color] is where you'll be printing out most of the parts for your creations, such as:
+  - [textlink="Cyborg" link="Cyborgs"] limbs
+  - Mech parts and equipment
+  - Proximity sensors
 
-  Использовать фабрикатор экзокостюмов так же просто, как и любые другие латы-фабрикаторы; кликните на него, чтобы увидеть интерфейс, выберите и кликните по иконке детали, которую вы хотите напечатать.
-  - Отсутствуют рецепты? Нажмите кнопку [color=#a4885c]Синхронизировать[/color], чтобы проверить наличие новых чертежей. Если и после этого ничего не появилось, скорее всего, вы ещё не исследовали необходимую технологию!
-  - Если рецепт окрашен серым цветом, скорее всего, это связано с нехваткой материалов. Чтобы материалы пополнить (будь то [color=#99A3A4]сталь[/color], [color=#ECF0F1]пластик[/color] или [color=#AED6F1]стекло[/color]), просто кликните по фабрикатору, удерживая стопку нужного материала.
+  Operating the exosuit fabricator is the same as every other lathe on the station; simply click the fabricator to open the UI, then click the icon for whatever part you want to print.
+  - Are there no recipes? click the [color=#a4885c]sync[/color] button on the UI to check for any new blueprints. If, even then, nothing shows up, you've likely not researched the relevant technology yet!
+  - If a recipe appears grayed-out, it's likely due to a lack of materials. To insert new materials (either [color=#99A3A4]steel[/color], [color=#ECF0F1]plastic[/color], or [color=#AED6F1]glass[/color]), simply click the fabricator while holding said material.
 
-  Обычно на всех станциях присутствует полный набор робототехнического оборудования по умолчанию, но при наличии технологии [color=#a4885c]Робототехника[/color] вы можете напечатать машинную плату, с которой вы сможете собрать новый фабрикатор.
+  Every station starts with a full suite of robotics equipment by default, but you can make another fabricator if [color=#a4885c]Robotics[/color] technology is available, which will allow you to make the respective circuit board.
 
-  ## Боты
+  ## Bots
 <Box>
-<GuideEntityEmbed Entity="MobCleanBot" Caption="Чистобот"/>
-<GuideEntityEmbed Entity="MobMedibot" Caption="Медибот"/>
+<GuideEntityEmbed Entity="MobCleanBot" Caption="Cleanbot"/>
+<GuideEntityEmbed Entity="MobMedibot" Caption="Medibot"/>
 </Box>
 <Box>
-<GuideEntityEmbed Entity="MobHonkBot" Caption="Хонкбот"/>
-<GuideEntityEmbed Entity="MobMimeBot" Caption="Мимбот"/>
+<GuideEntityEmbed Entity="MobHonkBot" Caption="Honkbot"/>
+<GuideEntityEmbed Entity="MobMimeBot" Caption="Mimebot"/>
 </Box>
-  [color=#a4885c]Боты[/color] это простые маленькие автоматы, способные выполнять простые задачи, например, уборку. Они не требуют энергетических батарей, но довольно хрупки. Для их создания потребуются детали, которые можно изготовить в фабрикаторе экзокостюмов.
+  [color=#a4885c]Bots[/color] are small, simple automata which can perform simple tasks, such as cleaning. They don't use power cells, but are quite fragile. Making these will require parts which can be made at an exosuit fabricator.
 
-  Чтобы создать бота, откройте [color=#a4885c]Меню строительства[/color] и перейдите в категорию "Утилиты" (или просто вбейте "bot" в поиске), и перед вами откроется список рецептов. Далее, убедитесь что детали, указанные в рецепте, имеются в наличии в руках или поблизости, и нажмите [color=#a4885c]Build[/color]. Через несколько секунд созданный вами кремниевый слуга появится у ваших ног!
+  To make a bot, open the [color=#a4885c]Construction Menu[/color] and go to the "Utilities" category (or just search "bot") and you'll have the whole list of recipes. In order to assemble the bot, you must have the parts outlined by the recipe close to you and click [color=#a4885c]Build[/color], after a few seconds your newly created silicon servant should appear at your feet!
 
-  ## Мехи
+  ## Mechs
 <Box>
-<GuideEntityEmbed Entity="MechRipley" Caption="Рипли АВП"/>
-<GuideEntityEmbed Entity="MechHonker" Caption="Х.О.Н.К."/>
-<GuideEntityEmbed Entity="MechHamtr" Caption="ХАМЯК"/>
-<GuideEntityEmbed Entity="MechVim" Caption="Вим"/>
+<GuideEntityEmbed Entity="MechRipley" Caption="Ripley APLU"/>
+<GuideEntityEmbed Entity="MechHonker" Caption="H.O.N.K."/>
+<GuideEntityEmbed Entity="MechHamtr" Caption="HAMTR"/>
+<GuideEntityEmbed Entity="MechVim" Caption="Vim"/>
 </Box>
-  [color=#a4885c]Мехи[/color] — это металлические громадины, предназначенные для выполнения различных задач в зависимости от модели. Они управляются игроками и для нуждаются и энергетических ячейках для работы.
+  [color=#a4885c]Mechs[/color] are giant behemoths of metal designed to carry out a variety of functions respective to their model. They are piloted by players and require power cells to function.
 
-  Для создания каждого меха необходим отдельный уникальный набор конечностей и деталей. Их можно изготовить в фабрикаторе экзокостюмов, как и любые другие детали, за исключением требуемых [color=#a4885c]машинных плат[/color], которые изготавливаются в [color=#a4885c]Принтере схем[/color], обычно имеющемся в [textlink="научном" link="Science"] отделе.
+  Each mech requires its own unique set of limbs and parts to create. These can be fabricated at the Exosuit Fabricator, the same as any other part, save for the required [color=#a4885c]circuit boards[/color], which are made at a [color=#a4885c]Circuit Board Imprinter[/color], which can normally be found in the [textlink="science" link="Science"] department.
 <Box>
-<GuideEntityEmbed Entity="RipleyCentralElectronics" Caption="центральный модуль управления Рипли"/>
+<GuideEntityEmbed Entity="RipleyCentralElectronics" Caption="Ripley central controls module"/>
 </Box>
 <Box>
-<GuideEntityEmbed Entity="RipleyPeripheralsElectronics" Caption="модуль управления периферией Рипли"/>
+<GuideEntityEmbed Entity="RipleyPeripheralsElectronics" Caption="Ripley peripherals control module"/>
 </Box>
 
-  Так, например, для создания автономного погрузчика Рипли необходимы обе приведенные выше машинные платы, для других мехов они бесполезны.
+  For example, both of the circuit boards above are necessary to create a Ripley mech, and cannot be used to make any other mech.
 
-  Создание меха начинается с печати в фабрикаторе его каркаса, и установки рук и ног. Вы можете [color=#a4885c]осмотреть[/color] его, чтобы понять, что делать дальше.
-  - В полностью собранный каркас необходимо в определённой последовательности провести (поместить) кабеля, воспользоваться инструментами и установить уникальные машинные платы. Большинство мехов требуют двух или более уникальных машинных плат. Например, мех [color=#a4885c]Рипли[/color] требует плат [color=#a4885c]Центральный модуль управления Рипли[/color] и [color=#a4885c]модуль управления периферией Рипли[/color].
-  - Для создания мехов требуется большое количество материалов - не стесняйтесь обращаться за недостающими материалами к своим коллегам-учёным и сотрудникам отдела снабжения!
-  - Для работы экзокостюма Вим требуется пара ног борга и шлем EVA, обычный или синдикатовский, затем голосовой триггер и батарея.
+  To start making a mech, print their harness in the fabricator and insert the limbs, you can [color=#a4885c]examine[/color] it to see how to proceed with construction once all limbs are in place.
+  - Every mech requires some combination of wires, tool usage, and their own unique circuit boards to construct after the chassis has been assembled. Most mechs have two or more unique circuit boards. For example, the [color=#a4885c]Ripley[/color] mech requires a [color=#a4885c]ripley controls module[/color] board and a [color=#a4885c]ripley peripherals module[/color] board.
+  - Mechs require large amounts of material to create - be sure to ask your fellow scientists and cargo personnel for any materials you're missing!
+  - The Vim exosuit requires a pair of borg legs and an EVA helmet, regular or syndicate, then a voice trigger and a power cell.
 
-  ## Снаряжение
-    Меха без своего специального снаряжения - дорогостоящий кусок металла. Снаряжение может быть создано на фабрикаторе, как и любые другие детали.
+  ## Equipment
+    A mech is nothing more than an expensive hunk of metal without their exclusive tools. Equipment can be created at the fabricator, the same as any other part.
 <Box>
-<GuideEntityEmbed Entity="MechEquipmentGrabber" Caption="Гидравлическая клешня, как пример"/>
+<GuideEntityEmbed Entity="MechEquipmentGrabber" Caption="The Hydraulic Clamp, as an example."/>
 </Box>
-  - Чтобы установить снаряжение, просто кликните рукой с снаряжением по меху.
-  - Чтобы воспользоваться снаряжением, используйте кнопку "Переключить снаряжение", пока нужный его элемент не будет выбран.
+  - To install equipment, just click on the mech with the equipment in your hand.
+  - To use equipment, perform the "Cycle Equipment" action until the tool you desire is equipped.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
index 51517668d4..c42e28fc39 100644
--- a/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
+++ b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
@@ -1,24 +1,24 @@
 <Document>
-## Сканер аномалий
+## Anomaly Scanner
 
-Сканер аномалий используется для сбора различной информации об аномалиях. Найти такой можно в шкафчиках научного отдела.
+The Anomaly Scanner is used to gather various information on anomalies. They can be found inside the lockers in the science department.
 
 <Box>
 <GuideEntityEmbed Entity="AnomalyScanner"/>
 </Box>
 
-Сканирование аномалии покажет её опасность, общую стабильность, приблизительное количество получаемых очков исследований, реакцию на типы частиц, и время до следующего импульса. Типы реакций могут быть использованы в сочетании с М.А.К.А.К. для манипулирования аномалиями.
+Scanning an anomaly shows the severity, general stability, approximate point output, reactions with particle types, and time until the next pulse. The reaction types, specifically, can be used in conjunction with the A.P.E. to manipulate anomalies.
 
-## Сосуд аномалии
+## Anomaly Vessel
 
-Сосуд аномалии — это устройство, генерирующее очки исследований при помощи аномалий. Используйте сканер аномалий на пустом сосуде, и последняя просканированная аномалия будет синхронизирована с сосудом.
+The anomaly vessel is a machine that generates points from anomalies. Use the anomaly scanner on an empty vessel, and the anomaly that was last scanned will be synced with the vessel.
 
 <Box>
 <GuideEntityEmbed Entity="MachineAnomalyVessel"/>
 </Box>
 
-Количество генерируемых сосудом очков в секунду зависит от опасности, стабильности и здоровья аномалии. Чем выше каждое из этих значений, тем больше очков будет сгенерировано.
+The amount of points a vessel generates per second is based on the severity, stability, and health of an anomaly. The higher each of these values, the higher the point output will be.
 
-Будьте осторожны: если аномалия станет [color=#a4885c]сверхкритической[/color], то сосуд, которому она была присвоена, взорвётся. Это может повредить станцию и оборудование поблизости.
+Be careful: if an anomaly goes [color=#a4885c]supercritical[/color], the vessel it is linked to will explode. This may damage the station and nearby equipment.
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml
index 4ccead6ec1..99bcd714cf 100644
--- a/Resources/ServerInfo/Guidebook/Science/Science.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Science.xml
@@ -1,47 +1,54 @@
 <Document>
-# Научный отдел
+# Science
+[color=#c96dbf]Science[/color], often called Research and Development, is a job consisting of generating research points to unlock new technologies and using said technologies to produce new items at lathes to help out the station.
 
-Научный отдел, часто именуемый "РнД", занимается заработком очков исследований, используемых для изучения новых технологий, которые в свою очередь позволяют создавать полезные для станции предметы на различных станках, принтерах, и фабрикаторах.
+## Personnel
+[color=#c96dbf]Science[/color]'s staff is made up of Research Assistants and Scientists. [color=#c96dbf]Science[/color] is run by the Research Director.
 
-## Технологии
-<Box>
-<GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/>
-<GuideEntityEmbed Entity="ResearchAndDevelopmentServer"/>
-</Box>
-Самыми важными устройствами вашего отдела являются сервер РнД, на котором хранятся все изученные технологии, и исследовательская консоль, который позволяет вам эти технологии открывать.
+  <Box>
+   <GuideEntityEmbed Entity="ToyFigurineScientist" Caption="Scientist"/>
+   <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="RD"/>
+  </Box>
 
-Каждая технология стоит определённое число [color=#a4885c]Очков исследований[/color], и их изучение открывает новые рецепты для печати на производственных станках. Некоторые технологии нельзя разблокировать, не изучив технологии им предшествующие.
+## Technologies
+  <Box>
+    <GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/>
+    <GuideEntityEmbed Entity="ResearchAndDevelopmentServer"/>
+  </Box>
+The most important thing inside your department is the R&D server, which stores unlocked technologies, and the R&D computer, which allows you to unlock [color=#a4885c]technologies[/color].
 
-Информацию о различных технологиях можно посмотреть [textlink="на странице справочника технологий" link="Technologies"].
+Each technology costs [color=#a4885c]Research Points[/color] and unlocks recipes at lathes. Some technologies will also have prerequisites you have to unlock before you can research them.
 
-## Дисциплины
-Технологии распределены по 5 различным дисциплинам:
-<Box>
-  <GuideEntityEmbed Entity="Wrench" Caption="Промышленность"/>
-  <GuideEntityEmbed Entity="WeaponTetherGun" Caption="Экспериментальное"/>
-  <GuideEntityEmbed Entity="ComputerTelevision" Caption="Обслуживание персонала"/>
-  <GuideEntityEmbed Entity="WeaponXrayCannon" Caption="Арсенал"/>
-</Box>
+[textlink="Click here to see a list of technologies." link="Technologies"].
 
-<GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/> Воспользуйтесь ближайшей консолью РнД, чтобы узнать, какой вид исследований закреплен за каждым древом дисциплины.
+## Disciplines
+Technologies are spread over 4 different Disciplines:
+  <Box>
+    <GuideEntityEmbed Entity="Wrench" Caption="Industrial"/>
+    <GuideEntityEmbed Entity="WeaponTetherGun" Caption="Experimental"/>
+    <GuideEntityEmbed Entity="ComputerTelevision" Caption="Civil Services"/>
+    <GuideEntityEmbed Entity="WeaponXrayCannon" Caption="Arsenal"/>
+  </Box>
 
-## Уровни
-Каждое древо дисциплины имеет до 3 уровней технологий. На начальном этапе единственным открытым и доступным для вас уровнем является уровень 1.
+<GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/> Use your nearest R&D console to take note of which kind of research is locked behind each Discipline tree.
 
-Чтобы продвинуться дальше, вам нужно исследовать до [color=brown]75%[/color] текущего уровня, чтобы перейти на следующий. Таким образом, чтобы разблокировать исследования T2, вам нужно исследовать 75% исследований T1.
+## Tiers
+Each Discipline tree has up to 3 tiers of technologies. At the start the only tier that is open and available for you is tier 1.
 
-Теперь [color=green]уровень 3[/color] - вот где становится интересно. Если вы исследуете технологию Т3, вы [color=brown]блокируете[/color] технологии Т3 из других древ дисциплин. То есть, если только... вы не найдете какой-нибудь другой способ обойти это, возможно, вам стоит спросить вашего [color=purple]научного руководителя[/color].
+In order to progress further, you have to research up to [color=brown]75%[/color] of the current tier to move to the next one. So in order to unlock T2 researches you need to research 75% of T1.
 
-## Фабрикаторы и станки
-<Box>
-<GuideEntityEmbed Entity="Protolathe"/>
-<GuideEntityEmbed Entity="CircuitImprinter"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="ExosuitFabricator"/>
-<GuideEntityEmbed Entity="MedicalTechFab"/>
-<GuideEntityEmbed Entity="SecurityTechFab"/>
-</Box>
-На станке вы можете выбрать сервер, чтобы позволить ему печатать любые рецепты, которые вы разблокировали. Для рецептов требуются различные материалы (сталь, стекло, пластик, золото, плазма), которые можно получить в отделе снабжения или от утилизаторов.
+Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless you can find some other way around it... you should probably ask your [color=purple]Research Director[/color].
+
+## Lathes
+  <Box>
+    <GuideEntityEmbed Entity="Protolathe"/>
+    <GuideEntityEmbed Entity="CircuitImprinter"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ExosuitFabricator"/>
+    <GuideEntityEmbed Entity="MedicalTechFab"/>
+    <GuideEntityEmbed Entity="SecurityTechFab"/>
+  </Box>
+At a lathe, you can choose a server to allow it print whatever recipes you have unlocked. Recipes require various materials (steel, glass, plastic, gold, plasma) which can be acquired at Cargo or Salvage.
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Security/Defusal.xml b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
index 583b8a34c7..4d6880d0b8 100644
--- a/Resources/ServerInfo/Guidebook/Security/Defusal.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
@@ -29,7 +29,7 @@
   To arm a bomb, you can either [color=yellow]right click[/color] and click [color=yellow]Begin countdown[/click], or [color=yellow]alt-click[/color] the bomb. It will begin beeping.
 
   ## Time
-  A bomb has a limited time, at a minimum of [protodata="SyndicateBomb" comp="OnUseTimerTrigger" member="ShortestDelayOption"/] seconds and a maximum of [protodata="SyndicateBomb" comp="OnUseTimerTrigger" member="LongestDelayOption"/] seconds. You can view the timer by examining it, unless the Proceed wire is cut. Once the timer hits zero, the bomb will detonate.
+  A bomb has a limited time, at a minimum of [protodata="SyndicateBomb" comp="TimerTrigger" member="ShortestDelayOption"/] seconds and a maximum of [protodata="SyndicateBomb" comp="TimerTrigger" member="LongestDelayOption"/] seconds. You can view the timer by examining it, unless the Proceed wire is cut. Once the timer hits zero, the bomb will detonate.
 
   ## Bolts
   By default, once armed, a bomb will bolt itself to the ground. You must find the BOLT wire and cut it to disable the bolts, after which you can unwrench it and throw it into space.
@@ -69,5 +69,5 @@
   - [color=green]Mend the wire[/color]: Mending the wire will re-enable the bolts.
 
   [color=#a4885c]Dummy Wire[/color]
-  - Dummy wires don't do anything. You can pulse, cut, and mend them freely and they will not affect the bomb at all.
+  - Dummy wires don't do anything. You can pulse, cut, and mend them freely without affecting the bomb at all.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Security/Forensics.xml b/Resources/ServerInfo/Guidebook/Security/Forensics.xml
index 733969b5a6..936bf299c0 100644
--- a/Resources/ServerInfo/Guidebook/Security/Forensics.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Forensics.xml
@@ -3,7 +3,7 @@
 
   There are a lot of tools to help you gather and examine the evidence at your disposal
 
-  # Log probe
+  # LogProbe
 
   This little add-on to your PDA is incredibly useful, just install the cartridge and your PDA will acquire the ability to scan anything with access (like airlocks) and see who has used them recently.
 
@@ -26,11 +26,11 @@
   </Box>
   So be careful before fighting with someone.
 
-  Same scanner can also get fingerprint information about who touched pretty much any object. If the possible perpetrator was using gloves, then your scanner will print out which fibers were left on the crimescene.
+   That same forensic scanner can also get fingerprint information about who touched pretty much any object. If the possible perpetrator was using gloves, then your scanner will print out which fibers were left on the crime scene.
 
   ## I got DNA. How do I recognize whose it is?
 
-  You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches. Same applies to finding whose fingerprint is is.
+  You can print the forensic information of the object you scanned so you never miss it. Now with the paper containing DNA you can simply find a [color=#a4885c]Station Records Computer[/color] and look for a person whose DNA matches. Same applies to finding whose fingerprint it is.
 
   ## Taking Fingerprints
   It is also possible to take someone's fingerprints while on scene if you make them take off their gloves and apply a forensic pad to their fingers. No need to run back to [color=#a4885c]Station Records Computer[/color] to check if the butler did it!
@@ -38,7 +38,7 @@
   <GuideEntityEmbed Entity="ForensicPad"/>
 
   ## Fibers
-  Whenenever people wearing gloves touch anything on the station, they are bound to leave behind some fibers. This complicates things, but nothing is unsolvable for a real detective.
+  Whenever people wearing gloves touch anything on the station, they are bound to leave behind some fibers. This complicates things, but nothing is unsolvable for a real detective.
 
   There are up to [color=red]26[/color] different types of fibers possible. Can that stop you from solving the case?
 
diff --git a/Resources/ServerInfo/Guidebook/Security/Security.xml b/Resources/ServerInfo/Guidebook/Security/Security.xml
index 98365c6277..f9a63ee6ca 100644
--- a/Resources/ServerInfo/Guidebook/Security/Security.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Security.xml
@@ -33,7 +33,7 @@ It is worth noting that flashes can be both used in a large area ([color=yellow]
   </Box>
 
 ## Lethals
-Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substancial fire against any who would stand against the station.
+Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substantial fire against any who would stand against the station.
   <Box>
     <GuideEntityEmbed Entity="WeaponLaserCarbine"/>
     <GuideEntityEmbed Entity="WeaponShotgunTrenchgun4034"/>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
index 3daabbb623..3b209380b7 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/MRPRules/RuleM1DoNotPowergame.xml
@@ -18,7 +18,6 @@
   - Roundstart Captain granting all heads AA
   - Roundstart HoP takes Ian to ATS because “He’s a high profile target”
   - Creating duplicates of high-value or unique items to hand off to others
-  - Using low-effort roleplay to skirt the metashield
   - Bolting doors to areas to increase their security before a threat is confirmed that makes that security inefficient
   - Setting the alert level to Blue or Red when the situation does not have a need for the severity implied (this includes maintaining these levels far past when said threats have been confirmed as no longer in play)
   - General situations where a character is preemptively preparing for situations that have yet to happen in ways that logically do not make sense
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
index 5ed53c3f2c..f980fbb504 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
@@ -1,92 +1,56 @@
 <Document>
-  # Roleplay Rule 4 - Do not metagame, obey the Metashield
-  Something that is "shielded" cannot be known by your character during a round until the "revealing condition" happens. This also means that your character cannot do things based on "shielded" information. Knowing or acting on something that is shielded before the revealing condition is met is referred to as metagaming.
+  # Roleplay Rule 4 -# Do not use information your character would not have knowledge of.
+Metagaming in Space station 14 is the term used to typically describe actions based on knowledge during a round that is inaccessible to your character. You cannot use information gained while dead or a ghost if you are alive. Use of information gained while dead is considered metagaming. This does not apply to knowledge of what antagonists are capable of doing. We expect players to understand what options are avaliable to antagonists.
 
-  Revealing conditions reveal the shielded information for the round, not for a specific instance. This means that once a revealing condition is met in a round, the shield no longer applies in any case for the remainder of the round.
+## Out of character information and metagaming.
+Unless otherwise specified, when playing as a different character (such as taking a ghost role or being changed to another character via admin intervention), you are to act without knowledge of what occurred in the round as any prior characters and as a ghost while playing a character (ghosts are not considered a character for this rule). Mindswap spells and polymorphs are not considered changing characters for this rule. Failure to follow this is metagaming.
 
-  ## Never Revealed IC
-  Some shields are never revealed IC. This means that your character can never act as if they know about that shielded thing.
+The knowledge that a round will end is out of character information. Knowledge that the shift will end however, is not out of character information. The intention of this rule is to prevent preparation for End of round griefing (EORG). Utilising the knowledge that the round will end is metagaming.
 
-  The following are shielded:
-  - Current game mode and possible antags during the current game mode.
-  - Events from previous rounds.
-  - Events you experienced as a different character.
-  - All information related to the player of a character rather than the character itself. (See "Metafriending and Metagrudging" below.)
-  - All information gained while dead or a ghost.
-  - The fact that a round will end.
+### Knowledge from past lives
+Except when otherwise specified, you cannot use any information gained in a past life in the same round.
+For example, if you were killed by an antagonist, you cannot warn the crew of said antagonist when you respawn as a mothroach.
+This does _not_ apply when being brought back from death as the same character, having your brain transferred to another body, or being cloned.
+For example, if you were killed by an antagonist, your body was found and your brain was placed in a borg, you can recall what happened prior to your original death and could warn the of the antagonist.
 
-  This does not prevent knowing that a shift will end, but does prohibit things like preparing to kill people at central command when roleplay rules stop being enforced on LRP.
+### Knowledge that the round will end (and your character will, ergo, cease to exist)
+Your character will, or should, know that their current shift on Space Station 14 will end and that they will return to Centcomm. They do not know that this represents the effective end of their existence from the perspective of their player.
+You cannot preprepare for end-of-round griefing (EORG) or perform other actions that only make sense in the context that, your characters life ultimately doesn't matter.
 
-  ## Nuclear Operatives
+### Knowledge gained via LOOC
+You cannot use any knowledge gained via LOOC chat that is not in the context of assisting a player with controls, game mechanics, or being made to feel welcome. No in character information should be shared via LOOC, and no actions should be taken or altered because of LOOC or OOC chats.
 
-  The existence of Nuclear Operatives beyond a myth that no one would act on is shielded.
+### MRP Amendment
+Being in the critically injured state or otherwise unconscious (includes sleeping) prevents your character from remembering anything that happened to or around them while unconscious. If brought out of the critical state to the alive state, you may remember what caused you to enter critical state. Entering the dead state causes your character to forget all events related to their death (if you can tie it to how you died, do not remember it). If revived, placed in a MMI, or in the case of Diona, splitting, the character is aware of the fact that they have died but not how.
 
-  The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station is not shielded.
+## Do Not Metafriend or Metagrudge
+Giving a person or character preferential treatment based on the events of a previous round is considered metafriending. Treating a person or character negatively based on the events of a previous round is considered metagrudging.
 
-  The revealing condition for this shield is any of the following:
-  - discovering a blood red hardsuit
-  - discovering a nuclear operative's shuttle
-  - an operative name
-  - a War Ops announcement
-  - being a nuclear operative
+#### Metafriending Examples
+These are all examples of things that are prohibited.
+- Giving a character additional access or a job because you are friends with the player who is playing that character.
+- Trusting a character because you are friends with the player who is playing that character.
+- Not fighting a character because you are friends with the player who is playing that character.
+- Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
 
-  ## Chameleon Items
+#### Metagrudging Examples
+These are all examples of things that are prohibited.
 
-  Chameleon items are shielded.
+- Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
+- Not trusting a character because you are mad at or don't like the player who is playing that character.
+- Starting a fight with a character because of something that they did in a previous round.
+- Starting a fight with a character because of a major event that happened in a previous round.
+- Starting a fight with a character because they killed you while you were playing a different character.
+- Targeting or harassing a character based on anything which that character did in a previous round.
+- Targeting or harassing a character based on anything which the character's player did while not playing the character.
 
-  Being suspicious of an item being fake or stolen is not shielded, but testing items or calling them chameleon is covered by this shield.
 
-  The revealing condition for this shield is any of the following:
-  - seeing someone else cause any chameleon item to change
-  - finding holographic nanomachine fibers
-  - experiencing a situation where absolutely no other explanation is possible
-  - discovering an unlocked uplink
+## Explicitly Not Metagaming
 
-  ## Stealth Items
-
-  The fact that an item can be something other than what its visual appearance and examine description indicate is shielded.
-
-  This shield protects stealth items, including protecting them from being tested.
-
-  The revealing condition for this shield is any of the following:
-  - seeing the item behave differently than the expected behavior for the item
-  - seeing the item used for its hidden purpose
-  - experiencing a situation where absolutely no other explanation is possible
-  - discovering an unlocked uplink
-
-  ## MRP Amendment 1
-  A shield prevents your character from remembering anything that happened while unconscious. This shield is never revealed IC.
-
-  ## MRP Amendment 2
-  There is a "New Life Rule" shield. It prevents you from remembering anything that lead to your death, even if you are put into an MMI. If you are cloned, it also prevents you from remembering everything from that round. This shield is never revealed IC.
-
-  ## Metafriending and Metagrudging
-  This section provides additional information on a concept that is prohibited by multiple metashield items that are never revealed IC. Giving a person or character preferential treatment based on something that your character should not know is considered metafriending. Treating a person or character negatively based on something that your character should not know is considered metagrudging.
-
-  ## Metafriending Examples
-  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
-  - Giving a character additional access or a job because you are friends with the player who is playing that character.
-  - Trusting a character because you are friends with the player who is playing that character.
-  - Not fighting a character because you are friends with the player who is playing that character.
-  - Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
-
-  ## Metagrudging Examples
-  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
-  - Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
-  - Not trusting a character because you are mad at or don't like the player who is playing that character.
-  - Starting a fight with a character because of something that they did last round.
-  - Starting a fight with a character because they killed you while you were playing a different character.
-  - Targeting or harassing a character based on anything which that character did outside the current round.
-  - Targeting or harassing a character based on anything which the character's player did while not playing the character.
-
-  ## Explicitly Not Shielded
-  The following is a list of things that are explicitly not shielded. If something is not on this list, it doesn't mean that it is shielded, but if something is on it then it definitely is not shielded.
-  - The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station.
-  - Items that are of high value or are desired by the Syndicate, and therefore are likely targets of theft.
-  - The idea that any Syndicate agent or other bad actor has goals or objectives that they are attempting to accomplish.
-  - The number of goals or objectives that a Syndicate agent or other bad actor has.
-  - The fact that the Syndicate are enemies of Nanotrasen, and that they regularly attempt to send covert agents to spy on, sabotage, or attack Nanotrasen.
-  - A character's typical appearance. Though you should keep in mind that multiple characters can share the same name.
-  - The fact that the Syndicate have covert items capable of getting items to them, and that these items are known as uplinks.
-  - The fact that the Syndicate can provide subdermal implants to their agents with various capabilities.
+- Protecting high value crew items (will be labeled as such), such as the nuke disk, with the understanding that a bad actor may attempt to steal or use them.
+- Remembering the general events of previous rounds (shifts) up to the extent that you do not metagrudge or metafriend any other player or character, remembering that you survived a violent shooting in the medbay is acceptable for example, stating who the shooter was is not. Avoid making remarks about specific characters, such as calling out someone who was an antagonist in a prior round.
+- The fact that antagonists exist and may be present on or off the station in any form.
+- Knowledge of a characters typical appearance.
+- Using knowledge of a characters typical appearance including your own for a disguise, such as a nuclear operative disguising as themselves as crew.
+- Knowing that enemies may have concealed items that may have function that are not immediately apparent.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
index c6d29bfba9..2ea20b5a0c 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
@@ -56,7 +56,7 @@
     </ColorBox>
     <ColorBox Color="#593a4e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Refusal of Mental Shielding (E)
+        Breach of Permanent Confinement (E)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -251,8 +251,9 @@
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
       </Box>
     </ColorBox>
-    <ColorBox>
+    <ColorBox Color="#3b4354">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Refusal of Mental Shielding (R)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -752,7 +753,7 @@
     </ColorBox>
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        While rare, this charge can be bumped to an execution if the suspect has repeatedly attempted to break out of the permanent brig. Includes people breaking others out.
+        Includes breaking out other people.
       </Box>
     </ColorBox>
     <ColorBox>
@@ -847,17 +848,17 @@
     </ColorBox>
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Refusal of Mental Shielding
+        Breach of Permanent Confinement
       </Box>
     </ColorBox>
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        To refuse to comply with a reasonable Mind Shielding procedure.
+        To break someone sentenced to Permanent Confinement out of a cell or custody with the intention of escaping.
       </Box>
     </ColorBox>
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Applies if the suspect is excessively uncooperative or the implant fails to function due to the mental state of the prisoner already being too far gone. If the implant fails execution is heavily recommended.
+        Includes breaking out other people sentenced to Permanent Confinement.
       </Box>
     </ColorBox>
     <ColorBox>
@@ -925,5 +926,25 @@
         5-06
       </Box>
     </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Refusal of Mental Shielding
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To refuse to comply with a reasonable Mind Shielding procedure.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Applies if the suspect is excessively uncooperative or the implant fails to function due to the mental state of the prisoner already being too far gone. If the implant fails execution is heavily recommended.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        5-07
+      </Box>
+    </ColorBox>
   </Table>
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
index 583043675c..6e96faee59 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
@@ -36,7 +36,7 @@
   - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
-  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="4. Do not metagame, do not metagrudge" link="RuleR4"]
   - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
   - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
   - [textlink="7. Do not stall the round" link="RuleR7"]
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
index 222acaebb5..0954a79859 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
@@ -36,7 +36,7 @@
   - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
-  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="4. Do not metagame, do not metagrudge" link="RuleR4"]
   - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
   - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
   - [textlink="7. Do not stall the round" link="RuleR7"]
diff --git a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
index f6bff2baa9..85a3d171ac 100644
--- a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
@@ -23,6 +23,7 @@
 <GuideEntityEmbed Entity="WetFloorSign"/>
 <GuideEntityEmbed Entity="Holoprojector" Caption="holosign projector"/>
 <GuideEntityEmbed Entity="LightReplacer"/>
+<GuideEntityEmbed Entity="WireBrush"/>
 </Box>
 <Box>
 <GuideEntityEmbed Entity="AdvMopItem" Caption="Advanced mop, ask in R&D"/>
diff --git a/Resources/ServerInfo/Guidebook/SpaceStation14.xml b/Resources/ServerInfo/Guidebook/SpaceStation14.xml
index 8b65339eaf..a59ee1b7c7 100644
--- a/Resources/ServerInfo/Guidebook/SpaceStation14.xml
+++ b/Resources/ServerInfo/Guidebook/SpaceStation14.xml
@@ -1,14 +1,51 @@
-<Document>
-# Космическая Станция 14
+<Document>
+# Station and Shifts
 
-Добро пожаловать в пре-альфа версию Космической Станции 14! Мы надеемся что игра вам понравится, и эта запись послужит вам руководством к тому, как научиться играть. Читать придётся довольно много, но КС14 сама по себе очень большая и глубокая игра, и мы надеемся что эти руководства помогут вам насладиться ею в полном объёме.
+Every round of SS14 is a [bold]self-contained shift[/bold] that takes place on one of many different stations.
 
-## Что это такое
-Космическая Станция 14 — бесплатный (навсегда) ремейк с открытым исходным кодом небезызвестной Космической Станции 13, призванный обеспечить улучшенный опыт как для новичков, так и для старых игроков. Космическая Станция 14 разрабатывается как полностью модифицируемый продукт, который вы можете изменять по своему вкусу с помощью пользовательских серверов, добавляя целые кучи нового контента.
+Rounds typically last from [color=cyan]45 to 90 minutes[/color], but players are free to leave and join at any point during a round.
 
-Если вы здесь для того чтобы просто поиграть — класс! Раздел [color=#a4885c]С чего начать[/color] этой записи вам поможет. Если вы хотите сделать что-то для игры — вы можете найти кнопки, ведущие на наши Discord и Github в лобби.
+## Shuttle Terminal
+If you join in the middle of a shift, you will likely spawn on the [color=lime]shuttle terminal[/color].
+Here you can grab drinks, converse with other players, and wait for the shuttle to take you to the station.
 
-## С чего начать
-Рекомендуется начать с руководства [color=#a4885c]Управление[/color], а затем прочитать [color=#a4885c]Создание персонажа[/color], [color=#a4885c]Ролевой отыгрыш[/color] и [color=#a4885c]Должности[/color]. Не для всех должностей или концептов будут руководства, и если вы опытный игрок — очень просим помочь нам написать или перевести их!
+Screens on the walls will give you an ETA for the shuttle.
+When it arrives, simply walk on to be transported to the station.
+
+Make sure to stay inside the terminal and to not stand in the shuttle landing zone. [color=#EB2D3A][bold]You can be crushed by shuttles flying in[/bold][/color]
+
+## Navigation
+Every station has a wide variety of locations to visit.
+These range from specific departments where work happens to common areas where you can relax and chat with others.
+
+<Box>
+  <GuideEntityEmbed Entity="StationMap"/>
+  <GuideEntityEmbed Entity="SignDirectionalDorms" Caption="Directional Signs"/>
+  <GuideEntityEmbed Entity="SignBridge" Caption="Marker Signs"/>
+</Box>
+
+[color=cyan]Station maps[/color] give you an overview of the entire station with colored markers denoting locations of different things.
+Regular [color=cyan]signs[/color] on walls can point you to different departments.
+
+## Leaving the Station
+At the end of the shift [color=gray](barring a [color=red][bold]nuclear disaster[/bold][/color])[/color], you will leave the station via the [color=lime]evac shuttle[/color].
+When it's called, an announcement will play on the station alerting the crew and signaling its [color=cyan]arrival in 10 minutes.[/color]
+Once it arrives, you'll need to make your way over to it, board it, and then survive the trip to [bold]Central Command[/bold].
+
+The round doesn't officially end until you reach [bold]Central Command[/bold]
+
+<Box>
+  <GuideEntityEmbed Entity="CryogenicSleepUnit"/>
+</Box>
+
+If you need to leave a round early, you can do so through a [color=lime]cryogenic sleep unit[/color].
+Simply going inside and leaving the game will store your belongings and ensure that they are not stolen or misused.
+
+## More Info
+Learning the controls? [textlink="Click here to read about the different controls" link="Controls"]
+
+Don't know how to perform a job? [textlink="Click here to jump to a list of departments" link="Jobs"]
+
+Keep dying? [textlink="Click here to see a survival guide" link="Survival"]
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Survival.xml b/Resources/ServerInfo/Guidebook/Survival.xml
index 141528299c..aa3151fba2 100644
--- a/Resources/ServerInfo/Guidebook/Survival.xml
+++ b/Resources/ServerInfo/Guidebook/Survival.xml
@@ -1,29 +1,38 @@
 <Document>
-# Выживание
-Как правило, следует избегать ситуаций, которые могут причинить вам вред, потому что медицина может вылечить вас только с помощью ограниченного количества химикатов и медицинских предметов, и особенно когда на вашем пороге стоят ядерные оперативники.
-## Определение вашего положения
-Ваш КПК содержит название станции и список членов экипажа, работающих в данный момент на вашей станции, напоминание вашего имени в случае необходимости, а также назначенное задание на смену, что позволит вам быстро оценить ситуацию.
-## Неотложная помощь
-В случае серьезной чрезвычайной ситуации вы можете сделать несколько вещей, которые помогут вам выжить в долгосрочной перспективе:
-- Если вы находитесь в критическом состоянии, воспользуйтесь экстренным медипеном из вашего аварийного запаса - он поможет вам не потерять способность что-либо делать. Экстренные медипены также можно использовать для оживления людей, находящихся в критическом состоянии на полу, и для продления времени жизни при борьбе с ядами и т.д.
+# Survival
+It is generally wise to avoid situations that will cause you harm, because medical can only heal you so much with limited chemicals and medical items and especially when there's nuclear operatives on your doorstep.
+
+## Identifying your situation
+Your PDA contains both a vessel name and list of crew currently active in your vessel, a reminder for your name if needed, and your assigned job for the shift, allowing you to quickly assess the situation.
+
+## Emergency Treatment
+In the event of a serious emergency, there are a few things you can do to help ensure your long-term survival, including:
+- If entering critical condition, use the emergency medipen from your emergency box, it'll make sure you don't end up unable to do anything. Emergency medipens can also be used to revive people currently in crit on the floor, and to prolong the amount of time you have to deal with poisons/etc.
+
 <Box>
-<GuideEntityEmbed Entity="EmergencyMedipen"/>
+  <GuideEntityEmbed Entity="EmergencyMedipen"/>
 </Box>
-- В вашем аварийном запасе находятся дыхательная маска и кислородный баллон, которые помогут вам дольше продержаться в случае утечки воздуха. Если вы слаймолюд, имейте в виду, что азот заменяет вам кислород и что в вашем аварийном запасе будет красный баллон с азотом вместо стандартного сине-желтого баллона с кислородом.
+
+- Your emergency box contains a breath mask and oxygen tank, which can help you survive longer in a spacing situation. If you're one of the slimepeople, be aware that nitrogen replaces oxygen for you and that your emergency box will start with a red tank of nitrogen replacing the standard blue/yellow oxygen tank.
+
 <Box>
-<GuideEntityEmbed Entity="ClothingMaskBreath"/>
-<GuideEntityEmbed Entity="EmergencyOxygenTankFilled"/>
+  <GuideEntityEmbed Entity="ClothingMaskBreath"/>
+  <GuideEntityEmbed Entity="EmergencyOxygenTankFilled"/>
 </Box>
-- Если у вас кровотечение или просто хотите подготовиться, можно разрезать ткань ножом или другим острым предметом и использовать полученную ткань для создания бинта в меню ремесла, чтобы остановить кровотечение, однако ткань сама по себе может быть использована с меньшей эффективностью в чрезвычайных ситуациях.
+
+- If actively bleeding out, or simply wishing to prepare, it's possible to slice up cloth items with a knife or other sharp object and use the resulting cloth to create gauze in the crafting menu to stem bleeding with, however cloth alone can be used to less of a degree in emergencies.
+
 <Box>
-<GuideEntityEmbed Entity="Gauze"/>
-<GuideEntityEmbed Entity="MaterialCloth"/>
+  <GuideEntityEmbed Entity="Gauze"/>
+  <GuideEntityEmbed Entity="MaterialCloth"/>
 </Box>
-- Вместо настоящего анализатора здоровья просто осмотрите себя  - это хороший способ выяснить, какие раны у вас есть.
-- Если вы ослепли, морковь - это еще один способ лечения (поскольку она содержит Окулин, химический препарат, используемый для лечения слепоты), если она доступна.
-- Правильное питание (приготовленная еда, а не из автомата), как правило, гораздо лучше сказывается на общем состоянии здоровья и помогает быстрее заживлять небольшие раны.
-- Простой постельный режим лечит большинство заболеваний, а также позволяет ранам закрыться самостоятельно. Лучше всего для этого подходят медицинские кровати, обеспечивающие стерильную поверхность и поддержку всех поврежденных частей тела, но подойдет любая кровать. Даже сидячее положение помогает, хотя бы немного.
-- Сон на кровати еще больше ускоряет процесс выздоровления.
-- Блюда, содержащие бобовые, красное мясо или просто насыщенные белком, очень помогут вашему организму после сильной кровопотери. Но все же рекомендуется обратиться к врачу и пройти курс лечения.
+
+## Other Various Tips
+- In lieu of an actual health analyzer, simply examining yourself and using the detailed examine is a good way to figure out what wounds you have.
+- If going blind, carrots are another way to treat the issue (as they contain Oculine, the chemistry drug used to treat blindness) should they be available.
+- Well-made meals (cooked food not from a vending machine) is generally much better for your overall health and can help heal smaller wounds more quickly.
+- Simple bed rest can allow some wounds to close up on their own. Medical beds are best for this, providing a sterile surface and support for all damaged body parts, but any bed works.
+- Actually sleeping on a bed boosts your healing rate even farther.
+- Meals that contain proteins, such as meat, will tremendously help your body's condition after severe bloodloss. It's still advised to visit a doctor and get treated though.
 
 </Document>
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..f1f9e5aff7
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/icon.png
new file mode 100644
index 0000000000..ddf8af9119
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-left.png
new file mode 100644
index 0000000000..6b3dfd73ed
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-right.png
new file mode 100644
index 0000000000..224065dc68
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/meta.json
new file mode 100644
index 0000000000..37ee2d1693
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Specific/harmpack.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..d2cc2dd335
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json
index 3ec433ea2f..23a75bc949 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json
@@ -1,38 +1,42 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Ghagliiarghii, equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Ghagliiarghii, equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-hamster",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-hamster",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..4927dd327b
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
index a14dc5c61b..0e72b33a94 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
@@ -1,38 +1,42 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-secdog",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-secdog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..f7a1e61d17
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
index a68349917a..22d544c357 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
@@ -1,34 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..9b9cd4abf3
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
index 683ab70025..006075d544 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
@@ -1,42 +1,46 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES-hamster by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES-hamster by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES-secdog by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-hamster",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-secdog",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-hamster",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-secdog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..3ff719f88d
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
index fddbbdc12d..6b30b4a1e0 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
@@ -1,42 +1,46 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-secdog",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-hamster",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-secdog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-hamster",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..c036133f4a
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
index c0835e445c..735b7cb6ca 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
@@ -1,34 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES, inhand-left and inhand-right modified from inhand-left and inhand-right from the glasses folder by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES, inhand-left and inhand-right modified from inhand-left and inhand-right from the glasses folder by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..ac4d7faf04
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json
index b79f99ef1b..1a78e46333 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json
@@ -1,34 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by SlamBamActionman, equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by SlamBamActionman, equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-eyes-dog from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..5405ded5fb
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json
index a68349917a..22d544c357 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json
@@ -1,34 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..7f91470070
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json
index e3205be336..d43294c8b5 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/meta.json
@@ -1,22 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh. Equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh. Equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..ff121a5eae
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json
index a68349917a..22d544c357 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json
@@ -1,34 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..c1ec23b908
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json
index e3205be336..d43294c8b5 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/meta.json
@@ -1,22 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh. Equipped-EYES-moth modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh. Equipped-EYES-moth modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-moth",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..1736e6e2c8
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
index 965ef0ef73..bbd576955b 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by IntegerTempest. Equipped-EYES-arachnid modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by IntegerTempest. Equipped-EYES-arachnid modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES-dog.png b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES-dog.png
new file mode 100644
index 0000000000..9dc1c35560
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/equipped-EYES-dog.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
index 2f5d6433b7..5f792205e4 100644
--- a/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by IntegerTempest, edited by Golinth. Equipped-EYES-arachnid modified from equipped-EYES by HTMLSystem",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by IntegerTempest, edited by Golinth. Equipped-EYES-arachnid modified from equipped-EYES by HTMLSystem. equipped-EYES-dog modified from equipped-EYES by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-EYES",
-      "directions": 4
-    },
-    {
-      "name": "equipped-EYES-arachnid",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-dog.png
new file mode 100644
index 0000000000..7be5db6f10
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-dog.png
new file mode 100644
index 0000000000..f385d0bfc8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-dog.png
new file mode 100644
index 0000000000..1d32525155
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
index 8d3fa66781..2ee99bc79c 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
@@ -42,6 +42,18 @@
     {
       "name": "equipped-head-unshaded-vox",
       "directions": 4
-    }
+    },
+      {
+          "name": "equipped-head-dog",
+          "directions": 4
+      },
+      {
+          "name": "equipped-head-light-dog",
+          "directions": 4
+      },
+      {
+          "name": "equipped-head-unshaded-dog",
+          "directions": 4
+      }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..744a9a5854
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json
index 120d4d7723..1ed746dd7e 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json
@@ -1,26 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
index 79e52ce465..9ac5f2f972 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
@@ -36,6 +36,14 @@
     {
       "name": "on-equipped-HELMET-vox",
       "directions": 4
-    }
+    },
+      {
+          "name": "off-equipped-HELMET-dog",
+          "directions": 4
+      },
+      {
+          "name": "on-equipped-HELMET-dog",
+          "directions": 4
+      }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..dde1bc3595
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..e67744a67b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..cfb4943db7
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
index 552fcd7dcf..2dc8b5f33e 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
@@ -1,45 +1,30 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise SS13 at commit https://github.com/ParadiseSS13/Paradise/commit/a67c929b7394f78e7787114457ba42f4df6cc3a1. Vox state by Flareguy for SS14. monkey state made by MercerBray for Ss14. equipped-HELMET-dog modified from equipped-HELMET by casiliuscestus (GitHub) for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-monkey",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-monkey",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png
new file mode 100644
index 0000000000..790bc22e85
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png
new file mode 100644
index 0000000000..f385d0bfc8
Binary files /dev/null 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 0000000000..879ce40a74
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 0000000000..9f75f28c05
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 0000000000..0bdcc6cc57
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 0000000000..66c795f900
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 0000000000..9b0ba1f35f
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 0000000000..ce3eec5f94
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 0000000000..5347ab016e
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 cf4d2499b6..4cdc059df8 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
@@ -1,33 +1,59 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-unshaded"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "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": "equipped-head-light-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-dog",
+            "directions": 4
+        }
+    ]
 }
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 574b3d985b..0000000000
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 8e18141489..0000000000
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/equipped-head-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png
new file mode 100644
index 0000000000..a28e212afd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png differ
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 0000000000..f385d0bfc8
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 0000000000..879ce40a74
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 0000000000..9f75f28c05
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 0000000000..c16b5c7897
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 0000000000..5ef8283e95
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 0000000000..a0be8625d2
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 0000000000..dab725cf3e
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 75c93fadbe..a691ca7cf1 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 0000000000..5347ab016e
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 8e440d2c19..4cdc059df8 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
@@ -1,33 +1,59 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-unshaded"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "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": "equipped-head-light-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light-dog",
+            "directions": 4
+        },
+        {
+            "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 1a40bc3a26..0000000000
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 8a6852e4d4..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-dog.png
new file mode 100644
index 0000000000..f598c03128
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light-dog.png
new file mode 100644
index 0000000000..fc71090d1b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded-dog.png
new file mode 100644
index 0000000000..54ae299c6f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json
index d3ac9adcb7..a591ed0c5b 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json
@@ -1,48 +1,60 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "All sprites created by https://github.com/Pronana / princesscheeseballs (Discord)",
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Normal and vox sprites created by https://github.com/Pronana / princesscheeseballs (Discord). Dog states modified from base states by Sparlight (GitHub).",
 
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-unshaded"
-    },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "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": "equipped-head-light-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-head-unshaded-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-unshaded"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "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": "equipped-head-light-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
index cf4d2499b6..88dabe491a 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
@@ -1,33 +1,41 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..b49263415d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..c4dadaba70
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-dog.png
new file mode 100644
index 0000000000..005718bfa3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-light-dog.png
new file mode 100644
index 0000000000..f012c4729f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-light-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
index f996b208da..c867ea2706 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
@@ -1,36 +1,44 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy, icon-flash and light-overlay states by Velken",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy, icon-flash and light-overlay states by Velken. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "light-overlay"
-    },
-    {
-      "name": "equipped-head",
-      "directions": 4
-    },
-    {
-      "name": "equipped-head-light",
-      "directions": 4
-    },
-    {
-      "name": "equipped-head-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-head-light-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "light-overlay"
+        },
+        {
+            "name": "equipped-head",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
index cf6bddd858..9cf4dde18c 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
@@ -1,33 +1,41 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & light version made by github:Morb0. Vox states made by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..b4327c4da5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..d083e87fdd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
index 76b761d8c5..88dabe491a 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
@@ -1,33 +1,41 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & light version made by github:Morb0. Vox states by Flareguy for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..da8a10246d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..f2bcaeb206
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
index cf4d2499b6..e53f56f770 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
@@ -1,33 +1,41 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..89b0eecf1b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..f346449ada
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-dog.png
new file mode 100644
index 0000000000..035e6ff5f7
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-dog.png
new file mode 100644
index 0000000000..1bd9e30862
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-dog.png
new file mode 100644
index 0000000000..b0b95d71e8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
index 8d3fa66781..909f130ad0 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
@@ -1,47 +1,60 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original by Emisse, modified by EmoGarbage404. Vox states by Flareguy for SS14. Dog states modified from base states by Sparlight (GitHub).",
+
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-unshaded"
-    },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "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": "equipped-head-light-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-head-unshaded-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-unshaded"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "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": "equipped-head-light-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..a4962912d0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
index 80c2d47ffd..b1d9f7ad81 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
@@ -1,37 +1,49 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14, dog states modified from base states by casiliuscestus (GitHub) for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "combat-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "combat-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "combat-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..a4962912d0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..301db4f8aa
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
index cf4d2499b6..75deae3653 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
@@ -1,33 +1,42 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Scrubdelub (GitHub) for Space Station 14.",
+
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..aed74edb72
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..301db4f8aa
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
index cf4d2499b6..9862750fbf 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
@@ -1,33 +1,42 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14. Dog states modified from base states by casiliuscestus for Space Station 14.",
+
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..ceb45fb850
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..0c44117968
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
index 76b761d8c5..a12c9e18b6 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
@@ -1,33 +1,41 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & light version made by github:Morb0. Vox states by Flareguy for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..18bab02cd7
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..b715487085
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..dc7dff2d30
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
index a470e00944..14fad20aa5 100644
--- a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
@@ -1,26 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-dog modified from equipped-HELMET by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..f6c05eb82a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json
index a470e00944..14fad20aa5 100644
--- a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json
@@ -1,26 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-dog modified from equipped-HELMET by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..03d7d5a11d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
index ade65863af..03229e284d 100644
--- a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-dog modified from equipped-HELMET by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-hamster",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
index 45b0035e78..5271dd450d 100644
--- a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
@@ -1,49 +1,57 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox states taken from paradise at https://github.com/ParadiseSS13/Paradise/blob/765461f14aa4dd4f1edc33242c667843134678b5/icons/mob/clothing/species/vox/head.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/head.dmi. Vox states taken from paradise at https://github.com/ParadiseSS13/Paradise/blob/765461f14aa4dd4f1edc33242c667843134678b5/icons/mob/clothing/species/vox/head.dmi. Dog states modified from base states by @Aisfae(facebook).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-	{
-      "name": "icon-flash"
-    },
-    {
-      "name": "off-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "off-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "off-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..cf4310e391
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-dog.png
new file mode 100644
index 0000000000..bb06b7c4ec
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..c335b6bbdc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..0ff496c88e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png
new file mode 100644
index 0000000000..adf3c2807a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
new file mode 100644
index 0000000000..6027df662b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Sprites by TaoNewt (github)",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+		"name": "icon"
+		},
+		{
+		"name": "equipped-HELMET",
+		"directions": 4
+		},
+		{
+		"name": "equipped-HELMET-vox",
+		"directions": 4
+		}
+	]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..1b6700fe5a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json
index 89a026869f..d5d99ee1ec 100644
--- a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET in parts and collaboration by Sparlight (GitHub) and Raccoononi (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..812e61de4f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json
index 89a026869f..d5d99ee1ec 100644
--- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. equipped-HELMET-dog modified from equipped-HELMET in parts and collaboration by Sparlight (GitHub) and Raccoononi (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/equipped-HELMET-dog.png
new file mode 100644
index 0000000000..7d885b4814
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/equipped-HELMET-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json
index 7d275df034..c05c227f8b 100644
--- a/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json
@@ -1,18 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github). equipped-HELMET-dog modified from other sprite (Textures/Mobs/Pets/corgi.rsi) 'ian' state by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-dog",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png
new file mode 100644
index 0000000000..2de89a0630
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon-on.png differ
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png
new file mode 100644
index 0000000000..8236376fa3
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png
new file mode 100644
index 0000000000..0febda5d25
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png
new file mode 100644
index 0000000000..ca83086d2f
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json b/Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json
new file mode 100644
index 0000000000..4c419dd4af
--- /dev/null
+++ b/Resources/Textures/Clothing/Multiple/headphones.rsi/meta.json
@@ -0,0 +1,175 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, icon, inhand-left and inhand-right edited by Boaz1111 (github), on-equipped-NECK renamed to on-equipped-HEAD and on-equipped-EARS, off-equipped-NECK renamed to off-equipped-HEAD and off-equipped-EARS by Boaz1111 (github), icon-on made by TiniestShark (github) based on icon, on-equipped-NECK and off-equipped-NECK made by TiniestShark (github).",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-EARS",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-EARS",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-NECK",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on",
+      "delays": [
+        [
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2,
+        0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/off-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-EARS.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/headphones.rsi/off-equipped-NECK.png
rename to Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-EARS.png
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png
new file mode 100644
index 0000000000..671cf6b361
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png
new file mode 100644
index 0000000000..a90ae1dbc8
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/off-equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-EARS.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png
rename to Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-EARS.png
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png
new file mode 100644
index 0000000000..59841d347e
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png
new file mode 100644
index 0000000000..d65f536d3d
Binary files /dev/null and b/Resources/Textures/Clothing/Multiple/headphones.rsi/on-equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png
deleted file mode 100644
index f1ea592a60..0000000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png
deleted file mode 100644
index f1ea592a60..0000000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png
deleted file mode 100644
index ab7a61a123..0000000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png
deleted file mode 100644
index 8a09470e94..0000000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
index d6c4a337c0..ac7d927d23 100644
--- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer and genderfluid by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree",
+  "copyright": "Aromantic, asexual, bisexual, intersex, lesbian, lgbt, non-binary, pansexual and transgender pins by PixelTK, gay pin by BackeTako, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer and genderfluid by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..31832de13b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
index 1499f7c470..0d65cb2723 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14. Vox state by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..a0d570b468
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..4605c87ea4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png
new file mode 100644
index 0000000000..2fac5a732e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json
new file mode 100644
index 0000000000..85b68f67c8
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..1018c759a1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
index e56b9fd2a9..68024b843d 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state by Flareguy for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by DieselMohawk for use in SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..1018c759a1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
index 9b89dd2d07..7945dec310 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Vox state by Flareguy for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Vox state by Flareguy for Space Station 14. dog state by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..abf76d23b6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
index c59d1cc0a6..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..287bfc5701
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
index c59d1cc0a6..d0fd25d757 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING in parts and collaboration by both casiliuscestus (GitHub) and Raccoononi (GitHub) for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..a093231348
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
index b3fa4335f7..b19f353b40 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
@@ -1,38 +1,38 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, vox state made by Flareguy for SS14, monkey state made by MercerBray for Ss14, equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..fcfd57084d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
index c59d1cc0a6..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..0dac32fb6d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
index c59d1cc0a6..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..4ab9fcf73d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
index fe0cc3ebbd..16eb661339 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
@@ -1,32 +1,35 @@
-
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "All sprites created by https://github.com/Pronana / princesscheeseballs (Discord)",
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Normal and vox sprites created by https://github.com/Pronana / princesscheeseballs (Discord). equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
 
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..e78e5bd0b2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
index c59d1cc0a6..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..9d5dafb342
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
index 9d4fcfe9a1..52c860c30a 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
@@ -1,37 +1,37 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14. Siren Icon made by Velen based of the helmet's colours. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-siren"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-siren"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..e5490ef405
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
index d570d57e38..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & icon made by github:Morb0, reptilian made by kuro(388673708753027083). Vox state made by Flareguy for SS14. Inhand texstures by @emptys0und (github) for sunrise station",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..86af302e53
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
index 49c7e323f4..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & icon made by github:Morb0, reptilian made by kuro(388673708753027083). Vox state made by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..c500c57e09
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
index c59d1cc0a6..124a8a0b8d 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..aa7664a2a7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
index 43a764c6ef..c001611aee 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
@@ -1,36 +1,35 @@
-
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
 
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..619c6518b2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-scurret.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-scurret.png
new file mode 100644
index 0000000000..8125ec9e1e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-scurret.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
index b3fa4335f7..78875bc273 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
@@ -1,38 +1,42 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus (GitHub), equipped-OUTERCLOTHING-scurret modified from equipped-OUTERCLOTHING by FairlySadPanda (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-scurret",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..ca1d4ee6e7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
index c59d1cc0a6..1de60b08c0 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Scrubdelub (GitHub) for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..9c9a5b01f9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
index c59d1cc0a6..1d50a81060 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CLA",
-  "copyright": "SUNRISE",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus (GitHub) for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..25621ba220
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
index 49c7e323f4..ece31dcb61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & icon made by github:Morb0, reptilian made by kuro(388673708753027083). Vox state made by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..53506fe8cb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
index 15aef26a56..3a1888148e 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. dog robes by TiniestShark (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..e47ae372b1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
index 15aef26a56..584a95765c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. dog robes by TiniestShark(GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..57054329cb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
index 15aef26a56..3a1888148e 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. dog robes by TiniestShark (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..7f25571088
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
index f8f2fba961..cdebd4fdca 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
@@ -1,30 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by @Aisfae(facebook).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..07151ba5b3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
index b04533af16..ebb5241b06 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
@@ -1,34 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, reptilian made by denlemp(692533587760906270)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Flareguy & cboyjet, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..3fb7623926
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png
new file mode 100644
index 0000000000..ecf9ff02c1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
index b587258495..0762521a01 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
@@ -1,34 +1,42 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Flareguy, cboyjet, & monkey-suit sprite by Kittygyat, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Flareguy, cboyjet, & monkey-suit sprite by Kittygyat, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub). equipped-OUTERCLOTHING-scurret modified from equipped-OUTERCLOTHING by FairlySadPanda (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-scurret",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING-dog.png
new file mode 100644
index 0000000000..624ffa7dfa
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING-dog.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json
index 542edf0002..a4949475c2 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json
@@ -1,26 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github). equipped-OUTERCLOTHING-dog modified from other sprite (Textures/Mobs/Pets/corgi.rsi) 'ian' state by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-dog",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png
new file mode 100644
index 0000000000..e01c5d3638
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png
new file mode 100644
index 0000000000..06c62f2869
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png
new file mode 100644
index 0000000000..8a548ba6a4
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png
new file mode 100644
index 0000000000..7c1c8fa122
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png
new file mode 100644
index 0000000000..f7ee26e9a8
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json
new file mode 100644
index 0000000000..faaa2fe6bb
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cd6ba31a1b5891133c14b9ebba4a4479143b5167",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png b/Resources/Textures/Effects/crayondecals.rsi/SleepingCarp.png
similarity index 100%
rename from Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png
rename to Resources/Textures/Effects/crayondecals.rsi/SleepingCarp.png
diff --git a/Resources/Textures/Effects/crayondecals.rsi/meta.json b/Resources/Textures/Effects/crayondecals.rsi/meta.json
index eb33bb4909..b76fec05bf 100644
--- a/Resources/Textures/Effects/crayondecals.rsi/meta.json
+++ b/Resources/Textures/Effects/crayondecals.rsi/meta.json
@@ -108,7 +108,7 @@
 
         },
         {
-            "name": "Sleeping Carp"
+            "name": "SleepingCarp"
 
         },
         {
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-clowning-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-clowning-module.png
new file mode 100644
index 0000000000..3f546f2adb
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-clowning-module.png differ
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index afff9e1886..fcde6a539f 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github)",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA",
     "size": {
         "x": 32,
         "y": 32
@@ -100,6 +100,9 @@
         {
             "name":"clowning-module"
         },
+        {
+            "name":"adv-clowning-module"
+        },
         {
             "name":"syndicate-weapon-module"
         },
@@ -127,6 +130,9 @@
         {
             "name":"xenoborg-eye-module"
         },
+        {
+            "name":"xenoborg-eye2-module"
+        },
         {
             "name":"xenoborg-hypo-module"
         },
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye2-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye2-module.png
new file mode 100644
index 0000000000..8011403508
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye2-module.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/devour.png b/Resources/Textures/Interface/Actions/changeling.rsi/devour.png
new file mode 100644
index 0000000000..f5acc7dcee
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling.rsi/devour.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/devour_on.png b/Resources/Textures/Interface/Actions/changeling.rsi/devour_on.png
new file mode 100644
index 0000000000..65d63eb250
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling.rsi/devour_on.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/meta.json b/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
index babe776612..20c9ed1720 100644
--- a/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
@@ -7,6 +7,15 @@
         "y": 32
     },
     "states": [
+        {
+            "name": "transform"
+        },
+        {
+            "name": "devour"
+        },
+        {
+            "name": "devour_on"
+        },
         {
             "name": "armblade"
         }
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/transform.png b/Resources/Textures/Interface/Actions/changeling.rsi/transform.png
new file mode 100644
index 0000000000..6657790012
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling.rsi/transform.png differ
diff --git a/Resources/Textures/Interface/Actions/jump.rsi/icon.png b/Resources/Textures/Interface/Actions/jump.rsi/icon.png
new file mode 100644
index 0000000000..46af10ae27
Binary files /dev/null and b/Resources/Textures/Interface/Actions/jump.rsi/icon.png differ
diff --git a/Resources/Textures/Interface/Actions/jump.rsi/meta.json b/Resources/Textures/Interface/Actions/jump.rsi/meta.json
new file mode 100644
index 0000000000..7a2119f3fb
--- /dev/null
+++ b/Resources/Textures/Interface/Actions/jump.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a373b4cb08298523d40acc14f9c390a0c403fc31",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/AdminActions/clear-parrot.png b/Resources/Textures/Interface/AdminActions/clear-parrot.png
new file mode 100644
index 0000000000..bf027c421d
Binary files /dev/null and b/Resources/Textures/Interface/AdminActions/clear-parrot.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/0.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/0.png
new file mode 100644
index 0000000000..8eb85f36dc
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/0.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/1.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/1.png
new file mode 100644
index 0000000000..8a9a17bc02
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/1.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/2.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/2.png
new file mode 100644
index 0000000000..8a0fd90ff3
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/2.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/3.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/3.png
new file mode 100644
index 0000000000..181f425acc
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/3.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/4.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/4.png
new file mode 100644
index 0000000000..fe5680eb41
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/4.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/5.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/5.png
new file mode 100644
index 0000000000..2361ca7f1d
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/5.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/6.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/6.png
new file mode 100644
index 0000000000..a636e7890b
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/6.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/7.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/7.png
new file mode 100644
index 0000000000..d29d6192de
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/7.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/8.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/8.png
new file mode 100644
index 0000000000..90deae2876
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/8.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/9.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/9.png
new file mode 100644
index 0000000000..6325fbdabc
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/9.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/base.png b/Resources/Textures/Interface/Alerts/generic_counter.rsi/base.png
new file mode 100644
index 0000000000..cedd5f78fa
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/generic_counter.rsi/base.png differ
diff --git a/Resources/Textures/Interface/Alerts/generic_counter.rsi/meta.json b/Resources/Textures/Interface/Alerts/generic_counter.rsi/meta.json
new file mode 100644
index 0000000000..16cc2761e3
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/generic_counter.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by EmoGarbage404",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "0"
+        },
+        {
+            "name": "1"
+        },
+        {
+            "name": "2"
+        },
+        {
+            "name": "3"
+        },
+        {
+            "name": "4"
+        },
+        {
+            "name": "5"
+        },
+        {
+            "name": "6"
+        },
+        {
+            "name": "7"
+        },
+        {
+            "name": "8"
+        },
+        {
+            "name": "9"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/shuttle.rsi/meta.json b/Resources/Textures/Interface/Alerts/shuttle.rsi/meta.json
new file mode 100644
index 0000000000..e806b9afdc
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/shuttle.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "not sure",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+          "name": "piloting"
+        }
+      ]
+}
diff --git a/Resources/Textures/Interface/Alerts/piloting.png b/Resources/Textures/Interface/Alerts/shuttle.rsi/piloting.png
similarity index 100%
rename from Resources/Textures/Interface/Alerts/piloting.png
rename to Resources/Textures/Interface/Alerts/shuttle.rsi/piloting.png
diff --git a/Resources/Textures/Interface/Alerts/stealthy.rsi/meta.json b/Resources/Textures/Interface/Alerts/stealthy.rsi/meta.json
new file mode 100644
index 0000000000..8c00bfef64
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/stealthy.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Edited by DuckManZach (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "stealthy-off"
+        },
+        {
+            "name": "stealthy-on"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/stealthy.rsi/stealthy-off.png b/Resources/Textures/Interface/Alerts/stealthy.rsi/stealthy-off.png
new file mode 100644
index 0000000000..98e35494b2
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/stealthy.rsi/stealthy-off.png differ
diff --git a/Resources/Textures/Interface/Alerts/stealthy.rsi/stealthy-on.png b/Resources/Textures/Interface/Alerts/stealthy.rsi/stealthy-on.png
new file mode 100644
index 0000000000..3d2abbd645
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/stealthy.rsi/stealthy-on.png differ
diff --git a/Resources/Textures/Interface/Alerts/stunnable.rsi/knocked-down.png b/Resources/Textures/Interface/Alerts/stunnable.rsi/knocked-down.png
new file mode 100644
index 0000000000..3af4eddb50
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/stunnable.rsi/knocked-down.png differ
diff --git a/Resources/Textures/Interface/Alerts/stunnable.rsi/meta.json b/Resources/Textures/Interface/Alerts/stunnable.rsi/meta.json
new file mode 100644
index 0000000000..abae5803ea
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/stunnable.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Princess Chesseballs, Pronana on Github https://github.com/Pronana",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "knocked-down"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png
index 2e2e6fdcd6..07a5f1619f 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png
new file mode 100644
index 0000000000..f756efee72
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png
new file mode 100644
index 0000000000..1923b5d594
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png
new file mode 100644
index 0000000000..7b6b9a28a3
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png
new file mode 100644
index 0000000000..f184340af0
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json
new file mode 100644
index 0000000000..3629b336ee
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json
@@ -0,0 +1,60 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf, all edited by lzk228",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "mothroach",
+            "directions": 4
+        },
+        {
+            "name": "mothroach-moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "mothroach_dead",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "0-equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png
new file mode 100644
index 0000000000..929cf998c8
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png
new file mode 100644
index 0000000000..8bc772c31f
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png
new file mode 100644
index 0000000000..83cbc86e4d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png differ
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png b/Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png
deleted file mode 100644
index fd9079fd66..0000000000
Binary files a/Resources/Textures/Mobs/Animals/parrot.rsi/parrot.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png
new file mode 100644
index 0000000000..7244b37f5c
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/ears.png differ
diff --git a/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json
new file mode 100644
index 0000000000..ad46a0b6ed
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/parrot/displacement.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-3.0",
+  "copyright": "Made by Crude Oil",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "load": {
+    "srgb": false
+  },
+  "states": [
+    {
+      "name": "ears",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/dead.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/dead.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/dead.png
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/dead.png
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/icon.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/icon.png
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/icon.png
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/meta.json b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/meta.json
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png
new file mode 100644
index 0000000000..48b71f7b25
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/parrot.png differ
diff --git a/Resources/Textures/Mobs/Animals/parrot.rsi/sit.png b/Resources/Textures/Mobs/Animals/parrot/parrot.rsi/sit.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/parrot.rsi/sit.png
rename to Resources/Textures/Mobs/Animals/parrot/parrot.rsi/sit.png
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/back.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/back.png
new file mode 100644
index 0000000000..1105557383
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/back.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/ears.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/ears.png
new file mode 100644
index 0000000000..40bba4fdd3
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/ears.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/eyes.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/eyes.png
new file mode 100644
index 0000000000..0c6b045da7
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/gloves.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/gloves.png
new file mode 100644
index 0000000000..70ec1726d0
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/gloves.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/hand.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/hand.png
new file mode 100644
index 0000000000..e77bdd4d22
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/hand.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/head.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/head.png
new file mode 100644
index 0000000000..064d1d9e61
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/head.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/id.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/id.png
new file mode 100644
index 0000000000..6af79fb8a3
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/id.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/jumpsuit.png
new file mode 100644
index 0000000000..41d1e4589d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/jumpsuit.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/mask.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/mask.png
new file mode 100644
index 0000000000..c8e757e2e5
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/mask.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json
new file mode 100644
index 0000000000..6d148c7cc5
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json
@@ -0,0 +1,54 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Displacement maps made by Hannah 'FairlySadPanda' Dawson (Github), with assistance by TheShuEd (Discord). Wawa!",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "load": {
+        "srgb": false
+    },
+    "states": [
+        {
+            "name": "jumpsuit",
+            "directions": 4
+        },
+        {
+            "name": "head",
+            "directions": 4
+        },
+        {
+            "name": "neck",
+            "directions": 4
+        },
+        {
+            "name": "ears",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        },
+        {
+            "name": "mask",
+            "directions": 4
+        },
+        {
+            "name": "id",
+            "directions": 4
+        },
+        {
+            "name": "gloves",
+            "directions": 4
+        },
+        {
+            "name": "hand",
+            "directions": 4
+        },
+        {
+            "name": "back",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/neck.png b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/neck.png
new file mode 100644
index 0000000000..5c2f5918c7
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/displacement.rsi/neck.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/meta.json b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/meta.json
new file mode 100644
index 0000000000..c02aaa063d
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/meta.json
@@ -0,0 +1,21 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Original sprite by Very-Soft (https://github.com/Very-Soft), edits by Hannah 'FairlySadPanda' Dawson. Displacement maps by Hannah 'FairlySadPanda' Dawson. Original creature concept by VIDEOCULT, and used with kind permission.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "scurret",
+            "directions": 4
+        },
+        {
+            "name": "scurret_rip"
+        },
+        {
+            "name": "scurret_oof"
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret.png b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret.png
new file mode 100644
index 0000000000..7562f35fab
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret_oof.png b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret_oof.png
new file mode 100644
index 0000000000..e0dd782fa0
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret_oof.png differ
diff --git a/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret_rip.png b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret_rip.png
new file mode 100644
index 0000000000..9d3f2a7977
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/scurret/scurret.rsi/scurret_rip.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png
new file mode 100644
index 0000000000..7a10a15fda
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png
new file mode 100644
index 0000000000..56615b3dc6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
index bd8400a374..fbaf3ae193 100644
--- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi. eyeshadow_upper and eyeshadow_lower made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -54,6 +54,14 @@
     {
       "name": "tattoo_eye_moth_l",
       "directions": 4
+    },
+    {
+      "name": "eyeshadow_upper",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_lower",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png
new file mode 100644
index 0000000000..71883f9e78
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png
new file mode 100644
index 0000000000..b0982ca5c0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png
new file mode 100644
index 0000000000..b21fde3e16
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
index 99004ffaf8..446bbd5c95 100644
--- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
@@ -1,12 +1,16 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy, spotty by Flareguy",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy. mad_scientist_s modified from keelquills_s by Flareguy. spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "bushy_s",
+      "directions": 4
+    },
     {
       "name": "crestedquills_s",
       "directions": 4
@@ -51,10 +55,18 @@
       "name": "razor_clipped_s",
       "directions": 4
     },
+    {
+      "name": "mad_scientist_s",
+      "directions": 4
+    },
     {
       "name": "mohawk_s",
       "directions": 4
     },
+    {
+      "name": "hedgehog_s",
+      "directions": 4
+    },
     {
       "name": "horns_s",
       "directions": 4
@@ -102,6 +114,10 @@
     {
       "name": "flowing_s",
       "directions": 4
+    },
+    {
+      "name": "slick_s",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png
new file mode 100644
index 0000000000..69e9671294
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png
index d35ddc4842..d4a7a5bde5 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
index fd5c14b6a3..183e3c0338 100644
--- a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy. tail_big and tail_short modified from tail by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -48,7 +48,15 @@
       "directions": 4
     },
     {
-      "name": "tail_stenciled",
+      "name": "tail_full",
+      "directions": 4
+    },
+    {
+      "name": "tail_short",
+      "directions": 4
+    },
+    {
+      "name": "tail_big",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png
index 0e63d3327b..4cbdc0349e 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
new file mode 100644
index 0000000000..31626f813b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png
new file mode 100644
index 0000000000..9582d39d9d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png
new file mode 100644
index 0000000000..c714a65e89
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png
deleted file mode 100644
index 9072c9f4fc..0000000000
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
new file mode 100644
index 0000000000..7e74ffb8b6
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "vox_scar_chest, vox_scar_eye_left, vox_scar_eye_right, vox_scar_top_surgery_long and vox_scar_top_surgery_short drawn by Ubaser, vox_scar_neck, vox_scar_chest_bullets, vox_scar_stomach_bullets, vox_scar_face_1 and vox_scar_face_2 originally drawn by Ktyria(discord) edited by TrixxedHeart, vox_scar_eye_left_small and vox_scar_eye_right_small modified from vox_scar_eye_left and vox_scar_eye_right originally by Boaz1111(github) edited by TrixxedHeart.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "vox_scar_eye_left",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_eye_right",
+      "directions": 4
+    },
+    {
+      "name": "vox_top_surgery_short",
+      "directions": 4
+    },
+    {
+      "name": "vox_top_surgery_long",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_chest",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_neck",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_chest_bullets",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_stomach_bullets",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_face_1",
+      "directions": 4
+    },
+    {
+      "name": "vox_scar_face_2",
+      "directions": 4
+    }, 
+    {
+      "name": "vox_scar_eye_left_small",
+      "directions": 4
+    }, 
+    {
+      "name": "vox_scar_eye_right_small",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png
new file mode 100644
index 0000000000..59c04641bd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png
new file mode 100644
index 0000000000..ff9bff2276
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_chest_bullets.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png
new file mode 100644
index 0000000000..b369711f3b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png
new file mode 100644
index 0000000000..5fc01b19b0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_left_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png
new file mode 100644
index 0000000000..ff86c3882c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png
new file mode 100644
index 0000000000..76efe1412f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_eye_right_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png
new file mode 100644
index 0000000000..c19ce0cf39
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png
new file mode 100644
index 0000000000..32f7f6a938
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_face_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png
new file mode 100644
index 0000000000..9feed1955e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_neck.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png
new file mode 100644
index 0000000000..2eb9538a49
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_scar_stomach_bullets.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png
new file mode 100644
index 0000000000..5624b47c8c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_long.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png
new file mode 100644
index 0000000000..aaa4e10d17
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_scars.rsi/vox_top_surgery_short.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png
new file mode 100644
index 0000000000..ff8f5ef304
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png
new file mode 100644
index 0000000000..8884d1c5d9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png
new file mode 100644
index 0000000000..4027e9a893
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
index 725fbb6a0d..e1d263c9ac 100644
--- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -22,6 +22,30 @@
     {
       "name": "nightling_s",
       "directions": 4
+    },
+    {
+      "name": "tattoo_eye_vox_r",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_eye_vox_l",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_small",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_medium",
+      "directions": 4
+    },
+    {
+      "name": "eyeshadow_large",
+      "directions": 4
+    },
+    {
+      "name": "tail_ring",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png
new file mode 100644
index 0000000000..3e3f2ab413
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png
new file mode 100644
index 0000000000..b0351eeb2b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png
new file mode 100644
index 0000000000..f748cef2d4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_eye_vox_r.png differ
diff --git a/Resources/Textures/Mobs/Effects/stunned.rsi/meta.json b/Resources/Textures/Mobs/Effects/stunned.rsi/meta.json
new file mode 100644
index 0000000000..ea721b943f
--- /dev/null
+++ b/Resources/Textures/Mobs/Effects/stunned.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by Princess Cheeseballs, https://github.com/Princess-Cheeseballs",
+    "states": [
+        {
+            "name": "stunned",
+            "directions": 1,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Effects/stunned.rsi/stunned.png b/Resources/Textures/Mobs/Effects/stunned.rsi/stunned.png
new file mode 100644
index 0000000000..7ad891b4f6
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/stunned.rsi/stunned.png differ
diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png
new file mode 100644
index 0000000000..c29cb7ca64
Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png
new file mode 100644
index 0000000000..363b460645
Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json
index e7b01df53d..a465e90b6c 100644
--- a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json
+++ b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/meta.json
@@ -1,18 +1,26 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi, inhand sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "animated",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
+      {
+          "name": "animated",
+          "directions": 4
+      },
+      {
+          "name": "icon"
+      },
+      {
+          "name": "inhand-left",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right",
+          "directions": 4
+      }
   ]
 }
diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png
new file mode 100644
index 0000000000..f7fe8a1b79
Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png
new file mode 100644
index 0000000000..f7fe8a1b79
Binary files /dev/null and b/Resources/Textures/Mobs/Ghosts/revenant.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json b/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json
index 5a430a2a37..b5d8bc7086 100644
--- a/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json
+++ b/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi, inhand sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -185,6 +185,14 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png b/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png
deleted file mode 100644
index 6e3cb09bcf..0000000000
Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
index 9182c1d991..08a4c74f60 100644
--- a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
@@ -1,160 +1,157 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd.  belt_displacement by Sparlight.",
-  "states": [
-    {
-      "name": "corgi",
-      "directions": 4
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "corgi_rest",
-      "directions": 4
-    },
-    {
-      "name": "corgi_dead"
-    },
-    {
-      "name": "ian",
-      "directions": 4
-    },
-    {
-      "name": "ian_dead"
-    },
-    {
-      "name": "corgi_deadcollar"
-    },
-    {
-      "name": "corgi_deadtag"
-    },
-    {
-      "name": "ian_shaved",
-      "directions": 4
-    },
-    {
-      "name": "ian_shaved_dead"
-    },
-    {
-      "name": "corgicollar",
-      "directions": 4
-    },
-    {
-      "name": "corgitag",
-      "directions": 4
-    },
-    {
-      "name": "lisa",
-      "directions": 4
-    },
-    {
-      "name": "lisa_dead"
-    },
-    {
-      "name": "lisa_shaved",
-      "directions": 4
-    },
-    {
-      "name": "lisa_shaved_dead"
-    },
-    {
-      "name": "narsian",
-      "directions": 4
-    },
-    {
-      "name": "narsian_dead",
-      "directions": 1
-    },
-    {
-      "name": "old_ian",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "old_ian_dead"
-    },
-    {
-      "name": "old_ian_shaved",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "old_ian_shaved_dead"
-    },
-    {
-      "name": "puppy",
-      "directions": 4
-    },
-    {
-      "name": "puppy_dead"
-    },
-    {
-      "name": "puppy_deadcollar"
-    },
-    {
-      "name": "puppy_deadtag"
-    },
-    {
-      "name": "puppy_shaved",
-      "directions": 4
-    },
-    {
-      "name": "puppy_shaved_dead"
-    },
-    {
-      "name": "puppycollar",
-      "directions": 4
-    },
-    {
-      "name": "puppytag",
-      "directions": 4
-    },
-    {
-      "name": "real_mouse",
-      "directions": 4
-    },
-    {
-      "name": "real_mouse_dead"
-    },
-    {
-      "name": "belt_displacement"
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd.",
+    "states": [
+        {
+            "name": "corgi",
+            "directions": 4
+        },
+        {
+            "name": "corgi_rest",
+            "directions": 4
+        },
+        {
+            "name": "corgi_dead"
+        },
+        {
+            "name": "ian",
+            "directions": 4
+        },
+        {
+            "name": "ian_dead"
+        },
+        {
+            "name": "corgi_deadcollar"
+        },
+        {
+            "name": "corgi_deadtag"
+        },
+        {
+            "name": "ian_shaved",
+            "directions": 4
+        },
+        {
+            "name": "ian_shaved_dead"
+        },
+        {
+            "name": "corgicollar",
+            "directions": 4
+        },
+        {
+            "name": "corgitag",
+            "directions": 4
+        },
+        {
+            "name": "lisa",
+            "directions": 4
+        },
+        {
+            "name": "lisa_dead"
+        },
+        {
+            "name": "lisa_shaved",
+            "directions": 4
+        },
+        {
+            "name": "lisa_shaved_dead"
+        },
+        {
+            "name": "narsian",
+            "directions": 4
+        },
+        {
+            "name": "narsian_dead",
+            "directions": 1
+        },
+        {
+            "name": "old_ian",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "old_ian_dead"
+        },
+        {
+            "name": "old_ian_shaved",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "old_ian_shaved_dead"
+        },
+        {
+            "name": "puppy",
+            "directions": 4
+        },
+        {
+            "name": "puppy_dead"
+        },
+        {
+            "name": "puppy_deadcollar"
+        },
+        {
+            "name": "puppy_deadtag"
+        },
+        {
+            "name": "puppy_shaved",
+            "directions": 4
+        },
+        {
+            "name": "puppy_shaved_dead"
+        },
+        {
+            "name": "puppycollar",
+            "directions": 4
+        },
+        {
+            "name": "puppytag",
+            "directions": 4
+        },
+        {
+            "name": "real_mouse",
+            "directions": 4
+        },
+        {
+            "name": "real_mouse_dead"
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png
new file mode 100644
index 0000000000..e5a397c236
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png
new file mode 100644
index 0000000000..6d2d4c3030
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png
new file mode 100644
index 0000000000..968c68414e
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png
new file mode 100644
index 0000000000..93e43d5194
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png
new file mode 100644
index 0000000000..771f343f04
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png differ
diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/meta.json b/Resources/Textures/Mobs/Pets/displacements.rsi/meta.json
new file mode 100644
index 0000000000..0b4ddb7a92
--- /dev/null
+++ b/Resources/Textures/Mobs/Pets/displacements.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Displacement maps by Velken, corgi_belt_displacement by Sparlight",
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "load": {
+        "srgb": false
+    },
+    "states": [
+        {
+            "name": "mcgriff_eyes_displacement",
+            "directions": 4
+        },
+        {
+            "name": "mcgriff_head_displacement",
+            "directions": 4
+        },
+        {
+            "name": "corgi_belt_displacement",
+            "directions": 4
+        },
+        {
+            "name": "corgi_head_displacement",
+            "directions": 4
+        },
+        {
+            "name": "lisa_head_displacement",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-active.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-active.png
new file mode 100644
index 0000000000..1b64de18a2
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-active.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-idle.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-idle.png
new file mode 100644
index 0000000000..5cafcef584
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-idle.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-load.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-load.png
new file mode 100644
index 0000000000..138e9eebcf
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-load.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-o.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-o.png
new file mode 100644
index 0000000000..439b25217f
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-o.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/meta.json b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/meta.json
new file mode 100644
index 0000000000..0f8bb69530
--- /dev/null
+++ b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/meta.json
@@ -0,0 +1,199 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Samuka",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "core-active",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "core-idle",
+      "directions": 4
+    },
+    {
+      "name": "core-o",
+      "directions": 4
+    },
+    {
+      "name": "core-load",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png
index a9db83691c..f962464039 100644
Binary files a/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png and b/Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png differ
diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
index bdce787a48..867aeb41e8 100644
--- a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/e2923df112df8aa025846d0764697bad6506586a/icons/mob/AI.dmi - modified by chromiumboy.",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/e2923df112df8aa025846d0764697bad6506586a/icons/mob/AI.dmi - modified by chromiumboy, base modified by monotheonist.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png
index c10c6abe66..2988b27a54 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png
index 2c938634eb..18ce524dbb 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index 0c910f85e5..e46ca56024 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -26,6 +26,10 @@
             "name": "head",
             "directions": 4
         },
+        {
+            "name": "neck",
+            "directions": 4
+        },
         {
             "name": "ears",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png
new file mode 100644
index 0000000000..8783d770ea
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png
index 3910fb39a6..01259ea03d 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..d5adc6d762
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..9d1cc8a7d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..16bf2bcd0f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..68538310bc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..f7f8d2d39f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..3b65c3ed77
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..dbce673fd5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..7342070518
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..b735287a2a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..1b387d5ac3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..001a801d6c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..54f662b064
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..2da1e578c4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..4532858488
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..979bbf08cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d226ded556
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
index f60e29d82f..52cb1050a0 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon_blue"
@@ -42,6 +42,38 @@
         },
         {
             "name": "fill-6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..8a5e842eda
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..af2da8354c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..48af47360e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..b58d2cfb36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..e37dd673c5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..71e4bdaf53
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..88fd5618c3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..743a93bf1e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json
index 960293f615..df07a51fcd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png
new file mode 100644
index 0000000000..13bec09cdf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json
index ffcf3da666..64bbee7a5a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github), icon_open by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..d340491de3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..ba8c8fbc03
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..b0020cc3d7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png
new file mode 100644
index 0000000000..98fe987443
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..b89d65f8f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..2b437b14ac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..9df8de24dc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png
new file mode 100644
index 0000000000..19b919e34e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png
new file mode 100644
index 0000000000..a51ae97131
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png
new file mode 100644
index 0000000000..efbffb69c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..0010e197f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..ec574e53b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json
index e00674b301..94e9eb6ce1 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "drawn by givazaa",
+    "copyright": "drawn by givazaa, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..119a8f7d2b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..bf8d6438f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json
index 9e1d9a9075..009176d023 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..66efbe97e1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..612222a36c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..a4cf0262b7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..9ebf7d4752
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..b68edb9380
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..de29daf81b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..c6d68f63d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..08f49bec69
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json
index 960293f615..df07a51fcd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..62fb7cdc68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..359a48f529
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png
new file mode 100644
index 0000000000..81d2536eaa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png
new file mode 100644
index 0000000000..3ce0418112
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png
new file mode 100644
index 0000000000..569a2164cd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/meta.json
index db0ac608ed..41222914c7 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/detflask.rsi/meta.json
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png
new file mode 100644
index 0000000000..89ded8c64d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png
new file mode 100644
index 0000000000..7177a53c50
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png
new file mode 100644
index 0000000000..2c508b9cf1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/meta.json
index db0ac608ed..41222914c7 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/flask.rsi/meta.json
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png
new file mode 100644
index 0000000000..051d741c52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png
new file mode 100644
index 0000000000..f3a2c49b68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/meta.json
index db0ac608ed..6491b2bc5d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/flask_old.rsi/meta.json
@@ -1 +1,22 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6b7c6a3da5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..1b407be265
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..3ab3631870
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..d045f4f0e7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..65ddfbc981
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..bb4733c7a2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..20caef3032
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..80938404de
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..39198a73cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..591c709b9a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..9dc112eb67
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..cf1096a1f2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..4fa6e2865e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..a2451e16d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..2eca06d4f6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..8eb0c20905
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..a13202b5d3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..a1dddcb94b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..b9ac2b6520
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..570467eb19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..0dd980a922
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..751ebf5d3c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..0db4d2d19a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..c4f1689a53
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json
index 6542150423..ba81b5b27c 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -33,6 +33,38 @@
         },
         {
             "name": "fill-6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png
index d4ae352675..5a098473db 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png
new file mode 100644
index 0000000000..8e885caa4b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png
new file mode 100644
index 0000000000..c64ed193e2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png
new file mode 100644
index 0000000000..30d1758357
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json
index fbbb5eadce..a1a58ef52c 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json
@@ -1,14 +1,25 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by MrGreen06#0618 (discord)",
+    "copyright": "Sprited by MrGreen06#0618 (discord), icon modified & icon_open/inhands by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png
new file mode 100644
index 0000000000..13c94563bf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png
new file mode 100644
index 0000000000..01c9102950
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
index 9e1d9a9075..009176d023 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png
new file mode 100644
index 0000000000..43e01b3e20
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png
new file mode 100644
index 0000000000..67d745ffc0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png
new file mode 100644
index 0000000000..61cc511e24
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png
new file mode 100644
index 0000000000..552b333b14
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png
new file mode 100644
index 0000000000..6ac52171ee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/meta.json
index db0ac608ed..41222914c7 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lithiumflask.rsi/meta.json
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..4565a7752a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..41325e50ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..454e3ab2a4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png
new file mode 100644
index 0000000000..166532f8dc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..a4f87ad9c7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..a2b417f33a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b283819d3c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png
new file mode 100644
index 0000000000..a82d43f7e9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
index 960293f615..df07a51fcd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (Github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png
new file mode 100644
index 0000000000..92600e9a02
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
index ec2769b3b9..53f0b3af2f 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
@@ -1,15 +1,18 @@
 {
     "version": 1,
+    "copyright": "Created by EmoGarbage, inhands by TiniestShark (github), icon_open by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by EmoGarbage, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..311ddd4623
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..d9b930ed7e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..1dc501183f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png
new file mode 100644
index 0000000000..8d04eec7ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..3be2b0e899
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..49076b5575
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..70fc4e4470
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png
new file mode 100644
index 0000000000..642f55425a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json
index db0ac608ed..e91afea62f 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json
@@ -1 +1,46 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..b07e28d83c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..5923f3c50b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..41b5cc1114
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ac4286c10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..c8a9d8d8c8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..c8674e5a48
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..693c9ebadc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d953ec3ea2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..544d2cba51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..cd772b1eec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..c0fe79484c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..49119e5062
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..c8b4499d38
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..c746d8b8df
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..97ee9a42d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..4880ea306f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..4b4fc4e156
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..ae8839ebcd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png
index 53b96d67d5..0e943e4a95 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png
index 57273615e3..d8feb0b718 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..556d05732c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..13185481d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
index 6009794429..a56728bea4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (Github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (Github), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png
new file mode 100644
index 0000000000..92e4559e38
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png
new file mode 100644
index 0000000000..f4dfd9623a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png
new file mode 100644
index 0000000000..11f51eb0eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/meta.json
index db0ac608ed..41222914c7 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shinyflask.rsi/meta.json
@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open & inhands by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..fdb53126e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..280a655f4d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..689017b3c3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json
index 1190465440..cd7a1c9027 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "modified from space-up_bottle.rsi and inspired by sodawater.rsi by Prole0 (GitHub)",
+    "copyright": "modified from space-up_bottle.rsi and inspired by sodawater.rsi by Prole0 (GitHub), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..3db9a0ad5f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..f9eab876ee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..20909cf84f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..dcf45ca0e7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..8a621112a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..d616002a2e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..0decf903e2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..75c584bd40
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..464ad3d2db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..cd072f633b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..5c62139438
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..b4f0b8a8b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..6d3b968beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..3a7e751075
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..7beda89048
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..efc8153c22
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..22eff7e402
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..b0f11f1af1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b671320b52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..8cf79b3ec9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json
index 7ef37142c7..334f81ac7a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub)",
+    "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png
new file mode 100644
index 0000000000..4ed9fb1426
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json
index b45677f986..1efdfb940a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github), icon_open by Prole0 (GitHub)",
     "license": "CC-BY-SA-3.0",
     "size":
     {
@@ -12,6 +12,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..7e6e085352
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..97697d35af
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..39bdcdfcef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..608531cdf9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..6501196aa3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..d2f1580d39
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..33f6bd5f27
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..b047e2e9d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..12db433acf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..314f03cb92
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..9f5836fe51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..c4ad1c2f17
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..95e370f259
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..53a26bb314
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..6e72c95475
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d07fc07cb5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png
index 154c205bf1..b8361f4ba0 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..154c205bf1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png
index 1530ff913f..a33a30d34f 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png
index 66a831d2cc..f2df5c7da8 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..66a831d2cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
index e09aa519fc..0f46f67641 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
@@ -1,61 +1,67 @@
 {
-  "version": 1,
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)",
-  "license": "CC-BY-SA-3.0",
-  "size":
-  {
-    "x": 32,
-    "y": 32
-  },
-  "states":
-  [
-    {
-      "name": "icon"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon_open"
-    },
-    {
-      "name": "icon_empty"
-    },
-    {
-      "name": "fill-1"
-    },
-    {
-      "name": "fill-2"
-    },
-    {
-      "name": "fill-3"
-    },
-    {
-      "name": "fill-4"
-    },
-    {
-      "name": "fill-5"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-1",
-      "directions": 4
-    },
-	{
-      "name": "inhand-left-fill-2",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-1",
-      "directions": 4
-    },
-	{
-      "name": "inhand-right-fill-2",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..3310861154
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000..7386b6d5ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png
new file mode 100644
index 0000000000..2604e46518
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..7ac7b2ab67
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..c1c61b23a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000..882c4b9eed
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png
new file mode 100644
index 0000000000..b7a8874beb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..d9a2349f97
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json
index 960293f615..e139633197 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
@@ -30,6 +30,38 @@
         },
         {
             "name": "fill-5"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png
new file mode 100644
index 0000000000..739fe12581
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png
new file mode 100644
index 0000000000..aed75df962
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json
index 9e1d9a9075..30b3bf2a33 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png
new file mode 100644
index 0000000000..765507a014
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png
new file mode 100644
index 0000000000..51dd6aa1e8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png
new file mode 100644
index 0000000000..623d36ba28
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png
new file mode 100644
index 0000000000..117e4559b0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png
new file mode 100644
index 0000000000..db53efc5a9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png
new file mode 100644
index 0000000000..883083e177
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png
new file mode 100644
index 0000000000..dbcc9f262b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png
new file mode 100644
index 0000000000..eeee2e200a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index f54a9cfcc9..c8d773339d 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp, berry delighht sprites by FairlySadPanda (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -308,6 +308,34 @@
         {
             "name": "lemoon-slice"
 
+        },
+		{
+            "name": "cotton"
+        },
+        {
+            "name": "cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "cotton-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "berry_delight"
+        },
+        {
+            "name": "berry_delight_slice"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/icon.png b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/icon.png
new file mode 100644
index 0000000000..193b35c603
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-left.png
new file mode 100644
index 0000000000..3124ab63b2
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-right.png
new file mode 100644
index 0000000000..1858c5a779
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json
new file mode 100644
index 0000000000..0ad72a5acd
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json
@@ -0,0 +1,82 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+     "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by ThatGuyUSA (github). Inhands by TiniestShark (github)",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
index c6e79f0c9b..fe592577c4 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 39e73ee266..28c34227a3 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 6e53ef3a3b..90399cabd2 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 1556d82c76..7e959c0155 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 d652e4cd02..31c8baba2c 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 c2ac6e44e2..65ae634ac5 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 c8b1fa4875..d7e86873b7 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 ab7940efd9..bef7821c7c 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 5db693402c..edbb1dfbcb 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 fd0fbf51ac..37ed33b205 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 5f8e89aec2..cb5940779e 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 a309d053e5..668c8fa9b8 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 af24601880..26b5c3b3dc 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 c147288085..4424d1aba7 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 2b931884db..d1f10db2dd 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 66c0b9dec0..f1d53a8859 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 478750439f..b11dcbff9c 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 24c7e0dc68..86fb1f2380 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 745d26ac49..5e62b9ef8d 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/AI.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/AI.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..a393a02f3e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png
new file mode 100644
index 0000000000..b81fb4c222
Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png
new file mode 100644
index 0000000000..3b91539d8e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/AI.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/AI.rsi/meta.json b/Resources/Textures/Objects/Fun/AI.rsi/meta.json
index e5ddb0f4d7..5312d061af 100644
--- a/Resources/Textures/Objects/Fun/AI.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/AI.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..885e8484fe
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png
new file mode 100644
index 0000000000..1f13d528eb
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png
new file mode 100644
index 0000000000..73ca020748
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json
index c26c4da7ce..cbd97acd20 100644
--- a/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/arachnid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by PixelTheKermit (github)",
+    "copyright": "Sprite by PixelTheKermit (github), inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..9dfdff7d09
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png
new file mode 100644
index 0000000000..903b2e68b8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png
new file mode 100644
index 0000000000..bc17747bdf
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json
index e5ddb0f4d7..5312d061af 100644
--- a/Resources/Textures/Objects/Fun/Plushies/atmosian.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/atmosian.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
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 0000000000..7f22ecc21d
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 0000000000..b5399af14b
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 0000000000..234e7c2de0
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 0000000000..d97fd28bba
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 8b92838d06..60d184a0db 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/Fun/Plushies/diona.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..9caf992314
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png
new file mode 100644
index 0000000000..1aff8b0591
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png
new file mode 100644
index 0000000000..015a920f33
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json
index 3843fed26f..4fabeaa69f 100644
--- a/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/diona.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprites by discord user Deos#5630",
+    "copyright": "Sprites by discord user Deos#5630, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -12,6 +12,18 @@
         },
         {
             "name": "plushie_diona1"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..23a8f6b55a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png
new file mode 100644
index 0000000000..cf51e5b5d4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png
new file mode 100644
index 0000000000..7f5f6d4028
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json
index ddeb50c744..0f99a998c3 100644
--- a/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/hampter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by RenLou#4333",
+    "copyright": "Sprite by RenLou#4333, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..944db83589
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png
new file mode 100644
index 0000000000..3ad686c098
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png
new file mode 100644
index 0000000000..e08a9977b1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/human.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json
index 23d0f71a20..ad2be4bd40 100644
--- a/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/human.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by TheShuEd",
+    "copyright": "Sprite by TheShuEd, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png
new file mode 100644
index 0000000000..02153a45dc
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png
new file mode 100644
index 0000000000..b70a213869
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json
index e5ddb0f4d7..04454077ab 100644
--- a/Resources/Textures/Objects/Fun/Plushies/lamp.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/lamp.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,14 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..9e3cb9e197
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png
new file mode 100644
index 0000000000..04de645653
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png
new file mode 100644
index 0000000000..d84670db29
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json
index e5ddb0f4d7..5312d061af 100644
--- a/Resources/Textures/Objects/Fun/Plushies/moth.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/moth.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..f9ae44c187
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png
new file mode 100644
index 0000000000..8374c6d4aa
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png
new file mode 100644
index 0000000000..8374c6d4aa
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json
index e5ddb0f4d7..2962536bce 100644
--- a/Resources/Textures/Objects/Fun/Plushies/narsie.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/narsie.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and neck sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..87a57d085e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png
new file mode 100644
index 0000000000..90220ea0dc
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png
new file mode 100644
index 0000000000..0b69f7b194
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json
index e5ddb0f4d7..5312d061af 100644
--- a/Resources/Textures/Objects/Fun/Plushies/nukie.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/nukie.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..e8c7767680
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png
new file mode 100644
index 0000000000..d5e7743d2c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png
new file mode 100644
index 0000000000..b929a976db
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json
index 95024a5e4a..83191c2a0b 100644
--- a/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/penguin.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by netwy",
+    "copyright": "Sprite by netwy, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..f9349a93e7
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png
new file mode 100644
index 0000000000..64530fd6fd
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png
new file mode 100644
index 0000000000..64530fd6fd
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json
index e5ddb0f4d7..2962536bce 100644
--- a/Resources/Textures/Objects/Fun/Plushies/ratvar.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/ratvar.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and neck sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..1bf687bcc2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png
new file mode 100644
index 0000000000..c37131b84a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png
new file mode 100644
index 0000000000..bdd8b8562d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json
index 5be34bc591..e4d7938e5e 100644
--- a/Resources/Textures/Objects/Fun/Plushies/rouny.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/rouny.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,18 @@
         {
             "name": "icon",
             "directions": 4
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..c218e0dc4c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png
new file mode 100644
index 0000000000..1e30789bde
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png
new file mode 100644
index 0000000000..43d30e2171
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json
index e5ddb0f4d7..5312d061af 100644
--- a/Resources/Textures/Objects/Fun/Plushies/slime.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/slime.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png
new file mode 100644
index 0000000000..b80dd1be4b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/equipped-NECK-vox.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json
index 2db3921089..412a503089 100644
--- a/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/snake.rsi/meta.json
@@ -21,6 +21,10 @@
         {
             "name": "equipped-NECK",
 			"directions": 4
+        },
+        {
+            "name": "equipped-NECK-vox",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..69ffbd6d89
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..0642b4efc0
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png
new file mode 100644
index 0000000000..be3707ce65
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png
new file mode 100644
index 0000000000..3143c99893
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json
index e36a30b200..9ed84dc98b 100644
--- a/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/vox.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by LinkUyx#6557",
+    "copyright": "Sprite by LinkUyx#6557, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,22 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..c60ace3607
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png
new file mode 100644
index 0000000000..a25259b82c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png
new file mode 100644
index 0000000000..ded904dbe3
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json
index e36a30b200..bd583cd1ab 100644
--- a/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/xeno.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by LinkUyx#6557",
+    "copyright": "Sprite by LinkUyx#6557, inhand and helmet sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..e7ae945d84
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..e7ae945d84
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png
new file mode 100644
index 0000000000..281d243a52
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png
new file mode 100644
index 0000000000..b5dc4c4116
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png
new file mode 100644
index 0000000000..706e11ef32
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json b/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json
new file mode 100644
index 0000000000..dfbec476c3
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png
new file mode 100644
index 0000000000..190072658b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png
new file mode 100644
index 0000000000..836570c0f5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/clownrecorder.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json b/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json
index 84dd1f0fa3..9095fe2338 100644
--- a/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json
@@ -1,14 +1,22 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/pull/19710/commits/6fb423d9045d43f04e47770bbf505770f2d7b75a",
+  "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/pull/19710/commits/6fb423d9045d43f04e47770bbf505770f2d7b75a, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "icon"
-    }
+      {
+          "name": "icon"
+      },
+      {
+          "name": "inhand-left",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right",
+          "directions": 4
+      }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png
new file mode 100644
index 0000000000..32497b548a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-base.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png
new file mode 100644
index 0000000000..52215ce9a5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-body.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png
new file mode 100644
index 0000000000..8aaacb9dd1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-trim.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png
new file mode 100644
index 0000000000..a08b69e7c3
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-left-visor.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png
new file mode 100644
index 0000000000..c34bca921d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-base.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png
new file mode 100644
index 0000000000..c10267ea8e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-body.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png
new file mode 100644
index 0000000000..8288a861bd
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-trim.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png
new file mode 100644
index 0000000000..b7241f5085
Binary files /dev/null and b/Resources/Textures/Objects/Fun/mech_figurines.rsi/inhand-right-visor.png differ
diff --git a/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json
index f92464abc6..99a92db005 100644
--- a/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/mech_figurines.rsi/meta.json
@@ -1,47 +1,79 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "deathripley"
-    },
-    {
-      "name": "ripley"
-    },
-    {
-      "name": "fireripley"
-    },
-    {
-      "name": "marauder"
-    },
-    {
-      "name": "mauler"
-    },
-    {
-      "name": "gygax"
-    },
-    {
-      "name": "durand"
-    },
-    {
-      "name": "odysseus"
-    },
-    {
-      "name": "honk"
-    },
-    {
-      "name": "seraph"
-    },
-    {
-      "name": "reticence"
-    },
-    {
-      "name": "phazon"
-    }
+      {
+          "name": "deathripley"
+      },
+      {
+          "name": "ripley"
+      },
+      {
+          "name": "fireripley"
+      },
+      {
+          "name": "marauder"
+      },
+      {
+          "name": "mauler"
+      },
+      {
+          "name": "gygax"
+      },
+      {
+          "name": "durand"
+      },
+      {
+          "name": "odysseus"
+      },
+      {
+          "name": "honk"
+      },
+      {
+          "name": "seraph"
+      },
+      {
+          "name": "reticence"
+      },
+      {
+          "name": "phazon"
+      },
+      {
+          "name": "inhand-left-base",
+          "directions": 4
+      },
+      {
+          "name": "inhand-left-body",
+          "directions": 4
+      },
+      {
+          "name": "inhand-left-trim",
+          "directions": 4
+      },
+      {
+          "name": "inhand-left-visor",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right-base",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right-body",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right-trim",
+          "directions": 4
+      },
+      {
+          "name": "inhand-right-visor",
+          "directions": 4
+      }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png
new file mode 100644
index 0000000000..29c03cb388
Binary files /dev/null and b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png
new file mode 100644
index 0000000000..23dfd5d2ea
Binary files /dev/null and b/Resources/Textures/Objects/Fun/newton_cradle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json b/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json
index 0ff9e80425..b92514703a 100644
--- a/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/newton_cradle.rsi/meta.json
@@ -1,25 +1,85 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/commit/aa7a7b3cee09b313705343a6859658b928a3da03",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/commit/aa7a7b3cee09b313705343a6859658b928a3da03, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "icon-off"
-    },
-    {
-      "name": "icon",
-      "delays": [
-        [
-          0.3,
-          0.1,
-          0.3,
-          0.1
+      {
+          "name": "icon-off"
+      },
+      {
+          "name": "icon",
+          "delays": [
+            [
+              0.3,
+              0.1,
+              0.3,
+              0.1
+            ]
         ]
-      ]
-    }
+      },
+      {
+          "name": "inhand-left",
+          "directions": 4,
+          "delays":[
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ],
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ],
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ],
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ]
+          ]
+      },
+      {
+          "name": "inhand-right",
+          "directions": 4,
+          "delays": [
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ],
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ],
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ],
+              [
+                  0.1,
+                  0.3,
+                  0.1,
+                  0.3
+              ]
+          ]
+      }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png b/Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png
new file mode 100644
index 0000000000..c267627a21
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png differ
diff --git a/Resources/Textures/Objects/Fun/pai.rsi/golden-pai-base.png b/Resources/Textures/Objects/Fun/pai.rsi/golden-pai-base.png
new file mode 100644
index 0000000000..aab9aa3657
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pai.rsi/golden-pai-base.png differ
diff --git a/Resources/Textures/Objects/Fun/pai.rsi/meta.json b/Resources/Textures/Objects/Fun/pai.rsi/meta.json
index f819450aa8..e01d1f92ab 100644
--- a/Resources/Textures/Objects/Fun/pai.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/pai.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/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified. Syndicate variants by fedKotikeD, and potato by Doru991",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified. Syndicate variants by fedKotikeD, and potato by Doru991. Golden pai variant is made from ScrapPAIGold by AsnDen",
   "size": {
     "x": 32,
     "y": 32
@@ -72,6 +72,12 @@
     },
     {
       "name": "potato-searching-overlay"
+    },
+    {
+      "name": "golden-icon-pai-off"
+    },
+    {
+      "name": "golden-pai-base"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png
new file mode 100644
index 0000000000..0dff7f0535
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-body.png differ
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png
new file mode 100644
index 0000000000..5cc26f4de9
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/equipped-HELMET-vis.png differ
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png
new file mode 100644
index 0000000000..db68481440
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-body.png differ
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png
new file mode 100644
index 0000000000..db7fa0e8be
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-left-vis.png differ
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png
new file mode 100644
index 0000000000..520171f621
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-body.png differ
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png
new file mode 100644
index 0000000000..d1f9c4a279
Binary files /dev/null and b/Resources/Textures/Objects/Fun/pequeno.rsi/inhand-right-vis.png differ
diff --git a/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json b/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json
index 7559d254d0..09b795e539 100644
--- a/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/pequeno.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from shiptest at https://github.com/shiptest-ss13/Shiptest/commit/6e13b1f051512b16a2d7b75694b6cd36c7f5efbd, Among Us IP used with respect to policy at https://www.innersloth.com/fan-creation-policy/",
+  "copyright": "Taken from shiptest at https://github.com/shiptest-ss13/Shiptest/commit/6e13b1f051512b16a2d7b75694b6cd36c7f5efbd, Among Us IP used with respect to policy at https://www.innersloth.com/fan-creation-policy/, inhand and helmet sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -12,6 +12,30 @@
         },
         {
             "name": "visor"
+        },
+        {
+            "name": "equipped-HELMET-body",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vis",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-body",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-vis",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-body",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-vis",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png
new file mode 100644
index 0000000000..d41be0a3b5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png
new file mode 100644
index 0000000000..c2de8ad12c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json
index 2b9f6ab0c4..54d3a2ea0c 100644
--- a/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/rubber_chicken.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Sprite by xprospero",
+    "copyright": "Sprite by xprospero, inhands by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,14 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..7d38c22e88
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png
new file mode 100644
index 0000000000..aeb7cc70a3
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png
new file mode 100644
index 0000000000..a91a28080b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_ian.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json
index e5ddb0f4d7..cd301be6be 100644
--- a/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toy_ian.rsi/meta.json
@@ -9,6 +9,18 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png
new file mode 100644
index 0000000000..08499359cc
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png
new file mode 100644
index 0000000000..8b547cd0fa
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_mouse.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json
index f917441a32..1871ac4942 100644
--- a/Resources/Textures/Objects/Fun/toy_mouse.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toy_mouse.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, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), inhands resprited from Mouse inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
@@ -13,6 +13,14 @@
         {
             "name": "equipped-HELMET",
             "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..2de0b5c5ce
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png
new file mode 100644
index 0000000000..7266a1a86d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ae111a3aa
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_nuke.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json
index f61272b0d3..4ea3d80c1d 100644
--- a/Resources/Textures/Objects/Fun/toy_nuke.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toy_nuke.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand and helmet sprites by TiniestShark (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -15,6 +15,18 @@
                     0.2
                 ]
             ]
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png
index b609db734f..4472021307 100644
Binary files a/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json
index 6f1abc4d4f..dcec3a58a3 100644
--- a/Resources/Textures/Objects/Fun/toy_singularity.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toy_singularity.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",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhands by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -18,10 +18,77 @@
                     0.1,
                     0.1,
                     0.1,
-                    0.1,
                     0.1
                 ]
             ]
+        },
+        {
+            "name": "singu-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "singu-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png
new file mode 100644
index 0000000000..951fccd0bb
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png
new file mode 100644
index 0000000000..4314aeb336
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_singularity.rsi/singu-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 9fbad41e48..d49eb61b76 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github). Bananium peel's on-head sprite by FlipBrooke, based on the bananaium peel sprite.",
   "size": {
     "x": 32,
     "y": 32
@@ -193,6 +193,14 @@
     {
       "name": "peel"
     },
+    {
+        "name": "peel-equipped-HELMET",
+        "directions": 4
+    },
+    {
+        "name": "peel-equipped-HELMET-hamster",
+        "directions": 4
+    },
     {
       "name": "phoron_gem_spent"
     },
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..e607cf252f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png
new file mode 100644
index 0000000000..b15646a01f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
index 9ddddd542c..b229184c2a 100644
--- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, inhand sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -9,11 +9,11 @@
   "states": [
     {
         "name": "lampgreen",
-		"directions": 4
+        "directions": 4
     },
     {
         "name": "lampgreen-on",
-		"directions": 4
+        "directions": 4
     },
     {
       "name": "off-inhand-left",
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png
index e936ee2214..9dc387afca 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png
index 2aa9a84475..bd41d68df9 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png
index 22c2c62be5..02153a45dc 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png
index 71d3696007..b70a213869 100644
Binary files a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png and b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png
index bfdd067872..e1fb5e5f62 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index 50dc52c71e..3877787565 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github).",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-left.png
new file mode 100644
index 0000000000..0f1c799ca5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-right.png
new file mode 100644
index 0000000000..af7ee7d3f2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/meta.json b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/meta.json
new file mode 100644
index 0000000000..ab04fbd91d
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Velken. Inhand versions modified from mop sprites from Easypoll. Mopshoes based from Galoshes from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "mopshoes"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Misc/moproach_shoes.rsi/mopshoes.png b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/mopshoes.png
new file mode 100644
index 0000000000..6f4b0215dc
Binary files /dev/null and b/Resources/Textures/Objects/Misc/moproach_shoes.rsi/mopshoes.png differ
diff --git a/Resources/Textures/Objects/Misc/spiderweb.rsi/meta.json b/Resources/Textures/Objects/Misc/spiderweb.rsi/meta.json
deleted file mode 100644
index e89ad66d45..0000000000
--- a/Resources/Textures/Objects/Misc/spiderweb.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/788b2576cd9511ced86e74222b6395fd3ef9affe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "spider_web_1"
-    },
-    {
-      "name": "spider_web_clown_1"
-    },
-    {
-      "name": "spider_web_clown_2"
-    },
-    {
-      "name": "spider_web_2"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_1.png b/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_1.png
deleted file mode 100644
index e86c5ad4a1..0000000000
Binary files a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_2.png b/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_2.png
deleted file mode 100644
index 949dc46083..0000000000
Binary files a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_clown_1.png b/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_clown_1.png
deleted file mode 100644
index e96ed327c8..0000000000
Binary files a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_clown_1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_clown_2.png b/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_clown_2.png
deleted file mode 100644
index 91931c7d8f..0000000000
Binary files a/Resources/Textures/Objects/Misc/spiderweb.rsi/spider_web_clown_2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png
new file mode 100644
index 0000000000..2f29dff1c7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png
new file mode 100644
index 0000000000..0d7d9cf676
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png
new file mode 100644
index 0000000000..6e5e4cd27a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
similarity index 63%
rename from Resources/Textures/Objects/Specific/Chapel/quran.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
index 64d37670f1..c0dd9096bc 100644
--- a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, modified by Terraspark4941",
+  "copyright": "Originally drawn by @Trosling (Discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -20,3 +20,4 @@
     }
   ]
 }
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png
new file mode 100644
index 0000000000..a38632e437
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png
new file mode 100644
index 0000000000..35fc35abf1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png
new file mode 100644
index 0000000000..7e0df50bb5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png
new file mode 100644
index 0000000000..4e24e24ad2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png
new file mode 100644
index 0000000000..4be96c2070
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png
new file mode 100644
index 0000000000..bdf1c5e363
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/quran.rsi/icon.png
deleted file mode 100644
index 0c710e8850..0000000000
Binary files a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-left.png
deleted file mode 100644
index f5c0eca315..0000000000
Binary files a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-right.png
deleted file mode 100644
index bc8b034185..0000000000
Binary files a/Resources/Textures/Objects/Specific/Chapel/quran.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png
new file mode 100644
index 0000000000..f44d122751
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png
new file mode 100644
index 0000000000..35fc35abf1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png
new file mode 100644
index 0000000000..60aba34bbb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png
new file mode 100644
index 0000000000..c04412d52b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png
new file mode 100644
index 0000000000..94fdcc0f20
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png
new file mode 100644
index 0000000000..56c5a517f1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json
new file mode 100644
index 0000000000..c0dd9096bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally drawn by @Trosling (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
index 47289a1341..b2eb3125e9 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png
index e2c84ff57b..f8eb0352e2 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png
index a51d00e482..3a8b36ef1e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
index 9c4e3cc701..6b87ec6d4e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png
index de30ed8ecd..08e01eb9c9 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png
index df50dd92e2..b3be81aff2 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..0f587c924e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png
new file mode 100644
index 0000000000..ac69dd5d60
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json
index be72e24bbc..64523fe470 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json
@@ -1,7 +1,8 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub), On-head sprites by FlipBrooke,.",
     "size": {
         "x": 32,
         "y": 32
@@ -42,6 +43,14 @@
         {
             "name": "baked-peel3"
         },
+        {
+            "name": "baked-peel-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "baked-peel-equipped-HELMET-hamster",
+            "directions": 4
+        },
         {
             "name": "baked-peel-inhand-left",
             "directions": 4
@@ -71,6 +80,14 @@
         {
             "name": "stage-6"
         },
+        {
+            "name": "peel-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "peel-equipped-HELMET-hamster",
+            "directions": 4
+        },
         {
             "name": "produce-inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..e01ef05a5d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png
new file mode 100644
index 0000000000..225f0db6da
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png
index 9aa160ec98..147567b052 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png
index 23be44f469..162e668517 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
index b1afd4b72d..974b3afff0 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png
index fcb9d0de5e..61023cb489 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png
index aebaa93515..0167604000 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/dead.png
new file mode 100644
index 0000000000..eb068364b5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/harvest.png
new file mode 100644
index 0000000000..d02cb9ce15
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/meta.json
new file mode 100644
index 0000000000..79a691f5a6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Made by Thinbug for space station 14 :33",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "dead"
+        },
+        {
+            "name": "harvest"
+        },
+        {
+            "name": "produce"
+        },
+        {
+            "name": "produce-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "produce-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "seed"
+        },
+        {
+            "name": "stage-1"
+        },
+        {
+            "name": "stage-2"
+        },
+        {
+            "name": "stage-3"
+        },
+        {
+            "name": "stage-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-left.png
new file mode 100644
index 0000000000..44094d23e4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-right.png
new file mode 100644
index 0000000000..d5955e0196
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce.png
new file mode 100644
index 0000000000..53cd9e2f9a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/seed.png
new file mode 100644
index 0000000000..c370b26cf5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-1.png
new file mode 100644
index 0000000000..283c44be21
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-2.png
new file mode 100644
index 0000000000..5362406d00
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-3.png
new file mode 100644
index 0000000000..c4947b625c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-4.png
new file mode 100644
index 0000000000..9fa575c033
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
index b1afd4b72d..974b3afff0 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png
index 26d1be589c..f031830af9 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png
index 1358899281..a4fe914276 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
index e8994282cd..5822217677 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png
index 26035cc79b..d052b3cf10 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png
index eedee61f40..a554c30631 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
index d6374a3793..a43d18e6fd 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png
index 333b7a1db6..a501d6acde 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png
index 2ba546c055..5b7091c18b 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
index f7affdef4c..5bb785b97e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png
index 5b30fba7d8..c741b9ff64 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png
index 0722440afd..13b5762c20 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
index f7d57e59d0..c5665a460a 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), produce modified from https://github.com/space-wizards/space-station-14/commit/484eb0bba44d3e014873e7d7026a99d7ba56f7b9#diff-5b9a7a38ef618b5f482f5baf4bb8db27dc87f9af7602d67cae9133e624aa3f91 by Chaoticaa (GitHub), Growth, harvest, and dead created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), produce modified from https://github.com/space-wizards/space-station-14/commit/484eb0bba44d3e014873e7d7026a99d7ba56f7b9#diff-5b9a7a38ef618b5f482f5baf4bb8db27dc87f9af7602d67cae9133e624aa3f91 by Chaoticaa (GitHub), Growth, harvest, and dead created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png
index 3af8c810fa..125d8caebe 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png
index c1bb4508ed..88ba50ee1e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
index c6b8930b4e..c2bddfac98 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), produce created by Chaoticaa (GitHub), Growth stages, harvest, and dead modified by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhands by mubururu_ (github), produce created by Chaoticaa (GitHub), Growth stages, harvest, and dead modified by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png
index fe84056f95..9e9fc50746 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png
index 588dca2f4f..5b9abe178e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
index 9c4e3cc701..6b87ec6d4e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png
index fc13545587..34e30be1bf 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png
index b8e6333def..dda80e802d 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
index be6a0f367c..e73e83cd39 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands by mubururu_ (github)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands by mubururu_ (github), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png
index fbfb1453cd..c086e3acac 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png
index 6ec6fcc745..eea7e61c34 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
index 026589b450..b21d2f2bfa 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), produce sprite modified by Chaoticaa (GitHub), Growth stages, harvest, and dead sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), produce sprite modified by Chaoticaa (GitHub), Growth stages, harvest, and dead sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png
index b969a2e201..f4864f288e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png
index 2fc31a58a2..d1c40609de 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
index 4c84d306f8..7c5a58be82 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.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/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png
index cbb98daec0..b561223098 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png
index dd517d4301..bb80c91a1c 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
index ea94e38df7..67057449a1 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png
index 41fcbe7010..d3c9fc1f57 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png
index 8f5898154b..2b821daa69 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
index ea94e38df7..67057449a1 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png
index d93bcdcbe3..de8f416ca0 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png
index e8041c2925..c2a66617f5 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
index c4233795e8..e4e8d4aad6 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by slarticodefast, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png
index 9977b5564e..015a110db7 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png
index 49e5bc92b6..26f0b95401 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..16c89bff2b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..842e1c02e9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json
index 25ec879674..9bc2def611 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github). Mimana peel on-head sprite by FlipBrooke, based on the mimana item sprite.",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,14 @@
         {
             "name": "dead"
         },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-hamster",
+            "directions": 4
+        },
         {
             "name": "harvest"
         },
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json
index 1ff69a9dbb..477a0e1aac 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -36,6 +36,14 @@
     },
     {
       "name": "stage-6"
+    },
+    {
+      "name": "produce-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "produce-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png
new file mode 100644
index 0000000000..d85fc9b6f7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png
new file mode 100644
index 0000000000..86101df3e7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json
index 9b816e9c2c..d2f06f1abd 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png
index 73b95de513..b27f456904 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png
index a5674e38fe..9fe779b9f3 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
index 21e0530172..eadabf6bb1 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), seed modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-6b89a02e399bc4dd9c50c16ad274a353a92c8a0f462083fab0c1e5045d957ad2 by Chaoticaa (GitHub), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), seed modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-6b89a02e399bc4dd9c50c16ad274a353a92c8a0f462083fab0c1e5045d957ad2 by Chaoticaa (GitHub), slice modified from https://github.com/space-wizards/space-station-14/pull/3436/files#diff-65d1e265b787136da82b8e8b56ede11fdb879c31f9d14b4236d33a9a89d6a815 by Chaoticaa (GitHub), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png
index eb2433df4f..de343133f0 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png
index 631cb579f8..75ff15179e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
index de4ed6fbe0..369affc8fd 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), seed.png modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-1ee24e9bb4023f490a3f87c861b65e459bd3fda10e688471cdf72b8a8aab381b by Chaoticaa (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), seed.png modified from https://github.com/space-wizards/space-station-14/pull/23210/files#diff-1ee24e9bb4023f490a3f87c861b65e459bd3fda10e688471cdf72b8a8aab381b by Chaoticaa (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png
index 7ed63766ce..d67415c4bf 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png
index d2b4672d04..12b6e14c8a 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
index 012feb5906..9129d5c165 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/pea.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/a5e6db8f99b436b643bd3b76fa131ac074dfd856, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856, inhands by mubururu_ (github), Growth, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png
index 031838f8b8..5959966d1f 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png
index ec0da4c5ee..455d5e4e52 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json
index 19bce5327f..56f9d1820d 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/31012/commits/f840c12356368798ab2dbe7de8232ed8181d29d6#diff-2ca7537b4a0f25517344be1d3a98d6cc33a3176c0af385bc5882b96d77afc64d by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/31012/commits/f840c12356368798ab2dbe7de8232ed8181d29d6#diff-2ca7537b4a0f25517344be1d3a98d6cc33a3176c0af385bc5882b96d77afc64d by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png
index 073fb84097..bfeb6505ae 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png
index 8614972430..d47a011c3d 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
index 3d679a29ad..aeb8752af5 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, dead, harvest, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, dead, harvest, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png
index e00ffb663e..bac5e614c8 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png
index 22b0343762..ae062a722c 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json
index dbbf0cdad9..a4c78d04f8 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png
index 3b2e5fbbac..06f12bd335 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png
index 46eccd1fbf..433be8703f 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
index 7c890d6313..c358b5eb91 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce sprites created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png
index 249620539d..6b3cbc836e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png
index 9dcc51d373..5b7f50e976 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
index 5b56a84b55..2e37fa931e 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/14587/files#diff-3d6e5b157c429de7aa62396e8677d0a2fab073a2d6d6e796af4931cb8d979330 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce sprites Created by Chaoticaa (GitHub)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3, inhands by mubururu_ (github), slice.png modified from https://github.com/space-wizards/space-station-14/pull/14587/files#diff-3d6e5b157c429de7aa62396e8677d0a2fab073a2d6d6e796af4931cb8d979330 by Chaoticaa (GitHub), Growth stages, harvest, dead, and produce sprites Created by Chaoticaa (GitHub),",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index e4604b165f..e138281ef6 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 0000000000..149f3e864f
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 0000000000..17ee679df8
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 0000000000..13988bf1c4
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 2fcd334348..7e5a11d313 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 TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/pull/970/commits/6f0a020e35a78b997420ca8ffff2c1de4bad3428",
+    "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/Specific/Janitorial/wirebrush.rsi/icon.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png
new file mode 100644
index 0000000000..cd46d03a5c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png
new file mode 100644
index 0000000000..0f0cb615da
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png
new file mode 100644
index 0000000000..5923223a3a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
new file mode 100644
index 0000000000..4a9131da5e
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites by TiniestShark (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png
new file mode 100644
index 0000000000..36997e2cd8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/wirebrush.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-clown-adv.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-clown-adv.png
new file mode 100644
index 0000000000..fa925395f1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-clown-adv.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak2.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak2.png
new file mode 100644
index 0000000000..77819e93e8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak2.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index c4dd2cdc71..21734f4104 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -37,6 +37,9 @@
         {
             "name": "icon-clown"
         },
+        {
+            "name": "icon-clown-adv"
+        },
         {
             "name": "icon-construction"
         },
@@ -115,6 +118,9 @@
         {
             "name": "icon-xenoborg-cloak"
         },
+        {
+            "name": "icon-xenoborg-cloak2"
+        },
         {
             "name": "icon-xenoborg-fire-extinguisher"
         },
@@ -174,10 +180,10 @@
         },
         {
             "name": "xenoborg_engi"
-        }, 
+        },
         {
             "name": "xenoborg_generic"
-        }, 
+        },
         {
             "name": "xenoborg_heavy"
         },
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..cffc54a19f
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/meta.json
index d57c3cdf00..21aae85629 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/meta.json
@@ -1,59 +1,67 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-on",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-BACKPACK",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "icon-on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK-dog",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..cffc54a19f
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..96ca985b87
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/meta.json
index d57c3cdf00..21aae85629 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/meta.json
@@ -1,59 +1,67 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-on",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-BACKPACK",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "icon-on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK-dog",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..96ca985b87
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..6206f08e2b
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-SUITSTORAGE-dog.png
new file mode 100644
index 0000000000..6206f08e2b
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-SUITSTORAGE-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json
index 2adfbbc375..20c6ca8d87 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json
@@ -1,85 +1,101 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-on",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-BACKPACK",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-SUITSTORAGE",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "icon-on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-SUITSTORAGE-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-SUITSTORAGE",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..2e68fd90c1
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-SUITSTORAGE-dog.png
new file mode 100644
index 0000000000..2e68fd90c1
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-SUITSTORAGE-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..a0717cb598
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-SUITSTORAGE-dog.png
new file mode 100644
index 0000000000..a0717cb598
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-SUITSTORAGE-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json
index 00e4504a32..002b5c23a6 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json
@@ -1,94 +1,110 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, inhand-left and inhand-right by SlamBamActionman (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, inhand-left and inhand-right by SlamBamActionman (Github). Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-on",
-      "directions": 1,
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-BACKPACK",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.2,
-          0.1
-        ],
-        [
-          0.5,
-          0.2,
-          0.1
-        ],
-        [
-          0.5,
-          0.2,
-          0.1
-        ],
-        [
-          0.5,
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-SUITSTORAGE",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.2,
-          0.1
-        ],
-        [
-          0.5,
-          0.2,
-          0.1
-        ],
-        [
-          0.5,
-          0.2,
-          0.1
-        ],
-        [
-          0.5,
-          0.2,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "icon-on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.5,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-SUITSTORAGE",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.5,
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-SUITSTORAGE-dog",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..a0717cb598
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-SUITSTORAGE-dog.png
new file mode 100644
index 0000000000..a0717cb598
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-SUITSTORAGE-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..b430547573
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/meta.json
index d57c3cdf00..21aae85629 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/meta.json
@@ -1,59 +1,67 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-on",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-BACKPACK",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "icon-on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK-dog",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..b430547573
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..8e2079b6ff
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-SUITSTORAGE-dog.png
new file mode 100644
index 0000000000..8e2079b6ff
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-SUITSTORAGE-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
index 41bdc98958..0da7ac8f53 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
@@ -1,49 +1,65 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser. Dog states modified from base states by Sparlight (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-on",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "icon-on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-BACKPACK-dog",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE-dog",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-SUITSTORAGE-dog",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK-dog.png
new file mode 100644
index 0000000000..46c3d7d809
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-SUITSTORAGE-dog.png
new file mode 100644
index 0000000000..46c3d7d809
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-SUITSTORAGE-dog.png differ
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 0000000000..2f8e257064
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 0000000000..4a4ad2baba
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 0000000000..bde15f9859
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 3902610d15..749093b344 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 0000000000..4300d7f162
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 0000000000..7004a2f817
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 0000000000..07cf925c79
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 0000000000..7b01e4de4b
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 0000000000..73e08b50b1
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 0000000000..fdf5d3c9bf
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 0000000000..1d40414305
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 0000000000..08b6a5530f
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 0000000000..ac32ff3d9b
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png
new file mode 100644
index 0000000000..8cbb46a486
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png
new file mode 100644
index 0000000000..522e824444
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..06ba07691a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png
new file mode 100644
index 0000000000..9ab79bd56c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..0b00575beb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png
new file mode 100644
index 0000000000..b377a18e30
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png
new file mode 100644
index 0000000000..f880edd1ba
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png
new file mode 100644
index 0000000000..bd2ed7245d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/centcomm.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png
new file mode 100644
index 0000000000..09c049be71
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png
new file mode 100644
index 0000000000..7e42de6708
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..fa7ec883cc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png
new file mode 100644
index 0000000000..b5d1bf1dca
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..a68c0a2700
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png
new file mode 100644
index 0000000000..e0d0523d19
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png
new file mode 100644
index 0000000000..3feed530a0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png
new file mode 100644
index 0000000000..c85c170e41
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/cybersun.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png
new file mode 100644
index 0000000000..f51100448d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png
new file mode 100644
index 0000000000..c71349d413
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..9278dc5dff
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png
new file mode 100644
index 0000000000..757145f7d3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..a187ed00a6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png
new file mode 100644
index 0000000000..3b562db5d8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png
new file mode 100644
index 0000000000..d6c974dc13
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png
new file mode 100644
index 0000000000..d13c017afc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/donkco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png
new file mode 100644
index 0000000000..2e0163da82
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox-open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png
new file mode 100644
index 0000000000..c7a5e3adc8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png
new file mode 100644
index 0000000000..c405eefdc1
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox1.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png
new file mode 100644
index 0000000000..4de5da1a84
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox2.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png
new file mode 100644
index 0000000000..2988c62f20
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/matchbox3.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json
new file mode 100644
index 0000000000..680ad98afd
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/gorlex.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept, modified again my Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "matchbox"
+        },
+        {
+            "name": "matchbox-open"
+        },
+        {
+            "name": "matchbox1"
+        },
+        {
+            "name": "matchbox2"
+        },
+        {
+            "name": "matchbox3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png
new file mode 100644
index 0000000000..b96ee2798b
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png
new file mode 100644
index 0000000000..0b95e021ea
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/lit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png
new file mode 100644
index 0000000000..6ad8d07b4f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_burnt.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png
new file mode 100644
index 0000000000..fc9082ef63
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png
new file mode 100644
index 0000000000..03cf76dc95
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/match_unlit.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
similarity index 55%
rename from Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
rename to Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
index c4b27b734f..21146fe6f7 100644
--- a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/meta.json
@@ -1,48 +1,19 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept, modified again my Smugman",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "on-equipped-NECK",
-      "directions": 4,
+      "name": "match_burnt"
+    },
+    {
+      "name": "match_lit",
       "delays": [
         [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
           0.2,
           0.2,
           0.2
@@ -50,22 +21,67 @@
       ]
     },
     {
-      "name": "off-equipped-NECK",
+      "name": "match_unlit"
+    },
+    {
+      "name": "unlit-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "unlit-inhand-right",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+      "name": "lit-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
     },
     {
-      "name": "icon"
-    },
-    {
-      "name": "icon-on"
+      "name": "lit-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png
new file mode 100644
index 0000000000..c44c1aa92f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png
new file mode 100644
index 0000000000..93f169c701
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/gorlexmatch.rsi/unlit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png
new file mode 100644
index 0000000000..a1d8633d37
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png
new file mode 100644
index 0000000000..b63dbcf1e6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..933b7799c6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png
new file mode 100644
index 0000000000..2136e54995
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..b83092589f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ef4b94da3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json
new file mode 100644
index 0000000000..131fb44e54
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Banana sprites Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, modified by smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png
new file mode 100644
index 0000000000..6cdfc629af
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png
new file mode 100644
index 0000000000..c512c689ff
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/honkco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png
new file mode 100644
index 0000000000..07ca237d2f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png
new file mode 100644
index 0000000000..24e9fd559f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..b3ce960417
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png
new file mode 100644
index 0000000000..be1974a6ad
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..d1fb5e1cbd
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png
new file mode 100644
index 0000000000..6067152323
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png
new file mode 100644
index 0000000000..c4129e2d54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png
new file mode 100644
index 0000000000..635a525fd0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/interdyne.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-1.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-1.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-10.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-10.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-11.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-11.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-2.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-2.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-3.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-3.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-4.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-4.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-5.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-5.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-6.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-6.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-7.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-7.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-8.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-8.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_base-9.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_base-9.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/basic_icon_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/basic_icon_top.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/cheap_icon_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/cheap_icon_top.png
diff --git a/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png
new file mode 100644
index 0000000000..43c9a0d692
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/discount_icon_base.png differ
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/icon_map.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/icon_map.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-left.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/inhand-right.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/lighter_flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/lighter_flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
similarity index 97%
rename from Resources/Textures/Objects/Tools/lighters.rsi/meta.json
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
index dc7218c024..acda832cd7 100644
--- a/Resources/Textures/Objects/Tools/lighters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/meta.json
@@ -55,6 +55,9 @@
     {
       "name": "basic_icon_base-11"
     },
+    {
+      "name": "discount_icon_base"
+    },
     {
       "name": "basic_icon_top"
     },
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-left.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-left.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right-flame.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right-flame.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo-inhand-right.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo-inhand-right.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_engraved_open.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_engraved_open.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_icon_base.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_icon_base.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_open.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_open.png
diff --git a/Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png b/Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png
similarity index 100%
rename from Resources/Textures/Objects/Tools/lighters.rsi/zippo_top.png
rename to Resources/Textures/Objects/Tools/Lighters/lighters.rsi/zippo_top.png
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png
new file mode 100644
index 0000000000..672b227a33
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png
new file mode 100644
index 0000000000..69bc5a430d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..1e7ac493e6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png
new file mode 100644
index 0000000000..fc020ae679
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..764a11d2e7
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png
new file mode 100644
index 0000000000..a0fd6c89fa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png
new file mode 100644
index 0000000000..ba402299de
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png
new file mode 100644
index 0000000000..b077dc0c54
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/nanotrasen.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png
new file mode 100644
index 0000000000..d5fcd20d70
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png
new file mode 100644
index 0000000000..fb49555576
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..6e6684d3bb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png
new file mode 100644
index 0000000000..469e7cbbc2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..98d43ac3ab
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png
new file mode 100644
index 0000000000..64d1228a53
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json
new file mode 100644
index 0000000000..8eae2b3c96
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png
new file mode 100644
index 0000000000..e8fa3c5384
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png
new file mode 100644
index 0000000000..bec9ed6658
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/spiderclan.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png
new file mode 100644
index 0000000000..5470befe66
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png
new file mode 100644
index 0000000000..ada45562e8
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..6133b7ee91
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png
new file mode 100644
index 0000000000..eac5453ddc
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..5803b6ac4d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png
new file mode 100644
index 0000000000..87f8e02641
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json
new file mode 100644
index 0000000000..3956e09beb
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by JustAnOrange",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png
new file mode 100644
index 0000000000..2a080a846d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png
new file mode 100644
index 0000000000..0afe86a673
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/syndielighter.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png
new file mode 100644
index 0000000000..a1d8633d37
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png
new file mode 100644
index 0000000000..d2f7da1054
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png
new file mode 100644
index 0000000000..babefd898d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png
new file mode 100644
index 0000000000..1377b2b5f0
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png
new file mode 100644
index 0000000000..b3c4fee202
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right-lit.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png
new file mode 100644
index 0000000000..d65d20864c
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json
new file mode 100644
index 0000000000..06feadad57
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites Created by Smugman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "top"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-lit",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-lit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png
new file mode 100644
index 0000000000..908575e640
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png
new file mode 100644
index 0000000000..ba0bae895a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Lighters/waffleco.rsi/top.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-left.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-left.png
new file mode 100644
index 0000000000..d81e805bb2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-right.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-right.png
new file mode 100644
index 0000000000..b4083c87e1
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo.png
new file mode 100644
index 0000000000..ca64c2a758
Binary files /dev/null and b/Resources/Textures/Objects/Tools/spray_painter.rsi/ammo.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
index bf3da7cc0d..14af840638 100644
--- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
@@ -1,22 +1,33 @@
 {
-   "copyright" : "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3866dabea8ba6c31115e661b852601cc099e0136",
-   "license" : "CC-BY-SA-3.0",
-   "size" : {
-      "x" : 32,
-      "y" : 32
-   },
-   "states" : [
-      {
-         "name" : "spray_painter"
-      },
-      {
-          "name": "inhand-left",
-          "directions": 4
-      },
-      {
-          "name": "inhand-right",
-          "directions": 4
-      }
-   ],
-   "version" : 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8, Inhand sprites by onesch, ammo by Paradoxmi (Discord).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "spray_painter"
+        },
+        {
+            "name": "ammo"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ammo-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "ammo-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png
index 07785ce832..81815fa4e7 100644
Binary files a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png and b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png
index 426106d046..1856cc3fe5 100644
Binary files a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
index 664e16d42c..5a890d67d5 100644
--- a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
@@ -1,23 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon from potato.rsi & modified activated by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "activated",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+      "name": "icon"
+        },
+        {
+            "name": "activated",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/base.png
index 5833e7876a..8a94ea7a87 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/icon.png
index f3cba12470..bbd544a394 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png
index 36ef0cea02..9c47712c1b 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png
index c456d45dcb..2b59b5aa0a 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png
index 216d3e5cad..e6caa1505f 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png
index 699a7fca0e..bb35769910 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png
index 9c22c69c87..33bbdc9573 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png
index ec7a57e2aa..b5c4f10b33 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png
index c65dfdd7f4..8aa9acf43f 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-left.png
new file mode 100644
index 0000000000..b11cd62b30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-right.png
new file mode 100644
index 0000000000..39f1a90079
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
index 54fc2938ce..fc09537d25 100644
--- a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
@@ -1,31 +1,39 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/a39e3f3f1f351e3be5ae955c4de3a2e8889e191b",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "holstered"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Assets taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/a39e3f3f1f351e3be5ae955c4de3a2e8889e191b. inhand-left, inhand-right by K-Dynamic (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "notholstered"
-    },
-    {
-      "name": "base",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "holstered"
+        },
+        {
+            "name": "notholstered"
+        },
+        {
+            "name": "base",
+            "delays": [
+                [
+                0.1,
+                0.1,
+                0.1,
+                0.1
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png
index b2c7e52a70..02a12ea098 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png
index 7a48b32a64..4b5b9655ca 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
index 4b0e50c2b3..953ebd6302 100644
--- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png
index 5bbca8145b..ff711b9c01 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png
index 9a8c51b0f9..cd669ea293 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png
index 24ef4fba47..dc5f5b5596 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png
index 824bf4ceb4..2df0f7129b 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
index f0a41ab20d..3ef8cec9bd 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1",
+    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1, Inhands modified by Seam_Lesss (Github)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png
index c5742e680e..9a477b4e9e 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png
index 63a7746596..c1dbb0353c 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png
index 1a9491cc70..d5b82d18cf 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png
index 7340d6c907..afe79fa637 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
index 6ac14bfc8f..270c54ea50 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, Inhands modified by Seam_Lesss (Github)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png
new file mode 100644
index 0000000000..98b6035cd4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png
new file mode 100644
index 0000000000..fbae7fe0a5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..27623042f0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..27623042f0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png
new file mode 100644
index 0000000000..be1c0fa741
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png
new file mode 100644
index 0000000000..d97f979499
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png
new file mode 100644
index 0000000000..ac6ddf2c2f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png
new file mode 100644
index 0000000000..72bff64d38
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json
new file mode 100644
index 0000000000..1dbe2d8be5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited for Space Station 14 by august-sun (GitHub)/augustsun (Discord).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "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/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..33a453e193
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..cf41396465
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png
index 19b587bfa5..118ccba12a 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png
index 0b2339a43b..2f358e4cfb 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
index 2ff87fa291..60466c4d2f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png
index 7aae1442fa..678381d3e7 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png
index cbd5194862..e2bc096fbc 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
index 66f9e56c3b..f5a433a323 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png
new file mode 100644
index 0000000000..eeab79f154
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png
new file mode 100644
index 0000000000..416958f47a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 0000000000..416958f47a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000..fd742402be
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000..cce29feaca
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index e4f1ef8dd8..c9436ead7b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244. Reagent fill sprites by RedBookcase on Github.",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "base1"
+        },
         {
             "name": "bolt-open"
         },
@@ -17,25 +20,49 @@
             "name": "inhand-left",
             "directions": 4
         },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
         {
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left-fill-1",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-right-fill-1",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-backpack-fill-1",
+            "directions": 4
+        },
         {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "equipped-suitstorage-fill-1",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 0000000000..c2e86175da
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 0000000000..2f37e17487
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
index 564552ccfa..d22ea9b629 100644
--- a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441",
+  "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll, vertical icon sprite by TiniestShark",
   "size": {
       "x": 32,
       "y": 32
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+     {
+      "name": "storage"
+     },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png
new file mode 100644
index 0000000000..eac5bb8b4d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
index 5b19648740..d435ae235f 100644
--- a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia, in-hands by SeamLesss (GitHub)",
+    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia, in-hands by SeamLesss (GitHub), vertical icon sprite by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "storage"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png
new file mode 100644
index 0000000000..6148f3943e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png
new file mode 100644
index 0000000000..de4d7464b3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png
new file mode 100644
index 0000000000..1b40dcead8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png
new file mode 100644
index 0000000000..5cb35c758f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..3d344d5a7a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..0225536fcf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png
new file mode 100644
index 0000000000..3ec82b7eba
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png
new file mode 100644
index 0000000000..5dc2b7a9dc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png
new file mode 100644
index 0000000000..8167b11d60
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..ac06155cf4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..97746848d3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png
new file mode 100644
index 0000000000..6b72ff66f0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png
new file mode 100644
index 0000000000..aebfbf90e1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png
new file mode 100644
index 0000000000..285aa5541a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..2bec441eb6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..069f7b670c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png
new file mode 100644
index 0000000000..2b989d4377
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png
new file mode 100644
index 0000000000..37c5475b2a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png
new file mode 100644
index 0000000000..85141438af
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..0e2843d85b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..18929e8323
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png
new file mode 100644
index 0000000000..abb71c7476
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png
new file mode 100644
index 0000000000..4a6f784d2d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png
new file mode 100644
index 0000000000..7388db8476
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json
new file mode 100644
index 0000000000..8bfbd3140d
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart, inspiration from ps3moira#9488 on discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..c7cd397457
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..1fbea1b96d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png
new file mode 100644
index 0000000000..f73eb51293
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png
new file mode 100644
index 0000000000..bed0d999c0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png
new file mode 100644
index 0000000000..06c7c32cc4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json
index 2d2663c158..307cb4bb4a 100644
--- a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3",
+  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, card shield sprites by TaoNewt (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -51,6 +51,18 @@
       "name": "ratvarian-inhand-left",
       "directions": 4
     },
+    {
+      "name": "cardshield-icon"
+    },
+    {
+      "name": "cardshield-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "cardshield-inhand-left",
+      "directions": 4
+    },
+
     {
       "name": "mirror-icon",
       "delays": [
diff --git a/Resources/Textures/Parallaxes/XenoParallaxNeb.png b/Resources/Textures/Parallaxes/XenoParallaxNeb.png
index aac1b4c2e8..ba0ccfa7f6 100644
Binary files a/Resources/Textures/Parallaxes/XenoParallaxNeb.png and b/Resources/Textures/Parallaxes/XenoParallaxNeb.png differ
diff --git a/Resources/Textures/Parallaxes/XenoParallaxNeb.png.yml b/Resources/Textures/Parallaxes/XenoParallaxNeb.png.yml
new file mode 100644
index 0000000000..33ec7fbea5
--- /dev/null
+++ b/Resources/Textures/Parallaxes/XenoParallaxNeb.png.yml
@@ -0,0 +1,3 @@
+preload: false
+sample:
+  filter: true
diff --git a/Resources/Textures/Parallaxes/attributions.yml b/Resources/Textures/Parallaxes/attributions.yml
index 131e096862..ec4b2d8e05 100644
--- a/Resources/Textures/Parallaxes/attributions.yml
+++ b/Resources/Textures/Parallaxes/attributions.yml
@@ -3,7 +3,7 @@
   copyright: "by Adipemdragon for tgstation, taken at commit 3839e860a7f3102b1488285d3319f61bbfe1fa51 from parallax.dmi"
   source: "https://github.com/tgstation/tgstation"
 
-- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png"]
+- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png", "purple_nebula.png"]
   license: "CC0-1.0"
   copyright: "adapted from Screaming Brain Studios"
   source: "https://opengameart.org/content/seamless-space-backgrounds"
@@ -32,3 +32,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "Made by SlamBamActionman"
   source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Textures/Parallaxes/space_map3.png"
+
+- files: [ "layer1.png", "layer2.png", "layer3.png" ]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TGstation13"
+  source: "https://github.com/tgstation/tgstation/blob/bce9afc2cf39c229f2799c6ad2124f4d69a2dbbf/icons/effects/parallax.dmi"
diff --git a/Resources/Textures/Parallaxes/layer2.png b/Resources/Textures/Parallaxes/layer2.png
new file mode 100644
index 0000000000..43443fa045
Binary files /dev/null and b/Resources/Textures/Parallaxes/layer2.png differ
diff --git a/Resources/Textures/Parallaxes/layer2.png.yml b/Resources/Textures/Parallaxes/layer2.png.yml
new file mode 100644
index 0000000000..a2cfb0a1fe
--- /dev/null
+++ b/Resources/Textures/Parallaxes/layer2.png.yml
@@ -0,0 +1 @@
+preload: false
diff --git a/Resources/Textures/Parallaxes/layer3.png b/Resources/Textures/Parallaxes/layer3.png
new file mode 100644
index 0000000000..ca5589e7fe
Binary files /dev/null and b/Resources/Textures/Parallaxes/layer3.png differ
diff --git a/Resources/Textures/Parallaxes/layer3.png.yml b/Resources/Textures/Parallaxes/layer3.png.yml
new file mode 100644
index 0000000000..a2cfb0a1fe
--- /dev/null
+++ b/Resources/Textures/Parallaxes/layer3.png.yml
@@ -0,0 +1 @@
+preload: false
diff --git a/Resources/Textures/Parallaxes/meta.json b/Resources/Textures/Parallaxes/meta.json
deleted file mode 100644
index cacbbf2659..0000000000
--- a/Resources/Textures/Parallaxes/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/effects/parallax.dmi.",
-  "size": {
-    "x": 480,
-    "y": 480
-  },
-  "states": [
-    {
-      "name": "layer1"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Parallaxes/purple_nebula.png b/Resources/Textures/Parallaxes/purple_nebula.png
new file mode 100644
index 0000000000..f4d187b7a1
Binary files /dev/null and b/Resources/Textures/Parallaxes/purple_nebula.png differ
diff --git a/Resources/Textures/Parallaxes/space_map2.png b/Resources/Textures/Parallaxes/space_map2.png
index d4e69b6a5b..b7af98b0c1 100644
Binary files a/Resources/Textures/Parallaxes/space_map2.png and b/Resources/Textures/Parallaxes/space_map2.png differ
diff --git a/Resources/Textures/Parallaxes/space_map2.png.yml b/Resources/Textures/Parallaxes/space_map2.png.yml
index a2cfb0a1fe..33ec7fbea5 100644
--- a/Resources/Textures/Parallaxes/space_map2.png.yml
+++ b/Resources/Textures/Parallaxes/space_map2.png.yml
@@ -1 +1,3 @@
 preload: false
+sample:
+  filter: true
diff --git a/Resources/Textures/Parallaxes/space_map3.png b/Resources/Textures/Parallaxes/space_map3.png
index f71781f609..492283118c 100644
Binary files a/Resources/Textures/Parallaxes/space_map3.png and b/Resources/Textures/Parallaxes/space_map3.png differ
diff --git a/Resources/Textures/Parallaxes/space_map3.png.yml b/Resources/Textures/Parallaxes/space_map3.png.yml
new file mode 100644
index 0000000000..33ec7fbea5
--- /dev/null
+++ b/Resources/Textures/Parallaxes/space_map3.png.yml
@@ -0,0 +1,3 @@
+preload: false
+sample:
+  filter: true
diff --git a/Resources/Textures/Shaders/radial_blur.swsl b/Resources/Textures/Shaders/radial_blur.swsl
index f3224ce06c..55a89c31b4 100644
--- a/Resources/Textures/Shaders/radial_blur.swsl
+++ b/Resources/Textures/Shaders/radial_blur.swsl
@@ -4,11 +4,13 @@ const highp int SampleCount = 10; // a higher number makes the shader look bette
 
 // a simple radial blur
 void fragment() {
-    highp vec2 uv = FRAGCOORD.xy * SCREEN_PIXEL_SIZE.xy;
-    highp vec2 direction = vec2(0.5, 0.5) - uv;
+    highp vec3 col = texture(SCREEN_TEXTURE, UV).xyz;
+    highp vec4 color = zTexture(UV);
+    highp vec2 direction = vec2(0.5, 0.5) - UV;
     for (int i=1; i <= SampleCount; i++)
     {
-        COLOR += zTextureSpec(SCREEN_TEXTURE, uv + float(i) * Strength / float(SampleCount) * direction);
+        col += zTextureSpec(SCREEN_TEXTURE, UV + float(i) * Strength / float(SampleCount) * direction).xyz;
     }
-    COLOR = COLOR / float(SampleCount);
+    col = col / float(SampleCount);
+    COLOR = vec4(vec3(col), color.a);
 }
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png
new file mode 100644
index 0000000000..442e1df8b6
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png
new file mode 100644
index 0000000000..bc769ff0df
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json
new file mode 100644
index 0000000000..d50a2a8397
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "closed",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "closing",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png
new file mode 100644
index 0000000000..c773a61cd1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png
new file mode 100644
index 0000000000..c26d93225e
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..f165ae6673
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..842e29f0f3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..2975c479be
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..842e29f0f3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..7ecec5ee70
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..3fd87a6de3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..7ecec5ee70
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..a6e84b4d43
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png
new file mode 100644
index 0000000000..43fbf2fbe7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json
new file mode 100644
index 0000000000..b67903f65e
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "full"
+        },
+        {
+            "name": "carpet_0",
+            "directions": 4
+        },
+        {
+            "name": "carpet_1",
+            "directions": 4
+        },
+        {
+            "name": "carpet_2",
+            "directions": 4
+        },
+        {
+            "name": "carpet_3",
+            "directions": 4
+        },
+        {
+            "name": "carpet_4",
+            "directions": 4
+        },
+        {
+            "name": "carpet_5",
+            "directions": 4
+        },
+        {
+            "name": "carpet_6",
+            "directions": 4
+        },
+        {
+            "name": "carpet_7",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png
new file mode 100644
index 0000000000..dde5d4d9c7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json
new file mode 100644
index 0000000000..1f73612ec2
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Sprites by TaoNewt (github)",
+	"states": [
+		{
+		"name": "full",
+		"delays": [
+			[
+			1
+			]
+		]
+		},
+		{
+		"name": "state_0",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_1",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_2",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_3",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_4",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_5",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_6",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_7",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		}
+	]
+}
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png
new file mode 100644
index 0000000000..7234b73890
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png
new file mode 100644
index 0000000000..f2f8df413b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png
new file mode 100644
index 0000000000..7234b73890
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png
new file mode 100644
index 0000000000..42273c1071
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png
new file mode 100644
index 0000000000..f280789f09
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png
new file mode 100644
index 0000000000..b1fad514ec
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png
new file mode 100644
index 0000000000..16cd343dfc
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png
new file mode 100644
index 0000000000..1bdaad3abe
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png b/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png
new file mode 100644
index 0000000000..7e7ca14b74
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
index 435b686c72..1616f665c8 100644
--- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
@@ -102,6 +102,10 @@
         {
             "name": "xeno-chair",
             "directions": 4
+        },
+        {
+            "name": "card-stool",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Holo/peel.rsi/icon.png b/Resources/Textures/Structures/Holo/peel.rsi/icon.png
new file mode 100644
index 0000000000..c3fc629126
Binary files /dev/null and b/Resources/Textures/Structures/Holo/peel.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Holo/peel.rsi/meta.json b/Resources/Textures/Structures/Holo/peel.rsi/meta.json
new file mode 100644
index 0000000000..d6d84c40e6
--- /dev/null
+++ b/Resources/Textures/Structures/Holo/peel.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by thatguyusa (discord) / ThatGuyUSA (github) for SS14",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
index 632c7bcf5b..4dceb4af72 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json
@@ -1,62 +1,165 @@
 {
-   "version":1,
-   "size":{
-      "x":32,
-      "y":32
-   },
-   "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378",
-   "states":[
-      {
-         "name":"pumpDigitalValve",
-         "directions":4
-      },
-      {
-         "name":"pumpManualValve",
-         "directions":4
-      },
-      {
-         "name":"pumpManualValveOn",
-         "directions":4
-      },
-      {
-         "name":"pumpSignalValve",
-         "directions":4
-      },
-      {
-         "name":"pumpSignalValveOn",
-         "directions":4
-      },
-      {
-         "name":"pumpPassiveGate",
-         "directions":4
-      },
-      {
-         "name":"pumpPassiveGateOn",
-         "directions":4
-      },
-      {
-         "name":"pumpPressure",
-         "directions":4
-      },
-      {
-         "name":"pumpPressureOn",
-         "directions":4,
-         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
-      },
-      {
-         "name":"pumpVolume",
-         "directions":4
-      },
-      {
-         "name":"pumpVolumeOn",
-         "directions":4,
-         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
-      },
-      {
-         "name":"pumpVolumeBlocked",
-         "directions":4,
-         "delays":[ [ 1.0, 1.0 ], [ 1.0, 1.0 ], [ 1.0, 1.0 ], [ 1.0, 1.0 ] ]
-      }
-   ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. pvalve taken from https://github.com/tgstation/tgstation/commit/584068b59e271c0108557902e8516c70d6ae56f2 and modified by ArtisticRoomba (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "pumpDigitalValve",
+            "directions": 4
+        },
+        {
+            "name": "pumpManualValve",
+            "directions": 4
+        },
+        {
+            "name": "pumpManualValveOn",
+            "directions": 4
+        },
+        {
+            "name": "pumpSignalValve",
+            "directions": 4
+        },
+        {
+            "name": "pumpSignalValveOn",
+            "directions": 4
+        },
+        {
+            "name": "pumpPassiveGate",
+            "directions": 4
+        },
+        {
+            "name": "pumpPassiveGateOn",
+            "directions": 4
+        },
+        {
+            "name": "pumpPressure",
+            "directions": 4
+        },
+        {
+            "name": "pumpPressureOn",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "pumpVolume",
+            "directions": 4
+        },
+        {
+            "name": "pumpVolumeOn",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "pumpVolumeBlocked",
+            "directions": 4,
+            "delays": [
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ],
+                [
+                    1,
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "pumpPressureRegulator",
+            "directions": 4
+        },
+        {
+            "name": "pumpPressureRegulatorOn",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png
index 8903bc8564..eb35e1a42e 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png and b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png
new file mode 100644
index 0000000000..cb7322d040
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulator.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png
new file mode 100644
index 0000000000..8a8f85cec7
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureRegulatorOn.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
index ef75896795..d7a2ccb3b6 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba.",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy.",
     "states": [
         {
             "name": "pumpDigitalValve",
@@ -136,22 +136,30 @@
             "directions": 4,
             "delays": [
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ],
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ],
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ],
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ]
             ]
+        },
+        {
+            "name": "pumpPressureRegulator",
+            "directions": 4
+        },
+        {
+            "name": "pumpPressureRegulatorOn",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png
index 3a634fc929..94e5322cfc 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressure.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png
new file mode 100644
index 0000000000..ee53abca29
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulator.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png
new file mode 100644
index 0000000000..8523dbcba3
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi/pumpPressureRegulatorOn.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
index ef75896795..d7a2ccb3b6 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy. Modified by ArtisticRoomba.",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378. Modified by chromiumboy.",
     "states": [
         {
             "name": "pumpDigitalValve",
@@ -136,22 +136,30 @@
             "directions": 4,
             "delays": [
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ],
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ],
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ],
                 [
-                    1.0,
-                    1.0
+                    1,
+                    1
                 ]
             ]
+        },
+        {
+            "name": "pumpPressureRegulator",
+            "directions": 4
+        },
+        {
+            "name": "pumpPressureRegulatorOn",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png
index cb5286e46c..a5961b0996 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressure.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png
new file mode 100644
index 0000000000..dcca92daaa
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulator.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png
new file mode 100644
index 0000000000..3f5eabda34
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pump_alt2.rsi/pumpPressureRegulatorOn.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json
index 029bc54b5a..d818915f87 100644
--- a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "taken from tgstation https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/weapons/guns/projectiles.dmi",
+  "copyright": "taken from tgstation https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/weapons/guns/projectiles.dmi, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -25,6 +25,66 @@
           0.08
         ]
       ]
-    }
+    },
+      {
+          "name": "tesla-inhand-left",
+          "directions": 4,
+          "delays": [
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ],
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ],
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ],
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ]
+          ]
+      },
+      {
+          "name": "tesla-inhand-right",
+          "directions": 4,
+          "delays": [
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ],
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ],
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ],
+              [
+                  0.1,
+                  0.1,
+                  0.1,
+                  0.1
+              ]
+          ]
+      }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png
new file mode 100644
index 0000000000..3e8260ea59
Binary files /dev/null and b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-left.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png
new file mode 100644
index 0000000000..b70f15e2bd
Binary files /dev/null and b/Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla-inhand-right.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
index a45f465b54..9c073fc7f6 100644
--- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman,     poster53_legit and the original version by @RCOI on discord, modified by Spessmann,     poster54_legit by hex_reject on Discord,     poster64_contraband, poster65_contraband, poster66_contraband by JuneSzalkowska (Discord).",
+  "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman,     poster53_legit and the original version by @RCOI on discord, modified by Spessmann,     poster54_legit by hex_reject on Discord,     poster64_contraband, poster65_contraband, poster66_contraband by JuneSzalkowska (Discord), poster55_legit by FairlySadPanda (Github), based on art and a character owned by Vytian (Discord).",
   "size": {
     "x": 32,
     "y": 32
@@ -399,6 +399,9 @@
     {
       "name": "poster54_legit"
     },
+    {
+      "name": "poster55_legit"
+    },
     {
       "name": "random_legit"
     },
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_legit.png
new file mode 100644
index 0000000000..ac02d887a0
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster55_legit.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png
index da7b4e4941..2b20db4c09 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png
index f204a4d392..072e494c43 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
index 7684d02279..561a740d77 100644
--- a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
@@ -1,44 +1,44 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/b4363f59f5feacbc48c29aea4eb7794ad358cd92/icons/obj/device.dmi. Modified by chromiumboy.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/b4363f59f5feacbc48c29aea4eb7794ad358cd92/icons/obj/device.dmi. Modified by chromiumboy. Rotated by K-Dynamic (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "safe",
-      "delays": [
-        [
-          0.2,
-          2.0
-        ]
-      ]
-    },
-    {
-      "name": "stun",
-      "delays": [
-        [
-          0.2,
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "lethal",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "wires"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "safe",
+            "delays": [
+                [
+                    0.2,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "stun",
+            "delays": [
+                [
+                    0.2,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "lethal",
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "wires"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png
index f47615f626..567d0ed132 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png
index 1ca04be32f..24ee9a7ec4 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png
index 27644f00bd..fde4f7a3de 100644
Binary files a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card0.png b/Resources/Textures/Structures/Walls/card.rsi/card0.png
new file mode 100644
index 0000000000..aca7f7cc5d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card0.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card1.png b/Resources/Textures/Structures/Walls/card.rsi/card1.png
new file mode 100644
index 0000000000..f0550405f6
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card1.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card2.png b/Resources/Textures/Structures/Walls/card.rsi/card2.png
new file mode 100644
index 0000000000..aca7f7cc5d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card2.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card3.png b/Resources/Textures/Structures/Walls/card.rsi/card3.png
new file mode 100644
index 0000000000..e9760a8a0d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card3.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card4.png b/Resources/Textures/Structures/Walls/card.rsi/card4.png
new file mode 100644
index 0000000000..a51edee25d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card4.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card5.png b/Resources/Textures/Structures/Walls/card.rsi/card5.png
new file mode 100644
index 0000000000..6741c5e94e
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card5.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card6.png b/Resources/Textures/Structures/Walls/card.rsi/card6.png
new file mode 100644
index 0000000000..b26b5feb57
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card6.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card7.png b/Resources/Textures/Structures/Walls/card.rsi/card7.png
new file mode 100644
index 0000000000..c70786eabf
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card7.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/full.png b/Resources/Textures/Structures/Walls/card.rsi/full.png
new file mode 100644
index 0000000000..6170c2a04a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/meta.json b/Resources/Textures/Structures/Walls/card.rsi/meta.json
new file mode 100644
index 0000000000..baafe2f140
--- /dev/null
+++ b/Resources/Textures/Structures/Walls/card.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "states": [
+        {
+        "name": "full"
+        },
+        {
+            "name": "card0",
+        "directions": 4
+        },
+        {
+            "name": "card1",
+        "directions": 4
+        },
+        {
+            "name": "card2",
+        "directions": 4
+        },
+        {
+            "name": "card3",
+        "directions": 4
+        },
+        {
+            "name": "card4",
+        "directions": 4
+        },
+        {
+            "name": "card5",
+        "directions": 4
+        },
+        {
+            "name": "card6",
+        "directions": 4
+        },
+        {
+            "name": "card7",
+        "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/full.png b/Resources/Textures/Structures/Walls/xeno.rsi/full.png
index 87736f62bb..6f3b32380a 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/full.png and b/Resources/Textures/Structures/Walls/xeno.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png
index 855fd627d1..06dbdbda78 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png
index 30e7761524..c0bb43fe4a 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png
index 15d5260504..9335eeb3fc 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png
index 45695889c1..ee7d6d9e65 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png
index efff8fb7c5..ea58ac1b24 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png
index a0bd36488c..04f2e5c0d1 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png
index bc67f6f320..62fd651b98 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png
index 9360115ce3..65e38b0e10 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png
index f305f6e313..8ea18b0250 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png
index 2cadcc167b..1bb8b234b0 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png
index 80c1ebdd06..d574d331e5 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png
index d82867b21d..fcbf410d52 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png
index 5abb5b7277..64ea9dbfe4 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png
index 8f744092f8..a5f75d2d8c 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png
index dfce6981eb..40a317c7cd 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png
index c0f433f215..26fde39dde 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png
index f8a199e6c7..9aa5ad8aa1 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png
index c0f433f215..c65fb281e0 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png
index 183ee85ff3..3c930e3744 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png
index da4032a78b..4398cd511e 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png
index 7f1139ebb9..72a0dcfd93 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png
index da4032a78b..dcafcbed38 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png
index db071a86bb..e5552dbf2c 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/full.png b/Resources/Textures/Structures/floor_web.rsi/full.png
new file mode 100644
index 0000000000..db5ba2c374
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/full.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/meta.json b/Resources/Textures/Structures/floor_web.rsi/meta.json
new file mode 100644
index 0000000000..09f3ae17aa
--- /dev/null
+++ b/Resources/Textures/Structures/floor_web.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by TheShuEd (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "web_0",
+      "directions": 4
+    },
+    {
+      "name": "web_1",
+      "directions": 4
+    },
+    {
+      "name": "web_2",
+      "directions": 4
+    },
+    {
+      "name": "web_3",
+      "directions": 4
+    },
+    {
+      "name": "web_4",
+      "directions": 4
+    },
+    {
+      "name": "web_5",
+      "directions": 4
+    },
+    {
+      "name": "web_6",
+      "directions": 4
+    },
+    {
+      "name": "web_7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_0.png b/Resources/Textures/Structures/floor_web.rsi/web_0.png
new file mode 100644
index 0000000000..e381947fe8
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_0.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_1.png b/Resources/Textures/Structures/floor_web.rsi/web_1.png
new file mode 100644
index 0000000000..45608590de
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_1.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_2.png b/Resources/Textures/Structures/floor_web.rsi/web_2.png
new file mode 100644
index 0000000000..e381947fe8
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_2.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_3.png b/Resources/Textures/Structures/floor_web.rsi/web_3.png
new file mode 100644
index 0000000000..4b0572a914
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_3.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_4.png b/Resources/Textures/Structures/floor_web.rsi/web_4.png
new file mode 100644
index 0000000000..df4405eddc
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_4.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_5.png b/Resources/Textures/Structures/floor_web.rsi/web_5.png
new file mode 100644
index 0000000000..fd7439262d
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_5.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_6.png b/Resources/Textures/Structures/floor_web.rsi/web_6.png
new file mode 100644
index 0000000000..ec22584fb8
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_6.png differ
diff --git a/Resources/Textures/Structures/floor_web.rsi/web_7.png b/Resources/Textures/Structures/floor_web.rsi/web_7.png
new file mode 100644
index 0000000000..3979256d13
Binary files /dev/null and b/Resources/Textures/Structures/floor_web.rsi/web_7.png differ
diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
index 007f876b2e..20bb60a722 100644
--- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
@@ -6,6 +6,7 @@
     "x": 32,
     "y": 32
   },
+  "rsic": false,
   "states": [
     {
       "name": "dirt"
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index c7dee01c8c..59ecb549f9 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -180,3 +180,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 0000000000..c603c02a17
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 0000000000..5f35112b3a
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 0000000000..bd988ac465
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 0000000000..d67c549b3b
Binary files /dev/null and b/Resources/Textures/Tiles/white_marble.png differ
diff --git a/Resources/Textures/Tiles/xeno_flooring.png b/Resources/Textures/Tiles/xeno_flooring.png
index 89bf169d7a..334376c4ae 100644
Binary files a/Resources/Textures/Tiles/xeno_flooring.png and b/Resources/Textures/Tiles/xeno_flooring.png differ
diff --git a/Resources/Textures/Tiles/xeno_steel.png b/Resources/Textures/Tiles/xeno_steel.png
index 37e5c829d6..9777ad598d 100644
Binary files a/Resources/Textures/Tiles/xeno_steel.png and b/Resources/Textures/Tiles/xeno_steel.png differ
diff --git a/Resources/Textures/Tiles/xeno_steel_corner.png b/Resources/Textures/Tiles/xeno_steel_corner.png
index 7a8ee1fb2c..dfe147ebec 100644
Binary files a/Resources/Textures/Tiles/xeno_steel_corner.png and b/Resources/Textures/Tiles/xeno_steel_corner.png differ
diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml
index 9d183a3f8c..1cef3812cb 100644
--- a/Resources/clientCommandPerms.yml
+++ b/Resources/clientCommandPerms.yml
@@ -73,12 +73,14 @@
     - localdelete
     - fullstatereset
     - dumpentities
+    - showaccessreaders
 
 - Flags: MAPPING
   Commands:
     - mapping
     - toggleautosave
     - toggledecals
+    - showaccessreaders
 
 - Flags: QUERY
   Commands:
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 794fcc935d..0e3c7eee5e 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -38,6 +38,9 @@
   - hwid
   - showaudio
   - showpos
+  - showvel
+  - showrot
+  - showangvel
   - showray
   - showchunkbb
   - showgridnodes
@@ -58,7 +61,7 @@
   - watch
   - sendgarbage
   - setinputcontext
-  - showvelocities
+  - showplayervelocity
   - tilelookup
   - net_entityreport
   - scene
@@ -131,7 +134,6 @@
   - fuck
   - replay_recording_start
   - replay_recording_stop
-  - scale
   - spin
 
 - Flags: QUERY
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index ac099982bf..8ff4cbc6e9 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -190,7 +190,7 @@ binds:
   mod1: Alt
 - function: OpenCharacterMenu
   type: State
-  key: J # Sunrise-Edit
+  key: U
 - function: OpenEmotesMenu
   type: State
   key: Y
@@ -280,7 +280,7 @@ binds:
   type: State
   key: R
   mod1: Shift
-- function: Interact # default: FlipObject (но он что-то не работает, поэтому бинд для панели будет)
+- function: FlipObject
   type: State
   key: F
 - function: TextCursorLeft
@@ -525,6 +525,9 @@ binds:
 - function: Arcade3
   type: State
   key: Z
+#- function: ToggleKnockdown
+#  type: State
+#  key: C
 - function: OpenAbilitiesMenu
   type: State
   key: K
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 79afc6b836..843c4f23c2 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -34,7 +34,7 @@ lanternextrabright: LanternFlash
 
 # 2023-08-04
 BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle
-BoxMagazineMagnumSubMachineGunHighVelocity: BoxMagazineMagnumSubMachineGun
+BoxMagazineMagnumSubMachineGunHighVelocity: null
 BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle
 BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity
 BoxMagazinePistolHighVelocity: BoxMagazinePistol
@@ -56,9 +56,9 @@ MagazineBoxMagnumHighVelocity: MagazineBoxMagnumSP
 MagazineBoxPistolHighVelocity: MagazineBoxPistolFMJ
 MagazineBoxRifleHighVelocity: MagazineBoxRifleFMJ
 MagazineCaselessRifleHighVelocity: MagazineCaselessRifle
-MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort
+MagazineCaselessRifleShortHighVelocity: null
 MagazineLightRifleHighVelocity: MagazineLightRifleFMJ
-MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun
+MagazineMagnumSubMachineGunHighVelocity: null
 MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle
 MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacityFMJ
 MagazinePistolHighVelocity: MagazinePistolFMJ
@@ -301,11 +301,11 @@ CartridgeCaselessRifleRubber: CartridgeCaselessRifle
 MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGunSP
 MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
 # MagazineMagnumRubber: MagazineMagnum # Its me! Rubber!
-MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
+MagazineMagnumSubMachineGunRubber: null
 MagazineLightRifleRubber: MagazineLightRifleSP
 MagazineRifleRubber: MagazineRifleSP
 MagazineCaselessRifleRubber: MagazineCaselessRifle
-MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
+MagazineCaselessRifleShortRubber: null
 SpeedLoaderPistolRubber: SpeedLoaderPistol
 # SpeedLoaderMagnumRubber: SpeedLoaderMagnumSP # Its me! Rubber!
 MagazineBoxPistolRubber: MagazineBoxPistolSP
@@ -322,7 +322,7 @@ BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
 BoxMagazineLightRifleRubber: BoxMagazineLightRifle
 BoxMagazineRifleRubber: BoxMagazineRifle
 BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
-BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
+BoxMagazineMagnumSubMachineGunRubber: null
 WeaponPistolMk58Nonlethal: WeaponPistolMk58
 WeaponPistolN1984Nonlethal: WeaponPistolN1984
 WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
@@ -654,6 +654,22 @@ SpawnHonkBot: SpawnMobHonkBot
 CrateFoodPizzaLarge: CrateFoodPizza
 CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks
 
+# 2025-06-06
+MagazineLightRifleMaxim: null
+MagazineLightRiflePkBox: null
+MagazineCaselessRifle10x24: null
+BaseMagazineCaselessRifleShort: null
+MagazineCaselessRifleShort: null
+MagazineCaselessRifleShortPractice: null
+BaseMagazineMagnumSubMachineGun: null
+MagazineMagnumSubMachineGunEmpty: null
+MagazineMagnumSubMachineGun: null
+MagazineMagnumSubMachineGunPractice: null
+MagazineMagnumSubMachineGunUranium: null
+MagazineMagnumSubMachineGunPiercing: null
+BoxMagazineMagnumSubMachineGun: null
+BoxMagazineMagnumSubMachineGunPractice: null
+
 # 2025-06-09
 BarSignAlignTile: BarSign
 BarSignComboCafeAlignTile: BarSignComboCafe
@@ -682,6 +698,12 @@ BarSignSpacebucksAlignTile: BarSignSpacebucks
 BarSignMaltroachAlignTile: BarSignMaltroach
 BarSignWhiskeyEchoesAlignTile: BarSignWhiskeyEchoes
 
+# 2025-06-21
+ClothingNeckHeadphones: ClothingMultipleHeadphones
+
+# 2025-08-01
+FoodDonutJellySlugcat: FoodDonutJellyScurret
+
 # Sunrise-Start
 AirlockExternalGlassShuttleArrivals: AirlockExternalGlassShuttleArrivalsLocked
 AirlockHatchSyndicate: AirlockHatchSyndicateLocked
diff --git a/RobustToolbox b/RobustToolbox
index 18849be0b4..a1cdd60602 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 18849be0b434e6fbe866e16d39360a6bb1f1410c
+Subproject commit a1cdd60602e44e5fa1130cb3982133c24a4f8760
diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py
index 3eda72653c..01e15ac630 100755
--- a/Tools/actions_changelogs_since_last_run.py
+++ b/Tools/actions_changelogs_since_last_run.py
@@ -173,6 +173,7 @@ def changelog_entries_to_message_lines(entries: Iterable[ChangelogEntry]) -> lis
     message_lines = []
 
     for contributor_name, group in itertools.groupby(entries, lambda x: x["author"]):
+        message_lines.append("\n")
         message_lines.append(f"**{contributor_name}** updated:\n")
 
         for entry in group:
@@ -189,7 +190,8 @@ def changelog_entries_to_message_lines(entries: Iterable[ChangelogEntry]) -> lis
                     message = message[: DISCORD_SPLIT_LIMIT - 100].rstrip() + " [...]"
 
                 if url is not None:
-                    line = f"{emoji} - {message} [PR]({url}) \n"
+                    pr_number = url.split("/")[-1]
+                    line = f"{emoji} - {message} ([#{pr_number}]({url}))\n"
                 else:
                     line = f"{emoji} - {message}\n"